alsmanager_lib 3.0.135 → 3.0.137

package/lib/modules.js

@@ -4508,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, ";
@@ -4584,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, ";
@@ -4679,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, ";
@@ -4750,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, ";
@@ -4843,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, ";
@@ -4918,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, ";
@@ -5017,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 ";
@@ -5053,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 ";
@@ -5109,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, ";
@@ -5170,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, ";
@@ -5252,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, ";
@@ -5294,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, ";
@@ -5433,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 + "', ";
@@ -5486,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', ";
@@ -6329,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, ";
@@ -6370,8 +6370,8 @@ function selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissi
             query += "Costo, ";
             query += "Note as 'Note bene' ";
             query += "from " + table_name + " imp ";
-            query += " where trim(Inventario) = '" + inv_code + "'"
-            query += " group by Inventario";
+            query += " where trim(inv_ict3) = '" + inv_code + "'"
+            query += " group by inv_ict3";
         }
         else {
             query = "Select ";
@@ -6388,7 +6388,7 @@ function selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissi
             query += "data_scarico as 'Data scarico', ";
             query += "concat(imp.note, ' ', note_2, ' ', note_3) as note_complete ";
             query += " from " + table_name + " imp ";
-            query += " where Inventario = '" + inv_code + "'";
+            query += " where inv_ict3 = '" + inv_code + "'";
         }
     }
     return query;
@@ -6397,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, ";
@@ -6439,7 +6439,7 @@ function selectBeneDaInventarioMySQL(table_name, inv_code, is_pnrr, is_dismissio
             query += "Note as 'Note bene' ";
             query += "from TAB_NAME imp ";
             query += " where trim(inv_ict3) = :inv_code "
-            query += " group by Inventario";
+            query += " group by inv_ict3";
         }
         else {
             query = "Select ";

package/package.json

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