alsmanager_lib 1.0.58 → 1.0.60

package/lib/modules.js

@@ -412,25 +412,27 @@ function insertNetwork(db_used, id_device, network_obj) {
 }
 function updateNetworkSQLite(id_device, network_obj) {
     var query = "update device_networks "
-    query += "set id_device = " + id_device + ", ";
+    query += "set ";
     query += "net_type = '" + network_obj.tipo + "', ";
     query += "mac_address  = '" + network_obj.mac_address + "', ";
     query += "ipv4_static = '" + network_obj.ipv4_static + "', ";
     query += "ipv6_static  =  '" + network_obj.ipv6_static + "' ";
-    query += "where id = " + network_obj.id;
+    query += "where id = " + network_obj.id + " ";
+    query += "and id_device = " + id_device;
     return query;
 }
 function updateNetworkMySQL(id_device, network_obj) {
     var query = "update device_networks "
-    query += "set id_device = :id_device, ";
+    query += "set ";
     query += "net_type = :tipo, ";
     query += "mac_address  = :mac_address, ";
     query += "ipv4_static = :ipv4_static, ";
     query += "ipv6_static  =  :ipv6_static ";
-    query += "where id = :id_network";
+    query += "where id = :id_network ";
+    query += "and id_device = :id_device";
     return query;
 }
-function updateNetwork(db_used, d_device, network_obj) {
+function updateNetwork(db_used, id_device, network_obj) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -2260,6 +2262,177 @@ function getBeniDaInventari(db_used, table_name, inv_code, include_imp, is_pnrr,
     }
     return query;
 }
+// Su modello
+function getBeniDaInventariOnDescriptionSQLite(table_name, search_string, include_imp, is_pnrr, is_dismissione) {
+    var query = "";
+    if (table_name && table_name != '') {
+        if (table_name == "ImportRevisione2024") {
+            query = "Select ";
+            query += "inv_ict3 as Inventario, ";
+            query += "ex_inv as Precedente, ";
+            query += "descrizione_bene as Descrizione, ";
+            query += "collocazione as Luogo, ";
+            query += "sede as Plesso, ";
+            query += "marca as 'Marca bene', ";
+            query += "modello_serie as Modello, ";
+            query += "targa_matricola as Matricola, ";
+            query += "data_presa_in_carico as 'Data acq.', ";
+            query += "prezzo as Costo, ";
+            query += "data_scarico as 'Data scarico', ";
+            query += "concat(imp.NOTE, ' ', NOTE_2, ' ', NOTE_3, ' ', NOTE_4, ' ',  NOTE_5, ' ', NOTE_6, ' ', NOTE_7, ' ', NOTE_8) as 'Note bene' ";
+            query += "from " + table_name + " imp ";
+            query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
+        }
+        else if (table_name == "devices") {
+            query = getDevicesSelectForInventarioRawSQLite(inv_code);
+        }
+        else if (is_pnrr == 1) {
+            query = "Select ";
+            query += "inventario as Inventario, ";
+            query += "Tipo, ";
+            query += "marca as 'Marca bene', ";
+            query += "Descrizione, ";
+            query += "Plesso as Luogo ";
+            query += "from " + table_name + " imp ";
+        }
+        else if (is_dismissione == 1) {
+            query = "Select ";
+            query += "inv_ict3 as Inventario, ";
+            query += "Descrizione, ";
+            query += "Plesso, ";
+            query += "Costo, ";
+            query += "Note as 'Note bene' ";
+            query += "from " + table_name + " imp ";
+        }
+        else {
+            query = "Select ";
+            query += "inv_ict3 as Inventario, ";
+            query += "ex_inventario as Precedente, ";
+            query += "descrizione_bene as Descrizione, ";
+            query += "collocazione as Luogo, ";
+            query += "sede as Plesso, ";
+            query += "marca as 'Marca bene', ";
+            query += "modello_serie as Modello, ";
+            query += "targa_matricola as Matricola, ";
+            query += "data_presa_in_carico as 'Data acq.', ";
+            query += "prezzo as Costo, ";
+            query += "data_scarico as 'Data scarico', ";
+            query += "concat(note, ' ', note_2, ' ', note_3) as 'Note bene' ";
+            query += "from " + table_name + " imp ";
+        }
+    }
+    if (search_string && table_name) {
+        if (table_name != "devices" && is_pnrr != 1 && is_dismissione != 1) {
+            query += " where descrizione_bene like '%" + search_string + "%'" 
+            if (!include_imp || include_imp == 0) {
+                query += "and d.id is null"
+            }
+        }    
+    }
+    else {
+        if (table_name != "devices" && is_pnrr != 1 && is_dismissione != 1) {
+            if (!include_imp || include_imp == 0) {
+                query += "where d.id is null"
+            }
+        }    
+    }
+    return query;
+}
+
+function getBeniDaInventariOnDescriptionMySQL(table_name, search_string, include_imp, is_pnrr, is_dismissione) {
+    if (table_name && table_name != '') {
+        if (table_name == "ImportRevisione2024") {
+            query = "Select ";
+            query += "inv_ict3 as Inventario, ";
+            query += "ex_inv as Precedente, ";
+            query += "descrizione_bene as Descrizione, ";
+            query += "collocazione as Luogo, ";
+            query += "sede as Plesso, ";
+            query += "marca as 'Marca bene', ";
+            query += "modello_serie as Modello, ";
+            query += "targa_matricola as Matricola, ";
+            query += "data_presa_in_carico as 'Data acq.', ";
+            query += "prezzo as Costo, ";
+            query += "data_scarico as 'Data scarico', ";
+            query += "concat(imp.NOTE, ' ', NOTE_2, ' ', NOTE_3, ' ', NOTE_4, ' ',  NOTE_5, ' ', NOTE_6, ' ', NOTE_7, ' ', NOTE_8) as 'Note bene' ";
+            query += "from :table_name imp ";
+            query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
+        }
+        else if (table_name == "devices") {
+            query = getDevicesSelectForInventarioRawMySQL(inv_code);
+        }
+        else if (is_pnrr == 1) {
+            query = "Select ";
+            query += "inventario as Inventario, ";
+            query += "Tipo, ";
+            query += "marca as 'Marca bene', ";
+            query += "Descrizione, ";
+            query += "Plesso as Luogo ";
+            query += "from :table_name imp ";
+        }
+        else if (is_dismissione == 1) {
+            query = "Select ";
+            query += "inv_ict3 as Inventario, ";
+            query += "Descrizione, ";
+            query += "Plesso, ";
+            query += "Costo, ";
+            query += "Note as 'Note bene' ";
+            query += "from :table_name imp ";
+        }
+        else {
+            query = "Select ";
+            query += "inv_ict3 as Inventario, ";
+            query += "ex_inventario as Precedente, ";
+            query += "descrizione_bene as Descrizione, ";
+            query += "collocazione as Luogo, ";
+            query += "sede as Plesso, ";
+            query += "marca as 'Marca bene', ";
+            query += "modello_serie as Modello, ";
+            query += "targa_matricola as Matricola, ";
+            query += "data_presa_in_carico as 'Data acq.', ";
+            query += "prezzo as Costo, ";
+            query += "data_scarico as 'Data scarico', ";
+            query += "concat(note, ' ', note_2, ' ', note_3) as 'Note bene' ";
+            query += "from :table_name imp ";
+        }
+    }
+    if (inv_code && table_name) {
+        if (table_name != "devices" && is_pnrr != 1 && is_dismissione != 1) {
+            query += " where Inventario = '" + inv_code +"' or ";
+            query += " Precedente = '" + inv_code +"' ";
+            if (!include_imp || include_imp == 0) {
+                query += "and d.id is null"
+            }
+        }    
+    }
+    else {
+        if (table_name != "devices" && is_pnrr != 1 && is_dismissione != 1) {
+            if (!include_imp || include_imp == 0) {
+                query += "where d.id is null"
+            }
+        }    
+    }
+    return query;
+}
+
+function getBeniDaInventariOnDescription(db_used, table_name, search_string, include_imp, is_pnrr, is_dismissione) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getBeniDaInventariOnDescriptionSQLite(table_name, inv_code, include_imp, is_pnrr, is_dismissione);
+                break;
+            case 'MYSQL':
+                query = getBeniDaInventariOnDescriptionMySQL(table_name, inv_code, include_imp, is_pnrr, is_dismissione);
+                break;
+        }
+    }
+    return query;
+}
+
+
+
+
 // Range..
 function selectInventariPerIntervalloSQLite(table_name, is_pnrr, is_dismissione, code_da, code_a) {
     var query = "";
@@ -7584,6 +7757,7 @@ module.exports = {
     updateDeviceFromInventario,
     insertDeviceSiteFromInventario,
     getBeniDaInventari,
+    getBeniDaInventariOnDescription,
     getNetworksOnDevice,
     getImportedPropertiesByIdDevice,
     getSetInfoByIdSet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alsmanager_lib",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",