Fix #727

tbar0970 · Nov 23, 2021 · b75ffb7 · b75ffb7
1 parent 2644d5b
commit b75ffb7
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/views/view_8_services.class.php b/views/view_8_services.class.php
@@ -541,10 +541,17 @@ private function printComponentSelector()
 									$runsheetTitle = $this->service->replaceKeywords($runsheetTitle);
 								}
 								$comp['personnel'] = $this->service->replaceKeywords($comp['personnel']);
-								$weeks = '';
+								$lastUse = $lastUseSort = '';
 								if ($comp['lastused']) {
-									$weeks = floor(($serviceTS - strtotime($comp['lastused'])) / 60 / 60 / 24 / 7);
-									$weeks = "{$weeks}w";
+									$lastTS = strtotime($comp['lastused']);
+									$lastUseSort = (int)$lastTS;
+									if ($lastTS == $serviceTS) {
+										$lastUse = 'now';
+									} else if ($lastTS > $serviceTS) {
+										$lastUse = '+'.ceil(($lastTS - $serviceTS) / 60 / 60 / 24 / 7).'w';
+									} else {
+										$lastUse = ceil(($serviceTS - $lastTS) / 60 / 60 / 24 / 7).'w';
+									}
 								}
 
 								?>
@@ -562,8 +569,8 @@ private function printComponentSelector()
 										}
 										?>
 									</td>
-									<td data-sort-value="<?php echo (int)$weeks; ?>" class="hide-in-transit">
-										<?php echo $weeks; ?>
+									<td data-sort-value="<?php echo $lastUseSort; ?>" class="hide-in-transit">
+										<?php echo $lastUse; ?>
 									</td>
 									<td class="hide-in-transit">
 										<?php echo $comp['usage_12m']; ?>x