alsmanager_lib 3.0.146 → 3.0.149

package/lib/modules.js

@@ -3163,6 +3163,7 @@ function buildDevicesQuery(queryList) {
     return whereClause;
 }
 
+
 // End Device select
 // Select devices by details
 function getDevicesByDetailsSelectSQLite(search_criteria, details) {
@@ -3182,6 +3183,29 @@ function getDevicesByDetailsSelectSQLite(search_criteria, details) {
         query += "left join device_gestioni dg on d.id = dg.id_device ";
     if (search_criteria.in_consegna) 
         query += "left join consegna_beni cb on d.id = cb.id_bene ";
+    if (details) {
+        if (search_criteria.dev_type == "DESKTOP" || search_criteria.dev_type == "NOTEBOOK" || search_criteria.dev_type == "TABLET" || search_criteria.dev_type == "SMART TV" || search_criteria.dev_type == "SERVER") {
+            query += "left join device_pc dd on d.id = dd.id_device ";
+        }
+        else if (search_criteria.dev_type == "A") {
+
+        }
+        else if (search_criteria.dev_type == "B") {
+
+        }
+        else if (search_criteria.dev_type == "C") {
+
+        }
+        if (details.network || details.mac_address) {
+            query += "left join device_networks dn on d.id = dn.id_device ";
+        }
+        if (details.storage) {
+            query += "left join device_storages dr on d.id = dr.id_device ";
+        }
+        if (details.addon) {
+            query += "left join device_addons don on d.id = don.id_device ";
+        }
+    }
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
     if (search_criteria.inv_code || search_criteria.dev_type || search_criteria.marca || search_criteria.dev_model || (search_criteria.is_PNRR && search_criteria.is_PNRR > 0) || search_criteria.dev_status || search_criteria.dev_gestione || search_criteria.no_inv || search_criteria.in_consegna) {
@@ -3250,6 +3274,66 @@ function getDevicesByDetailsSelectSQLite(search_criteria, details) {
             }
         }
     }
+     
+    // Filtro su dettagli...
+    if (details) {
+        if (search_criteria.dev_type == "DESKTOP" || search_criteria.dev_type == "NOTEBOOK" || search_criteria.dev_type == "TABLET" || search_criteria.dev_type == "SMART TV" || search_criteria.dev_type == "SERVER") {
+            where_clause += " and ";
+            if (details.os) {
+                where_clause += "(dd.os = '" + details.os + "') ";
+                if (details.version || details.storage || details.addon || details.network || details.storage || details.mac_address || details.name) {
+                    where_clause += " and ";
+                }  
+            }
+            if (details.os) {
+                where_clause += "(dd.version = '" + details.version + "') ";
+                if (details.storage || details.addon || details.network || details.mac_address || details.name) {
+                    where_clause += " and ";
+                }  
+            }
+            if (details.name) {
+                where_clause += "(dd.pc_name = '" + details.name + "') ";
+                if (details.storage || details.addon || details.network || details.mac_address) {
+                    where_clause += " and ";
+                }  
+            }
+
+        }
+        else if (search_criteria.search_type == "MONITOR") {
+
+        }
+        else if (search_criteria.search_type == "SWITCH") {
+
+        }
+        else if (search_criteria.search_type == "C") {
+
+        }
+        if (details.network) {
+            where_clause += "(dn.net_type = '" + details.network + "') ";
+            if (details.storage || details.addon || details.network || details.mac_address) {
+                where_clause += " and ";
+            }  
+        }
+        if (details.mac_address) {
+            var mac_address_clean = details.mac_address.replaceAll(":","").replaceAll("-","").trim().toLowerCase();
+            if (mac_address_clean != "") {
+                where_clause += "lower(trim(replace(replace(dn.mac_address, ':', ''), '-', ''))) = '" + mac_address_clean + "') ";
+                if (details.storage || details.addon) {
+                    where_clause += " and ";
+                }  
+            }
+        }
+        if (details.storage) {
+            where_clause += "(dr.storage_type = '" + details.storage + "') ";
+            if (details.addon) {
+                where_clause += " and ";
+            }  
+        }
+        if (details.addon) {
+            where_clause += "(don.addon_type = '" + details.addon + "') ";
+        }
+    }
+    // Esclusione 
     if (search_criteria.id_dev_exclude > 0) {
         where_clause += " and d.id <> " + search_criteria.id_dev_exclude;
     }
@@ -3275,18 +3359,27 @@ function getDevicesByDetailsSelectMySQL(search_criteria, details) {
         query += "left join consegna_beni cb on d.id = cb.id_bene ";
 
     if (details) {
-        if (search_criteria.search_type == "DESKTOP" || search_criteria.search_type == "NOTEBOOK") {
+        if (search_criteria.dev_type == "DESKTOP" || search_criteria.dev_type == "NOTEBOOK" || search_criteria.dev_type == "TABLET" || search_criteria.dev_type == "SMART TV" || search_criteria.dev_type == "SERVER") {
             query += "left join device_pc dd on d.id = dd.id_device ";
         }
-        else if (search_criteria.search_type == "A") {
+        else if (search_criteria.dev_type == "A") {
 
         }
-        else if (search_criteria.search_type == "B") {
+        else if (search_criteria.dev_type == "B") {
 
         }
-        else if (search_criteria.search_type == "C") {
+        else if (search_criteria.dev_type == "C") {
 
         }
+        if (details.network || details.mac_address) {
+            query += "left join device_networks dn on d.id = dn.id_device ";
+        }
+        if (details.storage) {
+            query += "left join device_storages dr on d.id = dr.id_device ";
+        }
+        if (details.addon) {
+            query += "left join device_addons don on d.id = don.id_device ";
+        }
     }
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
@@ -3357,29 +3450,7 @@ function getDevicesByDetailsSelectMySQL(search_criteria, details) {
         }
     }
    
-    if (details) {
-        if (search_criteria.search_type == "DESKTOP" || search_criteria.search_type == "NOTEBOOK") {
-            query += "left join device_pc dd on d.id = dd.id_device ";
-        }
-        else if (search_criteria.search_type == "A") {
-
-        }
-        else if (search_criteria.search_type == "B") {
-
-        }
-        else if (search_criteria.search_type == "C") {
-
-        }
-        if (details.network || details.mac_address) {
-            query += "left join device_networks dn on d.id = dn.id_device ";
-        }
-        if (details.storage) {
-            query += "left join device_storages dr on d.id = dr.id_device ";
-        }
-        if (details.addon) {
-            query += "left join device_addons don on d.id = don.id_device ";
-        }
-    }
+    
     // Filtro su dettagli...
     if (details) {
         if (search_criteria.search_type == "DESKTOP" || search_criteria.search_type == "NOTEBOOK" || search_criteria.search_type == "TABLET" || search_criteria.search_type == "SMART TV" || search_criteria.search_type == "SERVER") {

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "3.0.146",
+  "version": "3.0.149",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",