alsmanager_lib 1.0.60 → 1.0.62

package/lib/modules.js

@@ -1126,6 +1126,12 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR,
             }
             if (is_PNRR && is_PNRR > 0) {
                 where_clause += " (d.inv_pnrr_number <> '' and inv_pnrr_number is not null) ";
+                if (dev_status) {
+                    where_clause += " and ";
+                }   
+            }
+            if (dev_status) {
+                where_clause += " du.status = :dev_status and CURRDATE() >= du.date_status";
             }
         }
     }
@@ -1492,11 +1498,11 @@ function queryDeviceStatusSQLite(id_device, date_ref) {
         switch (date_ref) {
             case "current":
                 query += " and ";
-                query += " (date('now') >= du.date_status and date('now') <= du.date_end)";
+                query += " (date('now') >= du.date_status";
                 break;
             default:
                 query += " and ";
-                query += " ('" + date_ref + "' >= du.date_status and '" + date_ref + "' <= du.date_end)";
+                query += " ('" + date_ref + "' >= du.date_status)";
                 break;
 
         }
@@ -1510,11 +1516,11 @@ function queryDeviceStatusMySQL(id_device, date_ref) {
         switch (date_ref) {
             case "current":
                 query += " and ";
-                query += " (CURDATE() >= du.date_status and CURDATE() <= du.date_end)";
+                query += " (CURDATE() >= du.date_status)";
                 break;
             default:
                 query += " and ";
-                query += " (:date_ref >= du.date_status and :date_ref <= du.date_end)";
+                query += " (:date_ref >= du.date_status)";
                 break;
 
         }
@@ -1538,12 +1544,12 @@ function queryDeviceStatus(db_used, id_device, date_ref) {
 //End Get Device Status
 // Insert device status
 function updateDeviceStatusSQLite(id_device) {
-    var query = "update device_usage set date_end = date('now','-1 day') ";
-    query += "where id_device = " + id_device + " and date_in = (select max(date_in) from device_usage where id_device = " + id_device + ")";
+    var query = "update device_usage set date_end = date('now') ";
+    query += "where id_device = " + id_device + " and date_status = (select max(date_status) from device_usage where id_device = " + id_device + ")";
     return query;
 }
 function updateDeviceStatusMySQL(id_device) {
-    var query = "update device_usage set date_end = date('now','-1 day') ";
+    var query = "update device_usage set date_end = CURDATE() ";
     query += "where id_device = :id_device and date_status = (select max(date_status) from device_usage where id_device = :id_device)";
     return query;
 }
@@ -1565,7 +1571,7 @@ function updateDeviceStatus(db_used, id_device) {
 // end manage updateDevicesStatus
 // Manage insertDeviceStatus
 function insertDeviceStatusSQLite(id_device, dev_status, start_date) {
-    var query = "insert into device_usage (date_status, date_end, id_device, status) ";
+    var query = "insert into device_usage (date_status, id_device, status) ";
     query += "values (";
     if ((!start_date || start_date == '') || start_date == "TODAY") {
         query += "date('now'),";
@@ -1573,14 +1579,13 @@ function insertDeviceStatusSQLite(id_device, dev_status, start_date) {
     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_status, date_end, id_device, status) ";
+    var query = "insert into device_usage (date_status, id_device, status) ";
     query += "values (";
     if ((!start_date || start_date == '') || start_date == "TODAY") {
         query += "CURDATE(),";
@@ -1588,7 +1593,6 @@ function insertDeviceStatusMySQL(id_device, dev_status, start_date) {
     else {
         query += ":start_date,";
     }
-    query += "'2999-12-31',";
     query += ":id_device,";
     query += ":dev_status";
     query += ")";
@@ -2396,10 +2400,10 @@ function getBeniDaInventariOnDescriptionMySQL(table_name, search_string, include
             query += "from :table_name imp ";
         }
     }
-    if (inv_code && table_name) {
+    if (search_string && table_name) {
         if (table_name != "devices" && is_pnrr != 1 && is_dismissione != 1) {
-            query += " where Inventario = '" + inv_code +"' or ";
-            query += " Precedente = '" + inv_code +"' ";
+            query += " where Inventario = '" + search_string +"' or ";
+            query += " Precedente = '" + search_string +"' ";
             if (!include_imp || include_imp == 0) {
                 query += "and d.id is null"
             }
@@ -2420,10 +2424,10 @@ function getBeniDaInventariOnDescription(db_used, table_name, search_string, inc
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getBeniDaInventariOnDescriptionSQLite(table_name, inv_code, include_imp, is_pnrr, is_dismissione);
+                query = getBeniDaInventariOnDescriptionSQLite(table_name, search_string, include_imp, is_pnrr, is_dismissione);
                 break;
             case 'MYSQL':
-                query = getBeniDaInventariOnDescriptionMySQL(table_name, inv_code, include_imp, is_pnrr, is_dismissione);
+                query = getBeniDaInventariOnDescriptionMySQL(table_name, search_string, include_imp, is_pnrr, is_dismissione);
                 break;
         }
     }
@@ -3183,7 +3187,7 @@ function queryDeviceTypes() {
     return query;
 }
 // Define getDevicesNotAllocatedCombo
-function getDevicesNotAllocatedComboSQLite() {
+function getDevicesNotAllocatedComboSQLite(ordered_by) {
     var query = "SELECT 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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3198,11 +3202,16 @@ function getDevicesNotAllocatedComboSQLite() {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is null ";
     query += "or (ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) ";
-    query += "order by d.inv_ict3_number";
+    if (ordered_by && ordered_by == "ID") { 
+        query += "order by d.id desc";
+    }
+    else {
+        query += "order by d.inv_ict3_number";
+    }
     return query;
 }
 
-function getDevicesNotAllocatedComboMySQL() {
+function getDevicesNotAllocatedComboMySQL(ordered_by) {
     var query = "SELECT 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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3217,18 +3226,23 @@ function getDevicesNotAllocatedComboMySQL() {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is null ";
     query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) ";
-    query += "order by d.inv_ict3_number";
+    if (ordered_by && ordered_by == "ID") { 
+        query += "order by d.id desc";
+    }
+    else {
+        query += "order by d.inv_ict3_number";
+    }
     return query;
 }
-function getDevicesNotAllocatedCombo(db_used) {
+function getDevicesNotAllocatedCombo(db_used,ordered_by) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesNotAllocatedComboSQLite();
+                query = getDevicesNotAllocatedComboSQLite(ordered_by);
                 break;
             case 'MYSQL':
-                query = getDevicesNotAllocatedComboMySQL();
+                query = getDevicesNotAllocatedComboMySQL(ordered_by);
                 break;
         }
     }
@@ -3236,7 +3250,7 @@ function getDevicesNotAllocatedCombo(db_used) {
 }
 // End getDevicesNotAllocatedCombo
 // Define getDevicesAllocatedCombo
-function getDevicesAllocatedComboSQLite(id_site, id_place) {
+function getDevicesAllocatedComboSQLite(id_site, id_place, ordered_by) {
     var query = "SELECT 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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3251,10 +3265,15 @@ function getDevicesAllocatedComboSQLite(id_site, id_place) {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is not null ";
     query += "or (ds.date_in <= date('now') and ds.date_out >= date('now') and ds.id_site <> " + id_site + " and ds.id_place <> '" + id_place + "')) ";
-    query += "order by d.inv_ict3_number";
+    if (ordered_by && ordered_by == "ID") { 
+        query += "order by d.id desc";
+    }
+    else {
+        query += "order by d.inv_ict3_number";
+    }
     return query;
 }
-function getDevicesAllocatedComboMySQL(id_site, id_place) {
+function getDevicesAllocatedComboMySQL(id_site, id_place, ordered_by) {
     var query = "SELECT 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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -3269,18 +3288,23 @@ function getDevicesAllocatedComboMySQL(id_site, id_place) {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is not null ";
     query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and ds.id_site <> :id_site and ds.id_place <> :id_place)) ";
-    query += "order by d.inv_ict3_number";
+    if (ordered_by && ordered_by == "ID") { 
+        query += "order by d.id desc";
+    }
+    else {
+        query += "order by d.inv_ict3_number";
+    }
     return query;
 }
-function getDevicesAllocatedCombo(db_used, id_site, id_place) {
+function getDevicesAllocatedCombo(db_used, id_site, id_place, ordered_by) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesAllocatedComboSQLite(id_site, id_place);
+                query = getDevicesAllocatedComboSQLite(id_site, id_place, ordered_by);
                 break;
             case 'MYSQL':
-                query = getDevicesAllocatedComboMySQL(id_site, id_place);
+                query = getDevicesAllocatedComboMySQL(id_site, id_place, ordered_by);
                 break;
         }
     }
@@ -6808,10 +6832,14 @@ function verifyPrevDeviceSite(db_used, id_device) {
 }
 
 function removeDeviceSiteSQLite(id_site, id_place, id_device) {
-
+    var query = "delete from device_site ";
+    query += "where id_device = " + id_device + " and date_in = (select max(date_in) from device_site where id_device = " + id_device + ")";
+    return query;
 }
 function removeDeviceSiteMySQL(id_site, id_place, id_device) {
-
+    var query = "delete from device_site ";
+    query += "where id_device = :id_device and date_in = (select max(date_in) from device_site where id_device = :id_device)";
+    return query;
 }
 function removeDeviceSite(db_used,id_site, id_place, id_device) {
     var query = "";
@@ -6828,6 +6856,32 @@ function removeDeviceSite(db_used,id_site, id_place, id_device) {
     return query;
 }
 
+function updateDeviceSiteAfterRemoveSQLite(id_device) {
+    var query = "update device_site set date_out = '2999-12-31' ";
+    query += "where id_device = " + id_device + " and date_in = (select max(date_in) from device_site where id_device = " + id_device + ")";
+    return query;
+}
+function updateDeviceSiteAfterRemoveMySQL(id_device) {
+    var query = "update device_site set date_out = '2999-12-31' ";
+    query += "where id_device = :id_device and date_in = (select max(date_in) from device_site where id_device = :id_device)";
+    return query;
+}
+function updateDeviceSiteAfterRemove(db_used,id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateDeviceSiteAfterRemoveSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = updateDeviceSiteAfterRemoveMySQL(id_device);
+                break;
+        }
+    }
+    return query;
+}
+
+
 function updateDeviceSiteSQLite(id_device) {
     var query = "update device_site set date_out = date('now','-1 day') ";
     query += "where id_device = " + id_device + " and date_in = (select max(date_in) from device_site where id_device = " + id_device + ")";
@@ -6901,6 +6955,34 @@ function insertDeviceSite(db_used,id_device, id_place, id_site, start_date) {
     return query;
 }
 // end manage updateDevicesSite
+//
+function removeDeviceFromAllSitesSQLite(id_device) {
+    var query = "delete from device_site ";
+    query += "where id_device = " + id_device;
+    return query; 
+}
+function removeDeviceFromAllSitesMySQL(id_device) {
+    var query = "delete from device_site ";
+    query += "where id_device = :id_device";
+    return query;     
+}
+function removeDeviceFromAllSites(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = removeDeviceFromAllSitesSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = removeDeviceFromAllSitesMySQL(id_device);
+                break;
+        }
+    }
+    return query;
+}
+
+
+
 //Get Sites for Combo
 function getSitesSelectComboSQLite(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
@@ -7433,6 +7515,13 @@ function queryStatisticsDeviceStatusSQLite() {
     return query;
 }
 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 += "and (is_removed is null or is_removed = 0) ";
+    query += "group by Stato";
+    return query;
 }
 function queryStatisticsDeviceStatus(db_used) {
     var query = "";
@@ -7931,6 +8020,8 @@ module.exports = {
     insertDeviceSite,
     updateDeviceSite,
     removeDeviceSite,
+    updateDeviceSiteAfterRemove,
+    removeDeviceFromAllSites,
     queryPlaces,
     queryFloorsByPlace,
     queryFunzioneByPlaceAndFloor,

package/package.json

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