AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-21 13:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Physical Asset location in show additonal columns instead show Physical Location below location

Browse Source
This commit is contained in:
johnnyq
2024-12-07 12:26:41 -05:00
parent 193e9e3e01
commit 095c5b95ac
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client_assets.php
View File

@@ -183,9 +183,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<option <option
<?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { echo 'selected'; } ?>>Warranty_Expire <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { echo 'selected'; } ?>>Warranty_Expire
</option> </option>
<option
<?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { echo 'selected'; } ?>>Physical_Location
</option>
</select> </select>
</div> </div>
</div> </div>
@@ -321,13 +318,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Location <?php if ($sort == 'location_name') { echo $order_icon; } ?> Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
</a> </a>
</th> </th>
<?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { ?>
<th>
<a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_physical_location&order=<?php echo $disp; ?>">
Physical Location <?php if ($sort == 'asset_physical_location') { echo $order_icon; } ?>
</a>
</th>
<?php } ?>
<th> <th>
<a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>"> <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">
Status <?php if ($sort == 'asset_status') { echo $order_icon; } ?> Status <?php if ($sort == 'asset_status') { echo $order_icon; } ?>
@@ -397,9 +387,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$asset_photo = nullable_htmlentities($row['asset_photo']); $asset_photo = nullable_htmlentities($row['asset_photo']);
$asset_physical_location = nullable_htmlentities($row['asset_physical_location']); $asset_physical_location = nullable_htmlentities($row['asset_physical_location']);
if ($asset_physical_location) { if ($asset_physical_location) {
$asset_physical_location_display = $asset_physical_location; $asset_physical_location_display = "<div class='text-secondary'>$asset_physical_location</div>";
} else { } else {
$asset_physical_location_display = "-"; $asset_physical_location_display = "";
} }
$asset_notes = nullable_htmlentities($row['asset_notes']); $asset_notes = nullable_htmlentities($row['asset_notes']);
$asset_created_at = nullable_htmlentities($row['asset_created_at']); $asset_created_at = nullable_htmlentities($row['asset_created_at']);
@@ -489,10 +479,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?> <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?>
<td><?php echo $contact_name_display; ?></td> <td><?php echo $contact_name_display; ?></td>
<?php } ?> <?php } ?>
<td><?php echo $location_name_display; ?></td> <td>
<?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { ?> <?php echo $location_name_display; ?>
<td><?php echo $asset_physical_location_display; ?></td> <?php echo $asset_physical_location_display; ?>
<?php } ?> </td>
<td><?php echo $asset_status; ?></td> <td><?php echo $asset_status; ?></td>
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">