alsmanager_lib 3.0.134 → 3.0.135

package/lib/modules.js

@@ -2822,14 +2822,15 @@ function queryOSByFilter(tipo, date_ref) {
     var query = "select distinct dt.os as os from devices d ";
     query += "left join device_pc dt on d.id = dt.id_device ";
     query += "where d.type = '" + tipo + "' ";
-    query += "order dt.os"; 
+    query += "and dt.os is not null ";
+    query += "order by dt.os"; 
     return query;
 }
 
 function queryOSVersionByFilter(os) {
     var query = "select distinct dt.os_version as version from device_pc dt ";
     query += "where dt.os = '" + os + "' ";
-    query += "order dt.os_version"; 
+    query += "order by dt.os_version"; 
     return query;
 }
 
@@ -6514,8 +6515,9 @@ function checkEsistenzaInInventario(db_used,codice) {
 
 function selectTabelleInventariComboSQLite(only_dismiss, only_pnrr) {
     var query = "select name, description from table_inventari "
+    query += "where is_active = 1 ";
     if ((only_dismiss && only_dismiss == 1)|| (only_pnrr && only_pnrr == 1)) {    
-        query += "where ";
+        query += "and ";
         if (only_dismiss && only_dismiss == 1) {
             query += "is_dismissione = 1";
             if (only_pnrr && only_pnrr == 1)
@@ -6530,8 +6532,9 @@ function selectTabelleInventariComboSQLite(only_dismiss, only_pnrr) {
 
 function selectTabelleInventariComboMySQL(only_dismiss, only_pnrr) {
     var query = "select name, description from table_inventari "
+    query += "where is_active = 1 ";
     if ((only_dismiss && only_dismiss == 1)|| (only_pnrr && only_pnrr == 1)) {    
-        query += "where ";
+        query += "and ";
         if (only_dismiss && only_dismiss == 1) {
             query += "is_dismissione = 1";
             if (only_pnrr && only_pnrr == 1)

package/package.json

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