Merge branch 'development'

assets/admin.js

@@ -23,17 +23,37 @@ document.querySelector('.responsive-toggle').onclick = event => {
 document.querySelectorAll('.tabs a').forEach((element, index) => {
     element.onclick = event => {
         event.preventDefault();
-        document.querySelectorAll('.tabs a').forEach(element => element.classList.remove('active'));
-        document.querySelectorAll('.tab-content').forEach((element2, index2) => {
-            if (index == index2) {
-                element.classList.add('active');
-                element2.style.display = 'block';
-            } else {
-                element2.style.display = 'none';
-            }
+        
+        // Toggle the clicked tab
+        const isActive = element.classList.contains('active');
+        const tabContent = document.querySelectorAll('.tab-content')[index];
+        
+        // Remove active class from all tabs and contents
+        document.querySelectorAll('.tabs a').forEach(el => el.classList.remove('active'));
+        document.querySelectorAll('.tab-content').forEach(content => {
+            content.classList.remove('active');
+            content.style.display = 'none';
         });
+        
+        // If it wasn't active, make it active (collapsible behavior)
+        if (!isActive && tabContent) {
+            element.classList.add('active');
+            tabContent.classList.add('active');
+            tabContent.style.display = 'block';
+        }
     };
 });
+
+// Initialize first tab as open by default
+if (document.querySelectorAll('.tabs a').length > 0) {
+    const firstTab = document.querySelectorAll('.tabs a')[0];
+    const firstContent = document.querySelectorAll('.tab-content')[0];
+    if (firstTab && firstContent) {
+        firstTab.classList.add('active');
+        firstContent.classList.add('active');
+        firstContent.style.display = 'block';
+    }
+}
 if (document.querySelector('.filters a')) {
     let filtersList = document.querySelector('.filters .list');
     let filtersListStyle = window.getComputedStyle(filtersList);

assets/functions.php

@@ -1490,6 +1490,7 @@ function getProfile($profile, $permission){
         'com_log' => 'U',
         'software_update' => 'R',
         'software_download' => 'R',
+        'software_available' => 'R'
     ];
 
     // Group permissions: [granting_page => [collection => allowed_actions_string]]
@@ -5110,4 +5111,84 @@ function checkAndInsertIdentityDealer($pdo, $identityUserkey) {
         error_log('Database error in checkAndInsertIdentityDealer: ' . $e->getMessage());
         return false;
     }
+}
+
+//------------------------------------------
+// Update software version status for equipment
+// Parameters:
+//   $pdo - PDO database connection
+//   $serialnumber - Optional serial number. If null, updates all equipment
+// Returns: boolean - true on success, false on error
+//------------------------------------------
+function updateSoftwareVersionStatus($pdo, $serialnumber = null) {
+    try {
+        // Build WHERE clause for serial number filtering if provided
+        $sn_clause = '';
+        $bind_params = [];
+        
+        if ($serialnumber !== null) {
+            $sn_clause = ' AND e.serialnumber = ?';
+            $bind_params = [$serialnumber];
+        }
+
+        //------------------------------------------
+        // STEP 1: Set sw_version_latest = 2 for equipment with NO software assignments
+        //------------------------------------------
+        $sql = 'UPDATE equipment e 
+                LEFT JOIN products_software_assignment psa ON e.productrowid = psa.product_id AND psa.status = 1 
+                SET e.sw_version_latest = 2 
+                WHERE psa.product_id IS NULL' . $sn_clause;
+        
+        $stmt = $pdo->prepare($sql);
+        $stmt->execute($bind_params);
+
+        //------------------------------------------
+        // STEP 2: Set sw_version_latest = 0 for equipment WITH software assignments (from previous 2)
+        //------------------------------------------
+        $sql = 'UPDATE equipment e 
+                JOIN products_software_assignment psa ON e.productrowid = psa.product_id AND psa.status = 1 
+                SET e.sw_version_latest = 0 
+                WHERE e.sw_version_latest = 2' . $sn_clause;
+        
+        $stmt = $pdo->prepare($sql);
+        $stmt->execute($bind_params);
+
+        //------------------------------------------
+        // STEP 3: Set sw_version_latest = 0 for equipment NOT matching latest version
+        //------------------------------------------
+        $sql = 'UPDATE equipment e 
+                JOIN products_software_assignment psa ON e.productrowid = psa.product_id AND psa.status = 1
+                JOIN products_software_versions psv ON psa.software_version_id = psv.rowID
+                SET e.sw_version_latest = 0 
+                WHERE psv.latest = 1 
+                  AND psv.status = 1
+                  AND lower(e.sw_version) <> lower(psv.version) 
+                  AND (psv.hw_version = e.hw_version OR psv.hw_version IS NULL OR psv.hw_version = "")
+                  AND e.sw_version_latest = 1' . $sn_clause;
+        
+        $stmt = $pdo->prepare($sql);
+        $stmt->execute($bind_params);
+
+        //------------------------------------------
+        // STEP 4: Set sw_version_latest = 1 for equipment matching latest version
+        //------------------------------------------
+        $sql = 'UPDATE equipment e 
+                JOIN products_software_assignment psa ON e.productrowid = psa.product_id AND psa.status = 1
+                JOIN products_software_versions psv ON psa.software_version_id = psv.rowID
+                SET e.sw_version_latest = 1 
+                WHERE psv.latest = 1 
+                  AND psv.status = 1
+                  AND lower(e.sw_version) = lower(psv.version) 
+                  AND (psv.hw_version = e.hw_version OR psv.hw_version IS NULL OR psv.hw_version = "")
+                  AND e.sw_version_latest = 0' . $sn_clause;
+        
+        $stmt = $pdo->prepare($sql);
+        $stmt->execute($bind_params);
+
+        return true;
+
+    } catch (PDOException $e) {
+        error_log('Database error in updateSoftwareVersionStatus: ' . $e->getMessage());
+        return false;
+    }
 }