alsmanager_lib 3.0.142 → 3.0.143

package/lib/modules.js

@@ -2834,21 +2834,26 @@ function queryOSVersionByFilter(os) {
     return query;
 }
 
-function queryStoragesByFilter() {
-    var query = "";
-    query += "";
+function queryStoragesByFilter(tipo) {
+    var query = "select distinct ds.storage_type, st.name as version from device_storages ds ";
+    query += "join storage_types st on st.id = ds.storage_type "
+    query += "left join devices d on ds.id_device = d.id "
+    query += "where d.type = '" + tipo + "' ";
+    query += "order by st.exp_order"; 
     return query;
 }
 
 function queryAddOnsByFilter() {
-    var query = "";
-    query += "";
+    var query = "select distinct da.addon_type, aty.name from device_addons da ";
+    query += "join addon_types aty on aty.id = da.storage_type "
+    query += "order by aty.name"; 
     return query;
 }
 
 function queryNetworksByFilter() {
-    var query = "";
-    query += "";
+    var query = "select distinct dn.net_type, aty.name from device_networks dn ";
+    query += "join network_types nty on nty.name = dn.net_type "
+    query += "order by nty.name"; 
     return query;
 }
 
@@ -3351,9 +3356,7 @@ function getDevicesByDetailsSelectMySQL(search_criteria, details) {
             }
         }
     }
-    if (search_criteria.id_dev_exclude > 0) {
-        where_clause += " and d.id <> :id_dev_exclude";
-    }
+   
     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 ";
@@ -3377,73 +3380,69 @@ function getDevicesByDetailsSelectMySQL(search_criteria, details) {
             query += "left join device_addons don on d.id = don.id_device ";
         }
     }
-    /*
-    objDetails.version = version;
-    objDetails.storage = storage;
-    objDetails.addon = addon;
-    objDetails.network = network;
-    objDetails.mac_address = mac_address;
-    objDetails.name = name;
-    */
-    query += where_clause;
     // Filtro su dettagli...
     if (details) {
-        if (search_criteria.search_type == "DESKTOP" || search_criteria.search_type == "NOTEBOOK") {
+        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") {
             where_clause += " and ";
             if (details.os) {
-                where_clause += "(dd.os == '" + 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 + "') ";
+                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 + "') ";
+                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 == "A") {
+        else if (search_criteria.search_type == "MONITOR") {
 
         }
-        else if (search_criteria.search_type == "B") {
+        else if (search_criteria.search_type == "SWITCH") {
 
         }
         else if (search_criteria.search_type == "C") {
 
         }
-
-
-
         if (details.network) {
-            where_clause += "(dn.net_type == '" + 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) {
-            where_clause += "(dn.mac_address == '" + details.mac_address + "') ";
-            if (details.storage || details.addon) {
-                where_clause += " and ";
-            }  
+            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 + "') ";
+            where_clause += "(dr.storage_type = '" + details.storage + "') ";
             if (details.addon) {
                 where_clause += " and ";
             }  
         }
         if (details.addon) {
-            where_clause += "(don.addon_type == '" + details.addon + "') ";
+            where_clause += "(don.addon_type = '" + details.addon + "') ";
         }
     }
+    // Esclusione 
+    if (search_criteria.id_dev_exclude > 0) {
+        where_clause += " and d.id <> :id_dev_exclude";
+    }
+    query += where_clause;
     query += "order by id";
     return query;
 }

package/package.json

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