alsmanager_lib 3.0.150 → 3.0.152

package/lib/modules.js

@@ -3285,7 +3285,7 @@ function getDevicesByDetailsSelectSQLite(search_criteria, details) {
                     where_clause += " and ";
                 }  
             }
-            if (details.os) {
+            if (details.version) {
                 where_clause += "(dd.version = '" + details.version + "') ";
                 if (details.storage || details.addon || details.network || details.mac_address || details.name) {
                     where_clause += " and ";
@@ -3310,7 +3310,7 @@ function getDevicesByDetailsSelectSQLite(search_criteria, details) {
         }
         if (details.network) {
             where_clause += "(dn.net_type = '" + details.network + "') ";
-            if (details.storage || details.addon || details.network || details.mac_address) {
+            if (details.storage || details.addon || details.mac_address) {
                 where_clause += " and ";
             }  
         }
@@ -3461,7 +3461,7 @@ function getDevicesByDetailsSelectMySQL(search_criteria, details) {
                     where_clause += " and ";
                 }  
             }
-            if (details.os) {
+            if (details.version) {
                 where_clause += "(dd.version = '" + details.version + "') ";
                 if (details.storage || details.addon || details.network || details.mac_address || details.name) {
                     where_clause += " and ";
@@ -3486,7 +3486,7 @@ function getDevicesByDetailsSelectMySQL(search_criteria, details) {
         }
         if (details.network) {
             where_clause += "(dn.net_type = '" + details.network + "') ";
-            if (details.storage || details.addon || details.network || details.mac_address) {
+            if (details.storage || details.addon || details.mac_address) {
                 where_clause += " and ";
             }  
         }
@@ -3629,17 +3629,28 @@ function getDevicesByDetailsSelect(db_used, search_criteria, details) {
 
 function createDeviceSelectObj(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, in_consegna, id_dev_exclude) {
     var search_criteria = {};
-    search_criteria.search_type = search_type;
-    search_criteria.inv_code = inv_code;
-    search_criteria.dev_type = dev_type;
-    search_criteria.marca = marca;
-    search_criteria.dev_model = dev_model;
-    search_criteria.is_PNRR = is_PNRR;
-    search_criteria.dev_status = dev_status;
-    search_criteria.dev_gestione = dev_gestione;
-    search_criteria.no_inv = no_inv;
-    search_criteria.in_consegna = in_consegna;
-    search_criteria.id_dev_exclude = id_dev_exclude;
+    if (search_type)
+        search_criteria.search_type = search_type;
+    if (inv_code)
+        search_criteria.inv_code = inv_code;
+    if (dev_type)
+        search_criteria.dev_type = dev_type;
+    if (marca)
+        search_criteria.marca = marca;
+    if (dev_model)
+        search_criteria.dev_model = dev_model;
+    if (is_PNRR)
+        search_criteria.is_PNRR = is_PNRR;
+    if (dev_status)
+        search_criteria.dev_status = dev_status;
+    if (dev_gestione)
+        search_criteria.dev_gestione = dev_gestione;
+    if (no_inv)
+        search_criteria.no_inv = no_inv;
+    if (in_consegna)
+        search_criteria.in_consegna = in_consegna;
+    if (id_dev_exclude)
+        search_criteria.id_dev_exclude = id_dev_exclude;
     return search_criteria;
 }
 

package/package.json

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