From f1a38caa862666b7b1740ca921cd4f4bb73e6bff 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 14:14:54 +0100
Subject: [PATCH] CMXX - Updated firmwaretool to work with versions

---
 assets/scripts.js | 17 +++++++++++++----
 equipment.php     | 15 +++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/assets/scripts.js b/assets/scripts.js
index bccccb5..13d6961 100644
--- a/assets/scripts.js
+++ b/assets/scripts.js
@@ -99,8 +99,17 @@ async function getDeviceData(){
       fw = x.substring(b,c);
       fw = fw.replace(/^0+/, '');
     }
+
+    if (x.indexOf("FWDATE=") > 0){
+      var a = x.indexOf("FWDATE=");
+      var b = a + 7;
+      var c = b + 10;
+      fwdate = x.substring(b,c);
+      fwdate = fwdate.replaceAll('-', '');
+    }
+
     //Check if HW is retrieved from device
-    if (x.indexOf("HW=") > 0 && x.indexOf("FW=") >0){
+    if (x.indexOf("HW=") > 0 && x.indexOf("FW=") >0 && x.indexOf("FWDATE=") >0){
       var a = x.indexOf("HW=");
       var b = a + 3;
       var c = b + 8;
@@ -118,8 +127,8 @@ async function getDeviceData(){
         sw = 'R'+f;
       }
         
-    $fw_name = 'Firmware_'+fw+'_'+sw;
-    console.log($fw_name);
+    fw_name = fwdate+'_Firmware_'+fw+'_'+sw;
+    console.log(fw_name);
     getServiceID().then(firmwareUpdate);
     progressBar("80", "checking for available firmware", "#04AA6D");
     setTimeout(checkAvailableFirmware, 5000);
@@ -134,7 +143,7 @@ async function getDeviceData(){
 function firmwareUpdate(data){
 
     var serialnumber = serial;
-    var action = '/v2/products_software/sn='+serialnumber+'&version='+$fw_name;
+    var action = '/v2/products_software/sn='+serialnumber+'&version='+fw_name;
     var url = link+action;
   
     var bearer = 'Bearer ' + data;
diff --git a/equipment.php b/equipment.php
index e6896e1..9018bd1 100644
--- a/equipment.php
+++ b/equipment.php
@@ -233,19 +233,10 @@ $view .= '<div class="content-block">
                 <tr>
                     <td style="width:25%;">'.$equipment_label5.'</td>
                     <td>'.$responses->hw_version.'</td>
-                </tr>';
-//SHOW SOFTWARE NAME WHEN AVAILABLE
-$software_name = '';
-if (isset($products_software) && $products_software !=''){
-    foreach ($products_software as $products_soft){
-        if ($products_soft->version == $responses->sw_version){
-            $software_name = ' - '.$products_soft->software;
-        }
-    }
-}
-$view .= '      <tr>
+                </tr> 
+                <tr>
                     <td style="width:25%;">'.$equipment_label6.'</td>
-                    <td>'.$responses->sw_version.$software_name.'</td>
+                    <td>'.$responses->sw_version.'</td>
                 </tr>';
 //SHOW ONLY SW_UPGRADE WHEN SET
 if (isset($products_software) && $products_software !=''){