alsmanager_lib 3.0.139 → 3.0.140

package/lib/modules.js

@@ -2918,7 +2918,7 @@ function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, dev_mode
                 }
             }
             if (dev_status) {
-                where_clause += " du.status = " + dev_status + " and date('now') >= du.date_status";
+                where_clause += " du.status = " + dev_status + " and (date('now') >= du.date_start and date('now') <= du.date_end)";
                 if (dev_gestione || no_inv || in_consegna) {
                     where_clause += " and ";
                 }                
@@ -3010,7 +3010,7 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, dev_model
                 }   
             }
             if (dev_status) {
-                where_clause += " du.status = :dev_status and CURDATE() >= du.date_status";
+                where_clause += " du.status = :dev_status and (CURDATE() >= du.date_start and CURDATE() <= du.date_end) ";
                 if (dev_gestione || no_inv) {
                     where_clause += " and ";
                 }   
@@ -3103,7 +3103,7 @@ function getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, dev_mode
                 }
             }
             if (dev_status) {
-                where_clause += " du.status = " + dev_status + " and CURDATE() >= du.date_status";
+                where_clause += " du.status = :dev_status and (CURDATE() >= du.date_start and CURDATE() <= du.date_end) ";
                 if (dev_gestione || no_inv || in_consegna) {
                     where_clause += " and ";
                 }                
@@ -3720,10 +3720,10 @@ function queryDeviceStatusSQLite(id_device, date_ref) {
     if (date_ref) {
         switch (date_ref) {
             case "current":
-                query += "and date('now') >= du.date_status ";
+                query += "and (date('now') >= du.date_start and date('now') <= du.date_end)";
                 break;
             default:
-                query += "and '" + date_ref + "' >= du.date_status ";
+                query += "and ('" + date_ref + "' >= du.date_start and '" + date_ref + "' <= du.date_end)";
                 break;
 
         }
@@ -3737,10 +3737,10 @@ function queryDeviceStatusMySQL(id_device, date_ref) {
     if (date_ref) {
         switch (date_ref) {
             case "current":
-                query += "and (CURDATE() >= du.date_status ";
+                query += "and (CURDATE() >= du.date_start and CURDATE() <= du.date_end) ";
                 break;
             default:
-                query += "and :date_ref >= du.date_status ";
+                query += "and (:date_ref >= du.date_start and :date_ref <= du.date_end) ";
                 break;
 
         }
@@ -3754,10 +3754,10 @@ function queryDeviceStatusMySQL2(id_device, date_ref) {
     if (date_ref) {
         switch (date_ref) {
             case "current":
-                query += "and CURDATE() >= du.date_status ";
+                query += "and (CURDATE() >= du.date_start and CURDATE() <= du.date_end) ";
                 break;
             default:
-                query += "and '" + date_ref + "' >= du.date_status ";
+                query += "and ('" + date_ref + "' >= du.date_start and '" + date_ref + "' <= du.date_end)";
                 break;
 
         }
@@ -3785,35 +3785,37 @@ function queryDeviceStatus(db_used, id_device, date_ref) {
 //End Get Device Status
 // Manage insertDeviceStatus
 function insertDeviceStatusSQLite(id_device, dev_status, start_date) {
-    var query = "insert into device_usage (date_status, id_device, status) ";
+    var query = "insert into device_usage (date_start, date_end, id_device, status) ";
     query += "values (";
     if ((!start_date || start_date == '') || start_date == "TODAY") {
-        query += "date('now'),";
+        query += "date('now'), ";
     }
     else {
-        query += "'" + start_date + "',";
+        query += "'" + start_date + "', ";
     }
+    query += "'2999-12-31', ";
     query += id_device + ",";
     query += dev_status;
     query += ")";
     return query;
 }
 function insertDeviceStatusMySQL(id_device, dev_status, start_date) {
-    var query = "insert into device_usage (date_status, id_device, status) ";
+    var query = "insert into device_usage (date_start, date_end, id_device, status) ";
     query += "values (";
     if ((!start_date || start_date == '') || start_date == "TODAY") {
-        query += "CURDATE(),";
+        query += "CURDATE(), ";
     }
     else {
-        query += ":start_date,";
+        query += ":start_date, ";
     }
+    query += "'2999-12-31', ";
     query += ":id_device,";
     query += ":dev_status";
     query += ")";
     return query;
 }
 function insertDeviceStatusMySQL2(id_device, dev_status, start_date) {
-    var query = "insert into device_usage (date_status, id_device, status) ";
+    var query = "insert into device_usage (date_start, date_end, id_device, status) ";
     query += "values (";
     if ((!start_date || start_date == '') || start_date == "TODAY") {
         query += "CURDATE(),";
@@ -3821,6 +3823,7 @@ function insertDeviceStatusMySQL2(id_device, dev_status, start_date) {
     else {
         query += "'" + start_date + "',";
     }
+    query += "'2999-12-31', ";
     query += id_device + ",";
     query += dev_status;
     query += ")";
@@ -3844,7 +3847,71 @@ function insertDeviceStatus(db_used, id_device, dev_status, start_date) {
     return query;
 }
 //end insert device status
-// Remove device status
+// Manage updateDeviceStatus
+function updateDeviceStatusSQLite(id_device, dev_status, start_date) {
+    var query = "update device_usage (date_start, date_end, id_device, status) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "date('now'), ";
+    }
+    else {
+        query += "'" + start_date + "', ";
+    }
+    query += "'2999-12-31', ";
+    query += id_device + ",";
+    query += dev_status;
+    query += ")";
+    return query;
+}
+function insertDeviceStatusMySQL(id_device, dev_status, start_date) {
+    var query = "insert into device_usage (date_start, date_end, id_device, status) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "CURDATE(), ";
+    }
+    else {
+        query += ":start_date, ";
+    }
+    query += "'2999-12-31', ";
+    query += ":id_device,";
+    query += ":dev_status";
+    query += ")";
+    return query;
+}
+function insertDeviceStatusMySQL2(id_device, dev_status, start_date) {
+    var query = "insert into device_usage (date_start, date_end, id_device, status) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "CURDATE(),";
+    }
+    else {
+        query += "'" + start_date + "',";
+    }
+    query += "'2999-12-31', ";
+    query += id_device + ",";
+    query += dev_status;
+    query += ")";
+    return query;
+}
+function insertDeviceStatus(db_used, id_device, dev_status, start_date) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = insertDeviceStatusSQLite(id_device, dev_status, start_date);
+                break;
+            case 'MYSQL':
+                query = insertDeviceStatusMySQL(id_device, dev_status, start_date);
+                break;
+            case 'MYSQL2':
+                query = insertDeviceStatusMySQL2(id_device, dev_status, start_date);
+                break;
+        }
+    }
+    return query;
+}
+//end update device status
+// Remove device status - DA RIVEDERE - 
 function removeDeviceStatusSQLite(id_device, dev_status) {
     var query = "delete from device_usage ";
     query += "where id_device = " + id_device + " and date_status = ";
@@ -3915,7 +3982,7 @@ function insertDeviceSQLite(dev) {
         if (dev.peso_g)
             peso = dev.peso_g;
 
-        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, peso_g) ";
+        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, peso_g, part_of, is_unused) ";
         query += "values (";
         query += "'" + String(inventario).trim() + "',";
         query += "'" + String(inv_comune).trim() + "',";
@@ -3928,13 +3995,15 @@ function insertDeviceSQLite(dev) {
         query += "'" + String(note).trim() + "',";
         query += dev.num_objects + ", ";
         query += dev.no_inv + ", ";
-        query += peso;
+        query += peso + ", ";
+        query += "'" + dev.part_of + "', ";
+        query += dev.is_unused;
         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, no_inventario) ";
+    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, peso_g, part_of, is_unused) ";
     query += "values (";
     query += ":inventario, ";
     query += ":inv_comune, ";
@@ -3947,7 +4016,9 @@ function insertDeviceMySQL() {
     query += ":note, ";
     query += ":num_objects, ";
     query += ":no_inv, ";
-    query += ":peso_g ";
+    query += ":peso_g, ";
+    query += ":part_of, ";
+    query += ":is_unused, ";
     query += ")";
     return query;
 }
@@ -4019,7 +4090,9 @@ function updateDeviceSQLite(deviceObj) {
         query += "note = '" + note.trim() + "',";
         query += "num_objects = " + dev.num_objects + ", ";
         query += "no_inventario = " + dev.no_inv + ", ";
-        query += "peso_g = " + peso + " ";
+        query += "peso_g = " + peso + ", ";
+        query += "part_of = '" + part_of + "', ";
+        query += "is_unused = " + is_unused + " ";        
         query += " where id = " + dev.id;
     }
     return query;
@@ -4038,7 +4111,9 @@ function updateDeviceMySQL() {
     query += "note = :note, ";
     query += "num_objects = :num_objects, ";
     query += "no_inventario = :no_inv, ";
-    query += "peso_g = :peso_g ";
+    query += "peso_g = :peso_g, ";
+    query += "part_of = :part_of, ";
+    query += "is_unused = :is_unused ";        
     query += " where id = :id_device";
     return query;
 }
@@ -4115,6 +4190,8 @@ function getDeviceMySQLPayload(dev) {
             "num_objects": retValue.num_objects,
             "no_inv": retValue.no_inv,
             "peso_g": retValue.peso_g,
+            "part_of": retValue.part_of,
+            "is_unused": retValue.is_unused,
             "id_device": dev.id
         };
     }
@@ -4152,7 +4229,38 @@ function removeDevice(db_used, id_device) {
     return query;
 }
 
-//End remove device
+//End set unused device
+// Remove Device
+function updateUnusedDeviceSQLite(id_device, unused_switch) {
+    var query = "update devices set is_unused = " + unused_switch + " ";
+    query += "where id = " + id_device;
+    return query;
+}
+
+function updateUnusedDeviceMySQL() {
+    var query = "update devices set is_unused = :unused_switch ";
+    query += "where id = :id_device";
+    return query;
+}
+function updateUnusedDevice(db_used, id_device, unused_switch) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateUnusedDeviceSQLite(id_device, unused_switch);
+                break;
+            case 'MYSQL':
+                query = updateUnusedDeviceMySQL();
+                break;
+            case 'MYSQL2':
+                query = updateUnusedDeviceSQLite(id_device, unused_switch);
+                break;
+        }
+    }
+    return query;
+}
+
+//End set unused device
 //Get Last Id
 function queryLastDeviceIdSQLite() {
     return "select seq as id from sqlite_sequence where name = 'devices'";
@@ -12568,7 +12676,7 @@ function getLastSiteForDevice(db_used,id_device) {
 
 
 // end of source//Get Devices for Statistics
-function queryStatisticSQLite(list_types) {
+function queryStatisticSQLite(list_types, exclude_unused) {
     var query = "select type as Tipo, count(*) as Numero from devices ";
     query += "where type in (";
     for (let i = 0; i < list_types.length; i++) {
@@ -12578,10 +12686,13 @@ function queryStatisticSQLite(list_types) {
         }
     }
     query += ") and (is_removed is null or is_removed = 0) ";
+    if (exclude_unused && exclude_unused == 1) {
+        query += "and (is_unused is null or is_unused = 0) ";
+    }
     query += "group by Tipo";
     return query;
 }
-function queryStatisticMySQL(list_types) {
+function queryStatisticMySQL(list_types, exclude_unused) {
     var query = "select type as Tipo, count(*) as Numero from devices ";
     query += "where type in (";
     for (let i = 0; i < list_types.length; i++) {
@@ -12591,21 +12702,24 @@ function queryStatisticMySQL(list_types) {
         }
     }
     query += ") and (is_removed is null or is_removed = 0) ";
+    if (exclude_unused && exclude_unused == 1) {
+        query += "and (is_unused is null or is_unused = 0) ";
+    }
     query += "group by Tipo";
     return query;
 }
-function queryStatistic(db_used,list_types) {
+function queryStatistic(db_used,list_types, exclude_unused) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryStatisticSQLite(list_types);
+                query = queryStatisticSQLite(list_types, exclude_unused);
                 break;
             case 'MYSQL':
-                query = queryStatisticMySQL(list_types);
+                query = queryStatisticMySQL(list_types, exclude_unused);
                 break;
             case 'MYSQL2':
-                query = queryStatisticSQLite(list_types);
+                query = queryStatisticSQLite(list_types, exclude_unused);
                 break;
         }
     }
@@ -12837,7 +12951,7 @@ function queryStatisticsDeviceStatusSQLite() {
     var query = "select case when ds.status is null then 0 else ds.status end as Stato, sd.name as Descrizione, count(*) as Numero from devices d ";
     query += "left join device_usage ds on d.id = ds.id_device ";
     query += "join status_description sd on sd.id = Stato "
-    query += "where date('now') >= ds.date_status or Stato = 0 ";
+    query += "where (date('now') >= ds.date_start and date('now') <= ds.date_end) or ds.status = 0 ";
     query += "and (is_removed is null or is_removed = 0) ";
     query += "group by Stato";
     return query;
@@ -12846,7 +12960,7 @@ function queryStatisticsDeviceStatusMySQL() {
     var query = "select case when ds.status is null then 0 else ds.status end as Stato, sd.name as Descrizione, count(*) as Numero from devices d ";
     query += "left join device_usage ds on d.id = ds.id_device ";
     query += "join status_description sd on sd.id = Stato "
-    query += "where CURDATE() >= ds.date_status or Stato = 0 ";
+    query += "where (CURDATE() >= ds.date_start and CURDATE() <= ds.date_end) or ds.status = 0 ";
     query += "and (is_removed is null or is_removed = 0) ";
     query += "group by Stato";
     return query;
@@ -12855,7 +12969,7 @@ function queryStatisticsDeviceStatusMySQL2() {
     var query = "select case when ds.status is null then 0 else ds.status end as Stato, sd.name as Descrizione, count(*) as Numero from devices d ";
     query += "left join device_usage ds on d.id = ds.id_device ";
     query += "join status_description sd on sd.id = Stato "
-    query += "where CURDATE() >= ds.date_status or Stato = 0 ";
+    query += "where (CURDATE() >= ds.date_start and CURDATE() <= ds.date_end) or ds.status = 0 ";
     query += "and (is_removed is null or is_removed = 0) ";
     query += "group by Stato";
     return query;

package/package.json

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