ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Edit Location logic in contacts added Pop Over Title for archived Items in assets and contacts

Browse Source
This commit is contained in:
johnnyq
2024-01-27 14:01:10 -05:00
parent 50b00c5712
commit c711db937d
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client_asset_details.php
+2 -2
View File
@@ -47,7 +47,7 @@ if (isset($_GET['asset_id'])) {
$contact_mobile = nullable_htmlentities($row['contact_mobile']); $contact_mobile = nullable_htmlentities($row['contact_mobile']);
$contact_archived_at = nullable_htmlentities($row['contact_archived_at']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
if ($contact_archived_at) { if ($contact_archived_at) {
$contact_name_display = "<span class='text-danger'><s>$contact_name</s></span>"; $contact_name_display = "<span class='text-danger' title='Archived'><s>$contact_name</s></span>";
} else { } else {
$contact_name_display = $contact_name; $contact_name_display = $contact_name;
} }
@@ -57,7 +57,7 @@ if (isset($_GET['asset_id'])) {
} }
$location_archived_at = nullable_htmlentities($row['location_archived_at']); $location_archived_at = nullable_htmlentities($row['location_archived_at']);
if ($location_archived_at) { if ($location_archived_at) {
$location_name_display = "<span class='text-danger'><s>$location_name</s></span>"; $location_name_display = "<span class='text-danger' title='Archived'><s>$location_name</s></span>";
} else { } else {
$location_name_display = $location_name; $location_name_display = $location_name;
} }
client_assets.php
+2 -2
View File
@@ -257,7 +257,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
} }
$contact_archived_at = nullable_htmlentities($row['contact_archived_at']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
if ($contact_archived_at) { if ($contact_archived_at) {
$contact_name_display = "<div class='text-danger'><s>$contact_name</s></div>"; $contact_name_display = "<div class='text-danger' title='Archived'><s>$contact_name</s></div>";
} else { } else {
$contact_name_display = $contact_name; $contact_name_display = $contact_name;
} }
@@ -268,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
} }
$location_archived_at = nullable_htmlentities($row['location_archived_at']); $location_archived_at = nullable_htmlentities($row['location_archived_at']);
if ($location_archived_at) { if ($location_archived_at) {
$location_name_display = "<div class='text-danger'><s>$location_name</s></div>"; $location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
} else { } else {
$location_name_display = $location_name; $location_name_display = $location_name;
} }
client_contact_edit_modal.php
+8 -2
View File
@@ -122,14 +122,20 @@
<option value="">- Location -</option> <option value="">- Location -</option>
<?php <?php
$sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE (location_archived_at > '$contact_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_name ASC"); $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $contact_location_id OR location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
while ($row = mysqli_fetch_array($sql_locations)) { while ($row = mysqli_fetch_array($sql_locations)) {
$location_id_select = intval($row['location_id']); $location_id_select = intval($row['location_id']);
$location_name_select = nullable_htmlentities($row['location_name']); $location_name_select = nullable_htmlentities($row['location_name']);
$location_archived_at = nullable_htmlentities($row['location_archived_at']);
if ($location_archived_at) {
$location_name_select_display = "($location_name_select) - ARCHIVED";
} else {
$location_name_select_display = $location_name_select;
}
?> ?>
<option <?php if ($contact_location_id == $location_id_select) { <option <?php if ($contact_location_id == $location_id_select) {
echo "selected"; echo "selected";
} ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option> } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select_display; ?></option>
<?php } ?> <?php } ?>
</select> </select>
client_contacts.php
+5 -1
View File
@@ -169,7 +169,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$contact_location_id = intval($row['contact_location_id']); $contact_location_id = intval($row['contact_location_id']);
$location_name = nullable_htmlentities($row['location_name']); $location_name = nullable_htmlentities($row['location_name']);
if (empty($location_name)) { if (empty($location_name)) {
$location_name_display = "-"; $location_name = "-";
}
$location_archived_at = nullable_htmlentities($row['location_archived_at']);
if ($location_archived_at) {
$location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
} else { } else {
$location_name_display = $location_name; $location_name_display = $location_name;
} }