alsmanager_lib 3.0.4 → 3.0.6

package/lib/modules.js

@@ -2458,9 +2458,10 @@ function queryDeviceModelsByFilter(db_used, manifacturer, dev_type) {
 //end of Manage models
 
 // Device select
-function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
+function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, id_dev_exclude) {
     var query = "SELECT DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
@@ -2474,7 +2475,7 @@ function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_mode
         query += "left join device_gestioni dg on d.id = dg.id_device"
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
-    if (inv_code || dev_type || marca || dev_model || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione) {
+    if (inv_code || dev_type || marca || dev_model || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione || no_inv) {
         if (inv_code) {
             if (search_type == "ESATTA") {
                 where_clause += " and (d.inv_ict3_number = '" + inv_code + "' or ";
@@ -2495,49 +2496,53 @@ function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_mode
             where_clause += " and ";
             if (dev_type) {
                 where_clause += "d.type = '" + dev_type + "'";
-                if (marca || (is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione) {
+                if (marca || (is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }
             }
             if (marca) {
                 where_clause += " d.manifacturer = '" + marca + "'";
-                if ((is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione) {
+                if ((is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }
             }
             if (is_PNRR && is_PNRR > 0) {
                 where_clause += " (d.inv_pnrr_number <> '' and inv_pnrr_number is not null) ";
-                if (dev_status || dev_gestione || dev_model) {
+                if (dev_status || dev_gestione || dev_model || no_inv) {
                     where_clause += " and ";
                 }                
             }
             if (dev_model) {
                 where_clause += " d.model = '" + dev_model + "'";
-                if (dev_status || dev_gestione) {
+                if (dev_status || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }
             }
             if (dev_status) {
                 where_clause += " du.status = " + dev_status + " and date('now') >= du.date_status";
-                if (dev_gestione) {
+                if (dev_gestione || no_inv) {
                     where_clause += " and ";
                 }                
             }
             if (dev_gestione) {
                 where_clause += " dg.id_gestione = " + dev_gestione + " and date('now') >= dg.date_start and date('now') <= dg.date_end";
+                if (no_inv) {
+                    where_clause += " and ";
+                }                
+            }
+            if (no_inv) {
+                where_clause += " d.no_inventario = 1";
             }
         }
     }
-    else {
-        if (id_dev_exclude > 0) {
-            where_clause += " and d.id <> " + id_dev_exclude;
-        }
+    if (id_dev_exclude > 0) {
+        where_clause += " and d.id <> " + id_dev_exclude;
     }
     query += where_clause;
     return query;
 }
 
-function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
+function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, id_dev_exclude) {
     var query = "SELECT DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
@@ -2554,7 +2559,7 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model
 
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
-    if (inv_code || dev_type || marca || dev_model || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione) {
+    if (inv_code || dev_type || marca || dev_model || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione || no_inv) {
         if (inv_code) {
             if (search_type == "ESATTA") {
                 where_clause += " and (d.inv_ict3_number = :inv_code or ";
@@ -2575,43 +2580,47 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model
             where_clause += " and ";
             if (dev_type) {
                 where_clause += " d.type = :dev_type";
-                if (marca || dev_model || (is_PNRR && is_PNRR > 0 || dev_status || dev_gestione)) {
+                if (marca || dev_model || (is_PNRR && is_PNRR > 0 || dev_status || dev_gestione || no_inv)) {
                     where_clause += " and ";
                 }
             }
             if (marca) {
                 where_clause += " d.manifacturer = :marca";
-                if (dev_model || is_PNRR && is_PNRR > 0 || dev_status || dev_gestione) {
+                if (dev_model || is_PNRR && is_PNRR > 0 || dev_status || dev_gestione|| no_inv) {
                     where_clause += " and ";
                 }
             }
             if (is_PNRR && is_PNRR > 0) {
                 where_clause += " (d.inv_pnrr_number <> '' and inv_pnrr_number is not null) ";
-                if (dev_model || dev_status || dev_gestione ) {
+                if (dev_model || dev_status || dev_gestione || no_inv ) {
                     where_clause += " and ";
                 }   
             }
             if (dev_model) {
                 where_clause += " d.model = :dev_model ";
-                if (dev_status || dev_gestione) {
+                if (dev_status || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }   
             }
             if (dev_status) {
                 where_clause += " du.status = :dev_status and CURDATE() >= du.date_status";
-                if (dev_gestione) {
+                if (dev_gestione || no_inv) {
                     where_clause += " and ";
                 }   
             }
             if (dev_gestione) {
                 where_clause += " dg.id_gestione = :dev_gestione and CURDATE() >= dg.date_start and CURDATE() <= dg.date_end";
+                if (no_inv) {
+                    where_clause += " and ";
+                }                
+            }
+            if (no_inv) {
+                where_clause += " d.no_inventario = 1";
             }
         }
     }
-    else {
-        if (id_dev_exclude > 0) {
-            where_clause += " and d.id <> :id_dev_exclude";
-        }
+    if (id_dev_exclude > 0) {
+        where_clause += " and d.id <> :id_dev_exclude";
     }
 
     query += where_clause;
@@ -2619,7 +2628,7 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model
     return query;
 }
 
-function getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
+function getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, id_dev_exclude) {
     var query = "SELECT DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
@@ -2635,7 +2644,7 @@ function getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_mode
         query += "left join device_gestioni dg on d.id = dg.id_device"
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
-    if (inv_code || dev_type || marca || dev_model || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione) {
+    if (inv_code || dev_type || marca || dev_model || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione || no_inv) {
         if (inv_code) {
             if (search_type == "ESATTA") {
                 where_clause += " and (d.inv_ict3_number = '" + inv_code + "' or ";
@@ -2656,60 +2665,64 @@ function getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_mode
             where_clause += " and ";
             if (dev_type) {
                 where_clause += "d.type = '" + dev_type + "'";
-                if (marca || (is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione) {
+                if (marca || (is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }
             }
             if (marca) {
                 where_clause += " d.manifacturer = '" + marca + "'";
-                if ((is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione) {
+                if ((is_PNRR && is_PNRR > 0) || dev_status || dev_model || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }
             }
             if (is_PNRR && is_PNRR > 0) {
                 where_clause += " (d.inv_pnrr_number <> '' and inv_pnrr_number is not null) ";
-                if (dev_status || dev_model || dev_gestione) {
+                if (dev_status || dev_model || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }                
             }
             if (dev_model) {
                 where_clause += " d.model = '" + dev_model + "'";
-                if (dev_status || dev_gestione) {
+                if (dev_status || dev_gestione || no_inv) {
                     where_clause += " and ";
                 }
             }
             if (dev_status) {
                 where_clause += " du.status = " + dev_status + " and CURDATE() >= du.date_status";
-                if (dev_gestione) {
+                if (dev_gestione || no_inv) {
                     where_clause += " and ";
                 }                
             }
             if (dev_gestione) {
                 where_clause += " dg.id_gestione = " + dev_gestione + " and CURDATE() >= dg.date_start and CURDATE() <= dg.date_end";
+                if (no_inv) {
+                    where_clause += " and ";
+                }                
+            }
+            if (no_inv) {
+                where_clause += " d.no_inventario = 1";
             }
         }
     }
-    else {
-        if (id_dev_exclude > 0) {
-            where_clause += " and d.id <> " + id_dev_exclude;
-        }
+    if (id_dev_exclude > 0) {
+        where_clause += " and d.id <> " + id_dev_exclude;
     }
     query += where_clause;
     return query;
 }
 
-function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
+function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv,id_dev_exclude) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
+                query = getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, id_dev_exclude);
                 break;
             case 'MYSQL':
-                query = getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
+                query = getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, id_dev_exclude);
                 break;
             case 'MYSQL2':
-                query = getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
+                query = getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_model, is_PNRR, dev_status, dev_gestione, no_inv, id_dev_exclude);
                 break;
         }
     }
@@ -2720,6 +2733,7 @@ function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, dev_m
 function getDevicesByIdDocSQLite(id_doc) {
     var query = "SELECT DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
@@ -2736,6 +2750,7 @@ function getDevicesByIdDocSQLite(id_doc) {
 function getDevicesByIdDocMySQL(id_doc) {
     var query = "SELECT DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
@@ -2770,6 +2785,7 @@ function getDevicesByIdDoc(db_used, id_doc) {
 function getDevicesSelectBySiteSQLite(id_site, dev_type) {
     var query = "select distinct d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -2797,6 +2813,7 @@ function getDevicesSelectBySiteSQLite(id_site, dev_type) {
 function getDevicesSelectBySiteMySQL(id_site, dev_type) {
     var query = "select DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -2825,6 +2842,7 @@ function getDevicesSelectBySiteMySQL(id_site, dev_type) {
 function getDevicesSelectBySiteMySQL2(id_site, dev_type) {
     var query = "select distinct d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -2871,6 +2889,7 @@ function getDevicesSelectBySite(db_used, id_site, dev_type) {
 function getDevicesSelectByPlaceSQLite(id_place, dev_type) {
     var query = "select distinct d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -2898,6 +2917,7 @@ function getDevicesSelectByPlaceSQLite(id_place, dev_type) {
 function getDevicesSelectByPlaceMySQL(id_place, dev_type) {
     var query = "select DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
@@ -2924,6 +2944,7 @@ function getDevicesSelectByPlaceMySQL(id_place, dev_type) {
 function getDevicesSelectByPlaceMySQL2(id_place, dev_type) {
     var query = "select distinct d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -3070,6 +3091,7 @@ function getDevicesCounterByPlace(db_used, id_place) {
 function getDevicesSelectByRelatedSQLite(id_device) {
     var query = "select type as Tipo, manifacturer as Marca, model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -3090,6 +3112,7 @@ function getDevicesSelectByRelatedSQLite(id_device) {
 function getDevicesSelectByRelatedMySQL(id_device) {
     var query = "select type as Tipo, manifacturer as Marca, model as modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
     query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
@@ -3130,7 +3153,7 @@ function queryDeviceByIdSQLite(id_device) {
     query += "d.manifacturer as Marca, d.model as Modello, ";
     query += "d.inv_ict3_number as Inventario, d.serial_no, ";
     query += "d.inv_tn_number, d.inv_pnrr_number, d.inv_tndigit_number, "; 
-    query += "d.note, d.num_objects from devices d ";
+    query += "d.note, d.num_objects, d.no_inventario from devices d ";
     query += "where d.id = " + id_device;
     return query;
 }
@@ -3139,7 +3162,7 @@ function queryDeviceByIdMySQL(id_device) {
     query += "d.manifacturer as Marca, d.model as Modello, ";
     query += "d.inv_ict3_number as Inventario, d.serial_no, ";
     query += "d.inv_tn_number, d.inv_pnrr_number, d.inv_tndigit_number, ";
-    query += "d.note, d.num_objects from devices d ";
+    query += "d.note, d.num_objects, d.no_inventario from devices d ";
     query += "where d.id = :id_device";
     return query;
 }
@@ -3167,7 +3190,7 @@ function queryDeviceByIdentificativoSQLite(identificativo) {
     query += "d.manifacturer as Marca, d.model as Modello, ";
     query += "d.inv_ict3_number as Inventario, d.serial_no, ";
     query += "d.inv_tn_number, d.inv_pnrr_number, d.inv_tndigit_number, ";
-    query += "d.note, d.num_objects from devices d ";
+    query += "d.note, d.num_objects, d.no_inventario from devices d ";
     query += "where (d.inv_ict3_number = '" + identificativo + "' or ";
     query += "d.serial_no = '" + identificativo + "' or ";
     query += "d.inv_tndigit_number = '" + identificativo + "' or ";
@@ -3180,7 +3203,7 @@ function queryDeviceByIdentificativoMySQL(identificativo) {
     query += "d.manifacturer as Marca, d.model as Modello, ";
     query += "d.inv_ict3_number as Inventario, d.serial_no, ";
     query += "d.inv_tn_number, d.inv_pnrr_number, d.inv_tndigit_number, ";
-    query += "d.note, d.num_objects from devices d ";
+    query += "d.note, d.num_objects, d.no_inventario from devices d ";
     query += "where (d.inv_ict3_number = :identificativo or ";
     query += "d.serial_no = :identificativo or ";
     query += "d.inv_tndigit_number = :identificativo or ";
@@ -3407,7 +3430,7 @@ function insertDeviceSQLite(dev) {
         if (dev.note)
             note = dev.note;
 
-        query = "insert into devices (inv_ict3_number, inv_tn_number, inv_pnrr_number, inv_tndigit_number, type, manifacturer, model, serial_no, note, num_objects) ";
+        query = "insert into devices (inv_ict3_number, inv_tn_number, inv_pnrr_number, inv_tndigit_number, type, manifacturer, model, serial_no, note, num_objects, no_inventario) ";
         query += "values (";
         query += "'" + String(inventario).trim() + "',";
         query += "'" + String(inv_comune).trim() + "',";
@@ -3419,12 +3442,13 @@ function insertDeviceSQLite(dev) {
         query += "'" + String(serial_no).trim() + "',";
         query += "'" + String(note).trim() + "',";
         query += dev.num_objects;
+        query += dev.no_inv;
         query += ")";
     }
     return query;
 }
 function insertDeviceMySQL() {
-    var query = "insert into devices (inv_ict3_number, inv_tn_number, inv_pnrr_number, inv_tndigit_number, type, manifacturer, model, serial_no, note, num_objects) ";
+    var query = "insert into devices (inv_ict3_number, inv_tn_number, inv_pnrr_number, inv_tndigit_number, type, manifacturer, model, serial_no, note, num_objects, no_inventario) ";
     query += "values (";
     query += ":inventario, ";
     query += ":inv_comune, ";
@@ -3435,7 +3459,8 @@ function insertDeviceMySQL() {
     query += ":modello, ";
     query += ":serial_no, ";
     query += ":note, ";
-    query += ":num_objects"
+    query += ":num_objects";
+    query += ":no_inv";
     query += ")";
     return query;
 }
@@ -3502,7 +3527,8 @@ function updateDeviceSQLite(deviceObj) {
         query += "model = '" + modello.trim() + "',";
         query += "serial_no = '" + serial_no.trim() + "',";
         query += "note = '" + note.trim() + "',";
-        query += "num_objects = " + dev.num_objects + " ";
+        query += "num_objects = " + dev.num_objects + ", ";
+        query += "no_inventario = " + dev.no_inv + " ";
         query += " where id = " + dev.id;
     }
     return query;
@@ -3519,7 +3545,8 @@ function updateDeviceMySQL() {
     query += "model = :modello, ";
     query += "serial_no = :serial_no, ";
     query += "note = :note, ";
-    query += "num_objects = :num_objects ";
+    query += "num_objects = :num_objects, ";
+    query += "no_inventario = :no_inv ";
     query += " where id = :id_device";
     return query;
 }
@@ -3578,6 +3605,7 @@ function getDeviceMySQLPayload(dev) {
             retValue.note = dev.note;
         }
         retValue.num_objects = dev.num_objects;
+        retValue.no_inv = dev.no_inv;
         payloadObj = {
             "inventario": retValue.inventario.trim(),
             "inv_comune": retValue.inv_comune.trim(),
@@ -3589,6 +3617,7 @@ function getDeviceMySQLPayload(dev) {
             "serial_no": retValue.serial_no.trim(),
             "note": retValue.note.trim(),
             "num_objects": retValue.num_objects,
+            "no_inv": retValue.no_inv,
             "id_device": dev.id
         };
     }
@@ -3665,6 +3694,7 @@ function getDevicesSelectComboSQLite(categoria, id_dev_exclude, with_properties)
     end) as Descrizione
     */
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3692,6 +3722,7 @@ function getDevicesSelectComboSQLite(categoria, id_dev_exclude, with_properties)
 function getDevicesSelectComboMySQL(categoria, id_dev_exclude, with_properties) {
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3737,6 +3768,7 @@ function getDevicesSelectCombo(db_used, categoria, id_dev_exclude, with_properti
 function getDevicesSelectBySiteComboSQLite(id_site, dev_type) {
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3757,6 +3789,7 @@ function getDevicesSelectBySiteComboSQLite(id_site, dev_type) {
 function getDevicesSelectBySiteComboMySQL(id_site, dev_type) {
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3777,6 +3810,7 @@ function getDevicesSelectBySiteComboMySQL(id_site, dev_type) {
 function getDevicesSelectBySiteComboMySQL2(id_site, dev_type) {
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3880,6 +3914,7 @@ function readDeviceProperties(db_used, id_device) {
 function getDevicesWithPropertiesSQLite(id_device) {
     var query = "select ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)') ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
@@ -3898,6 +3933,7 @@ function getDevicesWithPropertiesSQLite(id_device) {
 function getDevicesWithPropertiesMySQL(id_device) {
     var query = "select ";
     query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)') ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
@@ -8499,6 +8535,209 @@ function checkDocumentoDevice(db_used, id_device, id_doc) {
     return query;    
 }
 
+// Altri beni
+function queryDocumentsIdAltroBeneSQLite(id_bene) {
+    var query = "select distinct c.id, c.tipo, c.data_emissione, c.descrizione, ";
+    query += "case ";
+    query += "when is_collaudo = 1 then 'Collaudo' ";
+    query += "when is_acquisto = 1 then 'Acquisto'  ";
+    query += "when is_dismissione = 1 then 'Dismissione'  ";
+    query += "end as motivo ";    
+    query += "from documenti c ";
+    query += "join altri_beni_doc ac on ac.id_doc = c.id ";
+    query += "where ac.id_bene = " + id_bene;
+    return query;
+}
+function queryDocumentsIdAltroBeneMySQL(id_bene) {
+    var query = "select distinct c.id, c.tipo, c.data_emissione, c.descrizione, ";
+    query += "case ";
+    query += "when is_collaudo = 1 then 'Collaudo' ";
+    query += "when is_acquisto = 1 then 'Acquisto'  ";
+    query += "when is_dismissione = 1 then 'Dismissione'  ";
+    query += "end as motivo ";    
+    query += "from documenti c ";
+    query += "join altri_beni_doc ac on ac.id_doc = c.id ";
+    query += "where ac.id_device = :id_device";
+    return query;
+}
+
+function queryDocumentsIdAltroBene(db_used, id_bene) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryDocumentsIdAltroBeneSQLite(id_bene);
+                break;
+            case 'MYSQL':
+                query = queryDocumentsIdAltroBeneMySQL(id_bene);
+                break;
+            case 'MYSQL2':
+                query = queryDocumentsIdAltroBeneSQLite(id_bene);
+                break;
+        }
+    }
+    return query;
+}
+
+function insertDocumentoAltroBeneSQLite(id_bene, id_doc, scopo) {
+    let collaudoFlag = 0;
+    let acquistoFlag = 0;
+    let dismissioneFlag = 0;
+    switch (scopo) {
+        case 'ACQUISTO':
+            acquistoFlag = 1;
+            break;
+        case 'COLLAUDO':
+            collaudoFlag = 1;
+            break;
+        case 'DISMISSIONE':
+            dismissioneFlag = 1;
+            break;                
+        default:
+            break;
+    }    
+    var query = "insert into altri_beni_doc (id_bene, id_doc, is_acquisto, is_collaudo, is_dismissione) values ";
+    query += "(" + id_bene + ", " + id_doc + ", ";
+    query += acquistoFlag + ", ";
+    query += collaudoFlag + ", ";
+    query += dismissioneFlag;
+    query += ")";
+    return query;
+}
+function insertDocumentoAltroBeneMySQL(id_bene, id_doc, scopo) {
+    let collaudoFlag = 0;
+    let acquistoFlag = 0;
+    let dismissioneFlag = 0;
+    switch (scopo) {
+        case 'ACQUISTO':
+            acquistoFlag = 1;
+            break;
+        case 'COLLAUDO':
+            collaudoFlag = 1;
+            break;
+        case 'DISMISSIONE':
+            dismissioneFlag = 1;
+            break;                
+        default:
+            break;
+    }    
+    var query = "insert into altri_beni_doc (id_bene, id_doc, is_acquisto, is_collaudo, is_dismissione) values ";
+    query += "(:id_bene, :id_doc, ";
+    query += acquistoFlag + ", ";
+    query += collaudoFlag + ", ";
+    query += dismissioneFlag;
+    query += ")";
+    return query;
+}
+function insertDocumentoAltroBene(db_used, id_bene, id_doc, scopo) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = insertDocumentoAltroBeneSQLite(id_bene, id_doc, scopo);
+                break;
+            case 'MYSQL':
+                query = insertDocumentoAltroBeneMySQL(id_bene, id_doc, scopo);
+                break;
+            case 'MYSQL2':
+                query = insertDocumentoAltroBeneSQLite(id_bene, id_doc, scopo);
+                break;
+        }
+    }
+    return query;
+}
+
+
+function removeDocumentoAltroBeneSQLite(id_bene, id_doc) {
+    var query = "delete from altri_beni_doc ";
+    query += "where id_bene = " + id_bene + " and ";
+    query += "id_doc = " + id_doc;
+    return query;
+}
+function removeDocumentoAltroBeneMySQL(id_bene, id_doc) {
+    var query = "delete from altri_beni_doc ";
+    query += "where id_bene = :id_bene and ";
+    query += "id_doc = :id_doc";
+    return query;    
+}
+function removeDocumentoAltroBene(db_used, id_bene, id_doc) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = removeDocumentoAltroBeneSQLite(id_bene, id_doc);
+                break;
+            case 'MYSQL':
+                query = removeDocumentoAltroBeneMySQL(id_bene, id_doc);
+                break;
+            case 'MYSQL2':
+                query = removeDocumentoAltroBeneSQLite(id_bene, id_doc);
+                break;
+        }
+    }
+    return query;
+}
+
+function selectDocumentoAltroBeneByIdSQLite(id_docdev) {
+    var query = "select id, id_device, id_doc, is_acquisto, is_collaudo, is_dismissione from device_doc ";
+    query += "where id = " + id_docdev;
+    return query;
+}
+
+function selectDocumentoAltroBeneByIdMySQL(id_docdev) {
+    var query = "select id, id_device, id_doc, is_acquisto, is_collaudo, is_dismissione from device_doc ";
+    query += "where id = :id_docdev";
+    return query;
+}
+function selectDocumentoAltroBeneById(db_used, id_docdev) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDocumentoAltroBeneByIdSQLite(id_docdev);
+                break;
+            case 'MYSQL':
+                query = selectDocumentoAltroBeneByIdMySQL(id_docdev);
+                break;
+            case 'MYSQL2':
+                query = selectDocumentoAltroBeneByIdSQLite(id_docdev);
+                break;
+        }
+    }
+    return query;
+}
+
+
+function checkDocumentoAltroBeneSQLite(id_bene, id_doc) {
+    var query = "select count(*) as num from device_doc ";
+    query += "where id_bene = " + id_bene + " and id_doc = " + id_doc;
+    return query; 
+}
+function checkDocumentoAltroBeneMySQL(id_bene, id_doc) {
+    var query = "select count(*) as num from device_doc ";
+    query += "where id_bene = :id_bene  and id_doc = :id_doc";
+    return query;     
+}
+function checkDocumentoAltroBene(db_used, id_bene, id_doc) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = checkDocumentoAltroBeneSQLite(id_bene, id_doc);
+                break;
+            case 'MYSQL':
+                query = checkDocumentoAltroBeneMySQL(id_bene, id_doc);
+                break;
+            case 'MYSQL2':
+                query = checkDocumentoAltroBeneSQLite(id_bene, id_doc);
+                break;
+        }
+    }
+    return query;    
+}
+
+// End altri beni
+
 function getDocumentByIdDocSQLite(id_doc) {
     var query = "select c.id, c.tipo, c.anno, c.data_emissione, c.descrizione, c.riferimento, c.nome_originale, c.nome_uuid from documenti c ";
     query += "where c.id = " + id_doc;
@@ -12840,6 +13079,9 @@ module.exports = {
     queryDocumentsIdDevice,
     insertDocumentoDevice,
     removeDocumentoDevice,
+    queryDocumentsIdAltroBene,
+    insertDocumentoAltroBene,
+    removeDocumentoAltroBene,
     selectDocumentoById,
     selectDocuments,
     selectDocumentiCombo,
@@ -12851,6 +13093,8 @@ module.exports = {
     queryDocumentoMotivo,
     checkDocumentoDevice,
     selectDocumentoDeviceById,
+    checkDocumentoAltroBene,
+    selectDocumentoAltroBeneById,
     //
     selectDismissioniByYear,
     selectDismissioneById,

package/package.json

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