From 2c44556567cd1098ce4c4d8b30a4853ea0fb0b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Fri, 20 Dec 2024 16:11:27 +0100
Subject: [PATCH] CMXX - Servicereport actionlist update.

---
 assets/functions.php | 16 +++++++++-------
 histories.php        |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/assets/functions.php b/assets/functions.php
index 015f9bf..c2a96ba 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -950,6 +950,7 @@ function serviceEvents ($messages,$page){
                     <th>'.$equipment_label9.'</th>
                     <th>'.$equipment_label3.'</th>
                     <th>'.$general_createdby.'</th>
+                    <th>'.$general_created.'</th>
                     <th>'.$view_asset_actions.'</th>
                 </tr>
                 </thead>
@@ -996,6 +997,7 @@ function serviceEvents ($messages,$page){
                         <td>'.$service_renewal_date.'</td>
                         <td>'.$service_status.'</td>
                         <td>'.$message->createdby.'</td>
+                        <td>'.getRelativeTime($message->created).'</td>
                         <td><a href="index.php?page=servicereport&equipmentID='.$message->equipmentID.'&historyID='.$message->historyID.'" class="btn_link">'.$general_view.'</a></td>
                         <td><a href="index.php?page=render_service_report&historyID='.$message->historyID.'" class="btn_link">PDF</a></td>
                     </tr>';
@@ -1295,11 +1297,11 @@ function serviceReport($history, $request, $country_code)
    if (str_contains($history->description, "service_mandatory_question")) { 
     // New Report
     foreach ($json_array->final as $final) {
-      if ($final->id == "service_action_clean" && $final->value == "Yes") {
+      if ($final->id == "service_action_clean" && $final->value == 1) {
         $servicereport .= '<li>' . $service_action_clean . '</li>';
         $actions++;
       }
-      if ($final->id == "service_action_battery" && $final->value == "Yes") {
+      if ($final->id == "service_action_battery" && $final->value == 1) {
         $servicereport .= '<li>' . $service_action_battery . '</li>';
         $actions++;
       }         
@@ -1321,23 +1323,23 @@ function serviceReport($history, $request, $country_code)
     ';
     if (str_contains($history->description, "service_mandatory_question")) { 
       foreach ($json_array->final as $final) {
-        if ($final->id == "service_action_serial" && $final->value == "Yes") {
+        if ($final->id == "service_action_serial" && $final->value == 1) {
           $servicereport .=  '<li>' . $service_action_serial . '</li>';
             $repairs++;
         }
-        if ($final->id == "service_action_cover" && $final->value == "Yes") {
+        if ($final->id == "service_action_cover" && $final->value == 1) {
           $servicereport .=  '<li>' . $service_action_cover . '</li>';
             $repairs++;
         }         
-        if ($final->id == "service_action_spudger" && $final->value == "Yes") {
+        if ($final->id == "service_action_spudger" && $final->value == 1) {
           $servicereport .=  '<li>' . $service_action_spudger . '</li>';
             $repairs++;
         }       
-        if ($final->id == "service_action_case" && $final->value == "Yes") {
+        if ($final->id == "service_action_case" && $final->value == 1) {
           $servicereport .=  '<li>' . $service_action_case . '</li>';
             $repairs++;
         }       
-        if ($final->id == "service_action_instructions" && $final->value == "Yes") {
+        if ($final->id == "service_action_instructions" && $final->value == 1) {
           $servicereport .=  '<li>' . $service_action_instructions . '</li>';
             $repairs++;
         }       
diff --git a/histories.php b/histories.php
index bddbc19..da791c3 100644
--- a/histories.php
+++ b/histories.php
@@ -119,7 +119,7 @@ $view .= '
                 $view .= '<tr>
                         <td class="responsive-hidden">'.$response->historyID.'</td>
                         <td>'.$response->type.'</td>
-                        <td class="responsive-hidden">'.$response->created.'</td>
+                        <td class="responsive-hidden">'.getRelativeTime($response->created).'</td>
                         <td class="responsive-hidden">'.$response->createdby.'</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>