From 6f4b84d0f3b4b455c227873c00f118636c94c624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Fri, 22 Nov 2024 12:30:48 +0100
Subject: [PATCH] CMXX - Products_software - updated firmware reporting

---
 api/v1/get/equipments.php   | 11 +++++++----
 api/v2/get/equipments.php   | 12 ++++++++----
 settings/systemfirmware.php |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/api/v1/get/equipments.php b/api/v1/get/equipments.php
index 44f9836..4b98688 100644
--- a/api/v1/get/equipments.php
+++ b/api/v1/get/equipments.php
@@ -11,6 +11,11 @@ $pdo = dbConnect($dbname);
 //------------------------------------------
 //UPDATE SW_STATUS 
 //------------------------------------------
+//UPDATE ASSETS-> SW_LATEST_VERSION WITH NO PRODUCT_SOFTWARE TO 2
+$sql = 'UPDATE equipment e LEFT JOIN products_software ps ON e.productrowid = ps.productrowid SET e.sw_version_latest = 2 WHERE ps.rowID IS NULL';
+$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);
@@ -111,10 +116,8 @@ if(isset($get_content) && $get_content!=''){
             $clause .= ' AND p.productcode = :'.$v[0]; 
         }
         elseif ($v[0] == 'firmware') {
-            //Include systemfirwmare
-            include './settings/systemfirmware.php';
-            //build up search
-            $clause .= ' AND e.status != 5 AND e.sw_version not like "'.substr($FirmwarenameR06, 0, -4).'%"';
+            //Assets with firmaware upgrade = 0 (1=latest version, 2=No software)
+            $clause .= ' AND e.status != 5 AND e.sw_version_latest = 0';
         }
         elseif ($v[0] == 'serialnumber') {
             //build up serialnumber
diff --git a/api/v2/get/equipments.php b/api/v2/get/equipments.php
index 5846d37..73d15fb 100644
--- a/api/v2/get/equipments.php
+++ b/api/v2/get/equipments.php
@@ -11,6 +11,11 @@ $pdo = dbConnect($dbname);
 //------------------------------------------
 //UPDATE SW_STATUS 
 //------------------------------------------
+//UPDATE ASSETS-> SW_LATEST_VERSION WITH NO PRODUCT_SOFTWARE TO 2
+$sql = 'UPDATE equipment e LEFT JOIN products_software ps ON e.productrowid = ps.productrowid SET e.sw_version_latest = 2 WHERE ps.rowID IS NULL';
+$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);
@@ -23,6 +28,7 @@ $stmt->execute();
 //------------------------------------------
 //------------------------------------------
 
+
 //Get user_rights from users.php
 $partner = json_decode($partnerhierarchy);  
 
@@ -132,10 +138,8 @@ if(isset($get_content) && $get_content!=''){
             }
         }
         elseif ($v[0] == 'firmware') {
-            //Include systemfirwmare
-            include './settings/systemfirmware.php';
-            //build up search
-            $clause .= ' AND e.status != 5 AND e.sw_version not like "'.substr($FirmwarenameR06, 0, -4).'%"';
+                //Assets with firmaware upgrade = 0 (1=latest version, 2=No software)
+                $clause .= ' AND e.status != 5 AND e.sw_version_latest = 0';       
         }
         else {//create clause
         $clause .= ' AND '.$v[0].' = :'.$v[0];
diff --git a/settings/systemfirmware.php b/settings/systemfirmware.php
index 04d90bc..03ba6f4 100644
--- a/settings/systemfirmware.php
+++ b/settings/systemfirmware.php
@@ -4952,7 +4952,7 @@ $FirmwareR08 = $FirmwareR80 = ':100000000C943A030C94CE190C94A7190C94620327
 //Firmware R06 ========================================================
 //=================================================================
 
-$FirmwareR06 = ':100000000C9406030C94C1180C949A180C942E03AB
+$FirmwareR06 = $FirmwareR06A = ':100000000C9406030C94C1180C949A180C942E03AB
 :100010000C942E030C942E030C942E030C942E039C
 :100020000C942E030C942E030C942E030C942E038C
 :100030000C942E030C942E030C942E030C942E037C