Skip to content

Commit fded817

Browse files
johnnyqjohnnyq
committed
Added contact and Asset Indicators with quick links to credentials page
1 parent e670a98 commit fded817

File tree

2 files changed

+36
-8
lines changed

2 files changed

+36
-8
lines changed

‎contacts.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,14 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
268268
Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
269269
</a>
270270
</th>
271+
<th></th>
271272
<?php if (!$client_url) { ?>
272273
<th>
273274
<a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
274275
Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
275276
</a>
276277
</th>
277278
<?php } ?>
278-
<th></th>
279279
<th class="text-center">Action</th>
280280
</tr>
281281
</thead>
@@ -356,7 +356,7 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
356356
$sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_contact_id = $contact_id ORDER BY asset_id DESC");
357357
$asset_count = mysqli_num_rows($sql_related_assets);
358358
if ($asset_count) {
359-
$asset_count_display = "<span class='mr-2 badge badge-pill badge-dark p-2' title='$asset_count Assets'><i class='fas fa-desktop mr-2'></i>$asset_count</span>";
359+
$asset_count_display = "<span class='mr-2 badge badge-pill badge-dark p-2' title='$asset_count Assets'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</span>";
360360
} else {
361361
$asset_count_display = '';
362362
}
@@ -365,7 +365,7 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
365365
$sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id ORDER BY login_id DESC");
366366
$login_count = mysqli_num_rows($sql_related_logins);
367367
if ($login_count) {
368-
$login_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$login_count Credentials'><i class='fas fa-key mr-2'></i>$login_count</span>";
368+
$login_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$login_count Credentials'><i class='fas fa-fw fa-key mr-2'></i>$login_count</span>";
369369
} else {
370370
$login_count_display = '';
371371
}
@@ -374,7 +374,7 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
374374
$sql_related_software = mysqli_query($mysqli, "SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id");
375375
$software_count = mysqli_num_rows($sql_related_software);
376376
if ($software_count) {
377-
$software_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$software_count Licenses'><i class='fas fa-cube mr-2'></i>$software_count</span>";
377+
$software_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$software_count Licenses'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</span>";
378378
} else {
379379
$software_count_display = '';
380380
}
@@ -383,7 +383,7 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
383383
$sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_contact_id = $contact_id");
384384
$ticket_count = mysqli_num_rows($sql_related_tickets);
385385
if ($ticket_count) {
386-
$ticket_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$ticket_count Tickets'><i class='fas fa-life-ring mr-2'></i>$ticket_count</span>";
386+
$ticket_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$ticket_count Tickets'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</span>";
387387
} else {
388388
$software_count_display = '';
389389
}
@@ -392,7 +392,7 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
392392
$sql_related_documents = mysqli_query($mysqli, "SELECT * FROM documents, contact_documents WHERE documents.document_id = contact_documents.document_id AND contact_documents.contact_id = $contact_id");
393393
$document_count = mysqli_num_rows($sql_related_documents);
394394
if ($document_count) {
395-
$document_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$document_count Documents'><i class='fas fa-file-alt mr-2'></i>$document_count</span>";
395+
$document_count_display = "<span class='mr-2 badge badge-pill badge-secondary p-2' title='$document_count Documents'><i class='fas fa-fw fa-file-alt mr-2'></i>$document_count</span>";
396396
} else {
397397
$document_count_display = '';
398398
}
@@ -462,10 +462,12 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
462462
<td><?php echo $contact_department; ?></td>
463463
<td><?php echo $contact_info_display; ?></td>
464464
<td><?php echo $location_name_display; ?></td>
465+
<td>
466+
<?php echo "$asset_count_display$login_count_display$software_count_display$ticket_count_display$document_count_display"; ?>
467+
</td>
465468
<?php if (!$client_url) { ?>
466469
<td><a href="contacts.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
467470
<?php } ?>
468-
<td><?php echo "$asset_count_display$login_count_display$software_count_display$ticket_count_display$document_count_display"; ?></td>
469471
<td>
470472
<div class="dropdown dropleft text-center">
471473
<button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">

‎credentials.php

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@
6464

6565
$sql = mysqli_query(
6666
$mysqli,
67-
"SELECT SQL_CALC_FOUND_ROWS l.login_id AS l_login_id, l.*, login_tags.*, tags.*, clients.*
67+
"SELECT SQL_CALC_FOUND_ROWS l.login_id AS l_login_id, l.*, login_tags.*, tags.*, clients.*, contacts.*, assets.*
6868
FROM logins l
6969
LEFT JOIN login_tags ON login_tags.login_id = l.login_id
7070
LEFT JOIN tags ON tags.tag_id = login_tags.tag_id
7171
LEFT JOIN clients ON client_id = login_client_id
72+
LEFT JOIN contacts ON contact_id = login_contact_id
73+
LEFT JOIN assets ON asset_id = login_asset_id
7274
$location_query_innerjoin
7375
WHERE l.login_$archive_query
7476
$tag_query
@@ -302,7 +304,9 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
302304
$login_archived_at = nullable_htmlentities($row['login_archived_at']);
303305
$login_important = intval($row['login_important']);
304306
$login_contact_id = intval($row['login_contact_id']);
307+
$contact_name = nullable_htmlentities($row['contact_name']);
305308
$login_asset_id = intval($row['login_asset_id']);
309+
$asset_name = nullable_htmlentities($row['asset_name']);
306310

307311
// Tags
308312
$login_tag_name_display_array = array();
@@ -326,6 +330,27 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
326330
}
327331
$login_tags_display = implode('', $login_tag_name_display_array);
328332

333+
if ($login_contact_id) {
334+
$login_contact_display = "<a href='#' class='mr-2 badge badge-pill badge-dark p-2' title='$contact_name'
335+
data-toggle='ajax-modal'
336+
data-modal-size='lg'
337+
data-ajax-url='ajax/ajax_contact_details.php'
338+
data-ajax-id='$login_contact_id'>
339+
<i class='fas fa-fw fa-user'></i></a>";
340+
} else {
341+
$login_contact_display = '';
342+
}
343+
344+
if ($login_asset_id) {
345+
$login_asset_display = "<a href='#' class='mr-2 badge badge-pill badge-secondary p-2' title='$asset_name' data-toggle='ajax-modal'
346+
data-modal-size='lg'
347+
data-ajax-url='ajax/ajax_asset_details.php'
348+
data-ajax-id='$login_asset_id'>
349+
<i class='fas fa-fw fa-desktop'></i></a>";
350+
} else {
351+
$login_asset_display = '';
352+
}
353+
329354
// Check if shared
330355
$sql_shared = mysqli_query(
331356
$mysqli,
@@ -390,6 +415,7 @@ class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"
390415
<td><?php echo $otp_display; ?></td>
391416
<td><?php echo $login_uri_display; ?></td>
392417
<td>
418+
<?php echo "$login_contact_display$login_asset_display"; ?>
393419
<?php if (mysqli_num_rows($sql_shared) > 0) { ?>
394420
<div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
395421
<i class="fas fa-link mr-2 mt-1"></i>

0 commit comments

Comments
 (0)