alsmanager_lib 2.0.52 → 2.0.54

package/lib/modules.js

@@ -2508,7 +2508,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 from devices d ";
+    query += "d.note, d.num_objects from devices d ";
     query += "where d.id = " + id_device;
     return query;
 }
@@ -2517,7 +2517,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 from devices d ";
+    query += "d.note, d.num_objects from devices d ";
     query += "where d.id = :id_device";
     return query;
 }
@@ -2542,7 +2542,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 from devices d ";
+    query += "d.note, d.num_objects from devices d ";
     query += "where (d.inv_ict3_number = '" + identificativo + "' or ";
     query += "d.serial_no = '" + identificativo + "' or ";
     query += "d.inv_tndigit_number = '" + identificativo + "' or ";
@@ -2555,7 +2555,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 from devices d ";
+    query += "d.note, d.num_objects from devices d ";
     query += "where (d.inv_ict3_number = :identificativo or ";
     query += "d.serial_no = :identificativo or ";
     query += "d.inv_tndigit_number = :identificativo or ";
@@ -5046,7 +5046,7 @@ function selectTabellaInventarioByName(db_used, tab_name) {
 
 function queryCloseGestioneDeviceSQLite(id_gestione) {
     var query = "update device_gestioni  ";
-    query += "set date_end = date('now' - 1day) ";
+    query += "set date_end = date('now' - 1 day) ";
     query += "where id = " + id_gestione + " ";
     query += "and date_start < date('now')";
     return query;
@@ -5054,7 +5054,7 @@ function queryCloseGestioneDeviceSQLite(id_gestione) {
 
 function queryCloseGestioneDeviceMySQL(id_gestione, id_device, id_gestore) {
     var query = "update device_gestioni  ";
-    query += "set date_end = CURDATE('now' - 1day) ";
+    query += "set date_end = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
     query += "where id = :id_gestione";
     query += "and date_start < CURDATE()";
     return query;
@@ -8388,7 +8388,7 @@ function updateDeviceSiteSQLite(id_device) {
     return query;
 }
 function updateDeviceSiteMySQL(id_device) {
-    var query = "update device_site set date_out = date('now','-1 day') ";
+    var query = "update device_site set date_out = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
     query += "where id_device = :id_device and date_in = (select max(date_in) from device_site where id_device = :id_device)";
     return query;
 }
@@ -8641,14 +8641,15 @@ function removeSiteBySet(db_used, id_device) {
 function updateSiteBySetSQLite(id_device) {
     var query = "update device_site set date_out = date('now','-1 day'), date_in = date('now','-1 day') where id_device in "
     query += "(select dt.id_relateddevice from device_set dt ";
-    query += "where dt.id_maindevice = " + id_device + ")";
+    query += "where dt.id_maindevice = " + id_device + ") ";
     query += "and date('now') >= date_in and date('now') <= date_out"
     return query;
 }
 function updateSiteBySetMySQL(id_device) {
-    var query = "update device_site set date_out = date_in where id_device in "
+    var query = "update device_site set date_out = DATE_SUB(CURDATE(), INTERVAL 1 DAY), date_in = DATE_SUB(CURDATE(), INTERVAL 1 DAY) where id_device in "
     query += "(select dt.id_relateddevice from device_set dt ";
-    query += "where dt.id_maindevice = :id_device)";
+    query += "where dt.id_maindevice = :id_device) ";
+    query += "and CURDATE() >= date_in and CURDATE() <= date_out"
     return query;
 }
 function updateSiteBySet(db_used,id_device) {
@@ -8677,7 +8678,7 @@ function insertSiteBySetSQLite(id_device) {
 }
 function insertSiteBySetMySQL(id_device) {
     var query = "insert into device_site (id_site, id_place, date_in, date_out, id_device) ";
-    query += "select das.id_site, das.id_place, date('now'), '2999-12-31', d.id from devices d ";
+    query += "select das.id_site, das.id_place, CURDATE(), '2999-12-31', d.id from devices d ";
     query += "join device_set ds on ds.id_relateddevice = d.id ";
     query += "join device_as_site das on das.id_device = ds.id_maindevice ";
     query += "where ds.id_maindevice = :id_device";

package/package.json

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