alsmanager_lib 3.0.134 → 3.0.136

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;
 }
 
@@ -4507,7 +4508,7 @@ function getDevicesWithProperties(db_used, id_device) {
 function getBeniDaInventariSQLite(table_name, inv_code, include_imp, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -4583,7 +4584,7 @@ function getBeniDaInventariSQLite(table_name, inv_code, include_imp, is_pnrr, is
 
 function getBeniDaInventariMySQL(table_name, inv_code, include_imp, is_pnrr, is_dismissione) {
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -4678,7 +4679,7 @@ function getBeniDaInventari(db_used, table_name, inv_code, include_imp, is_pnrr,
 function getBeniDaInventariNonAllocatiSQLite(table_name, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -4749,7 +4750,7 @@ function getBeniDaInventariNonAllocatiSQLite(table_name, is_pnrr, is_dismissione
 }
 function getBeniDaInventariNonAllocatiMySQL(table_name, is_pnrr, is_dismissione) {
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -4842,7 +4843,7 @@ function getBeniDaInventariNonAllocati(db_used, table_name, is_pnrr, is_dismissi
 function getBeniDaInventariOnDescriptionSQLite(table_name, search_string, include_imp, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -4917,7 +4918,7 @@ function getBeniDaInventariOnDescriptionSQLite(table_name, search_string, includ
 
 function getBeniDaInventariOnDescriptionMySQL(table_name, search_string, include_imp, is_pnrr, is_dismissione) {
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -5016,7 +5017,7 @@ function getBeniDaInventariOnDescription(db_used, table_name, search_string, inc
 function selectInventariPerIntervalloSQLite(table_name, is_pnrr, is_dismissione, code_da, code_a) {
     var query = "";
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "concat(inv_ict3, ' - ', descrizione_bene, ' - ', marca, ' - ', modello_serie) as Descrizione ";
@@ -5052,7 +5053,7 @@ function selectInventariPerIntervalloSQLite(table_name, is_pnrr, is_dismissione,
 function selectInventariPerIntervalloMySQL() {
     var query = "";
     if (table_name && table_name != '') {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "concat(inv_ict3, ' - ', descrizione_bene, ' - ', marca, ' - ', modello_serie) as Descrizione ";
@@ -5108,7 +5109,7 @@ function selectInventariPerIntervallo(db_used,table_name, is_pnrr, is_dismission
 function getBeniAcquisitiSQLite(table_name, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name) {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -5169,7 +5170,7 @@ function getBeniAcquisitiSQLite(table_name, is_pnrr, is_dismissione) {
 function getBeniAcquisitiMySQL(table_name, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name) {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -5251,7 +5252,7 @@ function insertDeviceMassivoSQLite(table_name,lista_inv) {
     var query = "";
     var insert_sql = "insert into devices (inv_ict3_number, inv_tn_number, manifacturer, model, note) "
     if (table_name && table_name != '') {
-        if (inv_info.tabella == "ImportRevisione2024") {
+        if (inv_info.tabella.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "trim(inv_ict3) as Inventario, ";
             query += "trim(ex_inv) as ex_inventario, ";
@@ -5293,7 +5294,7 @@ function insertDeviceMassivoMySQL(table_name,lista_inv) {
     var query = "";
     var insert_sql = "insert into devices (inv_ict3_number, inv_tn_number, manifacturer, model, note) "
     if (table_name && table_name != '') {
-        if (inv_info.tabella == "ImportRevisione2024") {
+        if (inv_info.tabella.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "trim(inv_ict3) as Inventario, ";
             query += "trim(ex_inv) as ex_inventario, ";
@@ -5432,7 +5433,7 @@ function insertDeviceSiteFromInventarioSQLite(table_name, data_in, id_place, id_
             dp_str = d.getFullYear() + "-" + String((d.getMonth() + 1)).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
         }
             
-        if (inv_info.tabella == "ImportRevisione2024") {
+        if (inv_info.tabella.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "d.id, ";
             query += "'" + id_place + "', ";
@@ -5485,7 +5486,7 @@ function insertDeviceSiteFromInventarioMySQL() {
             dp_str = d.getFullYear() + "-" + String((d.getMonth() + 1)).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
         }
             
-        if (inv_info.tabella == "ImportRevisione2024") {
+        if (inv_info.tabella.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "d.id, ";
             query += "':id_place', ";
@@ -6328,7 +6329,7 @@ function getDevicesSelectForInventarioRawById(db_used, id_device) {
 function selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name && inv_code) {
-        if (table_name == "ImportRevisione2024") {
+        if (table_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -6396,7 +6397,7 @@ function selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissi
 function selectBeneDaInventarioMySQL(table_name, inv_code, is_pnrr, is_dismissione) {
     var query = "";
     if (table_name) {
-        if (table_name == "ImportRevisione2024") {
+        if (ttable_name.startsWith("ImportRevisione")) {
             query = "Select ";
             query += "inv_ict3 as Inventario, ";
             query += "ex_inv as Precedente, ";
@@ -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.136",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",