From c81815244874f7839c490ac7e457ad3ae235fb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Wed, 27 Nov 2024 13:56:14 +0100
Subject: [PATCH] CMXX - Smaller improvements firmware indicators

---
 api/v2/get/billing.php    | 20 ++++++++++----------
 api/v2/get/equipments.php |  5 +++++
 assets/functions.php      | 23 ++++++++++++-----------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/api/v2/get/billing.php b/api/v2/get/billing.php
index 51326d1..a53d3ed 100644
--- a/api/v2/get/billing.php
+++ b/api/v2/get/billing.php
@@ -128,16 +128,16 @@ foreach ($responses as $response){
 
         $output[] = array(
             "#" => $response['rowID'] ,
-            $contract_status => $$status,
-            $contract_account => $partner_data['soldto'],
-            $contract_type => $$type,
-            $contract_billinglabel =>$$contract_billingplan_text,
-            $contract_start_date =>$response['start_date'],
-            $contract_end_date => $date,
-            $contract_reference =>$response['reference'],
-            $contract_billing_count =>$billing_run,
-            $contract_service_2 =>$response['service_count'],
-            $contract_overrun => $usage_percentage,
+            "Status" => $$status,
+            "Account" => $partner_data['soldto'],
+            "Type" => $$type,
+            "Billingplan" =>$$contract_billingplan_text,
+            "Start date" =>$response['start_date'],
+            "End date" => $date,
+            "Reference" =>$response['reference'],
+            "Consumed" =>$billing_run,
+            "Contracted" =>$response['service_count'],
+            "Deviation" => $usage_percentage,
             "Snapshot_date" => $da,
             "Period" => $period
 
diff --git a/api/v2/get/equipments.php b/api/v2/get/equipments.php
index 73d15fb..4b9633e 100644
--- a/api/v2/get/equipments.php
+++ b/api/v2/get/equipments.php
@@ -16,6 +16,11 @@ $sql = 'UPDATE equipment e LEFT JOIN products_software ps ON e.productrowid = ps
 $stmt = $pdo->prepare($sql);
 $stmt->execute();
 
+//UPDATE ASSETS-> SW_LATEST_VERSION WITH PRODUCT_SOFTWARE FROM 2 TO 0
+$sql = 'UPDATE equipment e LEFT JOIN products_software ps ON e.productrowid = ps.productrowid SET e.sw_version_latest = 0 WHERE ps.rowID IS NOT NULL AND sw_version_latest = 2';
+$stmt = $pdo->prepare($sql);
+$stmt->execute();
+
 //UPDATE LATEST TO NO IN CASE HW_VERSION ARE EQUAL AND SW_VERSIONS NOT AND NOT LATEST
 $sql = 'UPDATE equipment e JOIN products_software ps ON e.productrowid = ps.productrowid SET e.sw_version_latest = 0 WHERE ps.latest = 1 AND lower(e.sw_version) <> lower(ps.version) AND lower(e.hw_version) = lower(ps.hw_version) AND e.sw_version_latest = 1';
 $stmt = $pdo->prepare($sql);
diff --git a/assets/functions.php b/assets/functions.php
index bfc7e3f..4cca71d 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -904,17 +904,18 @@ function availableFirmware($sw_version,$sw_version_latest){
       include dirname(__FILE__,2).'/settings/translations/translations_US.php';
   } 
 
-  //SET DEFAULTS
-  if ((isset($sw_version) && $sw_version == '')){
-    $message ='<span class="status">Unknown</span>';
-  } 
-  else {
-        //CHECK IF LATEST
-        if($sw_version_latest == 1){
-            $message = '<span class="status firmware_recent">'.$firmware_recent_text.'</span>';
-        } else {
-            $message = '<span class="status firmware_update">'.$firmware_update_text.'</span>';
-        }   
+  switch ($sw_version_latest) {
+    case 1:
+      $message = '<span class="status firmware_recent">'.$firmware_recent_text.'</span>';
+    break;
+    
+    case 0:
+      $message = '<span class="status firmware_update">'.$firmware_update_text.'</span>';
+    break;
+    
+    default:
+     $message ='<span class="status">Unknown</span>';
+    break;
   }
    
   return $message;