From b20d9f5e667ee836e43f5f9cbb301e1d5425c854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Fri, 13 Dec 2024 16:59:45 +0100
Subject: [PATCH] CMXX - Improved history visibility

---
 assets/functions.php | 4 ++--
 histories.php        | 7 ++++++-
 history.php          | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/assets/functions.php b/assets/functions.php
index c9f0905..015f9bf 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -2886,10 +2886,10 @@ function getRelativeTime($timestamp) {
       return $time_just_now;
   } elseif ($diff < $hour) {
       $minutes = floor($diff / $minute);
-      return $minutes.$time_minute . ($minutes != 1 ? $time_minutes : '') . " $suffix";
+      return $minutes.(($minutes != 1) ? $time_minutes : $time_minute) . " $suffix";
   } elseif ($diff < $day) {
       $hours = floor($diff / $hour);
-      return $hours.$time_hour . ($hours != 1 ? $time_hours : '') . " $suffix";
+      return $hours.(($hours != 1) ? $time_hours : $time_hour) . " $suffix";
   } elseif ($diff < $week) {
       $days = floor($diff / $day);
       
diff --git a/histories.php b/histories.php
index 1c6e1c8..bddbc19 100644
--- a/histories.php
+++ b/histories.php
@@ -110,13 +110,18 @@ $view .= '
 
                 $description = json_decode($response->description) ?? $response->description;
                 $description = json_encode($description, JSON_PRETTY_PRINT); 
+                //Replace JSON ITEMS
+                $search = ['{', '}', '"',':','[',']',','];
+                $replace   = ['', '','','=','','',''];
+                $description  = str_replace($search, $replace, $description);
+
 
                 $view .= '<tr>
                         <td class="responsive-hidden">'.$response->historyID.'</td>
                         <td>'.$response->type.'</td>
                         <td class="responsive-hidden">'.$response->created.'</td>
                         <td class="responsive-hidden">'.$response->createdby.'</td>
-                        <td><pre>' . $description . '</pre></td>
+                        <td><div style="overflow-y:scroll;height:200px !important;max-width:300px;"><pre>' . $description . '</pre><div></td>
                         <td><a href="index.php?page=equipment&equipmentID='.$response->equipmentID.'" class="btn_link">'.$general_view .'</a></td>
                     </tr>
                     ';
diff --git a/history.php b/history.php
index 8db037a..5bdebc3 100644
--- a/history.php
+++ b/history.php
@@ -143,12 +143,17 @@ foreach ($responses as $response){
 $description = json_decode($response->description) ?? $response->description;
 $description = json_encode($description, JSON_PRETTY_PRINT); 
 
+//Replace JSON ITEMS
+$search = ['{', '}', '"',':','[',']',','];
+$replace   = ['', '','','=','','',''];
+$description  = str_replace($search, $replace, $description);
+
 $view .= '<tr>
             <td class="responsive-hidden">'.$response->historyID.'</td>
             <td>'.$response->type.' </td>
             <td class="responsive-hidden">'.$response->created.'</td>
             <td class="responsive-hidden">'.$response->createdby.'</td>
-            <td><pre>' . $description . '</pre></td>
+            <td><div style="overflow-y:scroll;height:200px !important;max-width:300px;"><pre>' . $description . '</pre><div></td>
             ';
 if ($update_allowed === 1){
     $view .= ' <td><a href="index.php?page=history_manage&equipmentID='.$_GET['equipmentID'].'&rowID='.$response->historyID.'" class="btn_link">'.$general_view .'</a></td>