alsmanager_lib 3.0.220 → 3.0.221

package/lib/modules.js

@@ -4686,7 +4686,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, part_of, is_unused) ";
+        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, date_insert) ";
         query += "values (";
         query += "'" + String(inventario).trim() + "',";
         query += "'" + String(inv_comune).trim() + "',";
@@ -4701,13 +4701,14 @@ function insertDeviceSQLite(dev) {
         query += dev.no_inv + ", ";
         query += peso + ", ";
         query += "'" + dev.part_of + "', ";
-        query += dev.is_unused;
+        query += dev.is_unused + ", ";
+        query += "'" + convertDateToStringDB(new Date()) + "'";
         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, peso_g, part_of, is_unused) ";
+    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, date_insert) ";
     query += "values (";
     query += ":inventario, ";
     query += ":inv_comune, ";
@@ -4723,6 +4724,7 @@ function insertDeviceMySQL() {
     query += ":peso_g, ";
     query += ":part_of, ";
     query += ":is_unused, ";
+    query += "'" + convertDateToStringDB(new Date()) + "'";
     query += ")";
     return query;
 }
@@ -4800,7 +4802,8 @@ function updateDeviceSQLite(deviceObj) {
         query += "no_inventario = " + dev.no_inv + ", ";
         query += "peso_g = " + peso + ", ";
         query += "part_of = '" + part_of + "', ";
-        query += "is_unused = " + dev.is_unused + " ";        
+        query += "is_unused = " + dev.is_unused + ", ";        
+        query += "date_last_update = '" + convertDateToStringDB(new Date()) + "' ";        
         query += " where id = " + dev.id;
     }
     return query;
@@ -4821,7 +4824,8 @@ function updateDeviceMySQL() {
     query += "no_inventario = :no_inv, ";
     query += "peso_g = :peso_g, ";
     query += "part_of = :part_of, ";
-    query += "is_unused = :is_unused ";        
+    query += "is_unused = :is_unused, ";        
+    query += "date_last_update = '" + convertDateToStringDB(new Date()) + "' ";        
     query += " where id = :id_device";
     return query;
 }
@@ -4914,13 +4918,15 @@ function getDeviceMySQLPayload(dev) {
 //End Update Device
 // Remove Device
 function removeDeviceSQLite(id_device) {
-    var query = "update devices set is_removed = 1 ";
+    var query = "update devices set is_removed = 1, ";
+    query += "date_removed = '" + convertDateToStringDB(new Date()) + "' ";        
     query += "where id = " + id_device;
     return query;
 }
 
 function removeDeviceMySQL() {
-    var query = "update devices set is_removed = 1 ";
+    var query = "update devices set is_removed = 1, ";
+    query += "date_removed = '" + convertDateToStringDB(new Date()) + "' ";        
     query += "where id = :id_device";
     return query;
 }
@@ -17056,6 +17062,23 @@ function deleteCountersPrinterRechargeUser(id_counteruser) {
 
 
 // End Printer management
+// Notes for devices
+function getNotesByIdDevice(id_device) {
+    var query = "select CONCAT('DISPOSITIVO id. ', d2.id) as Tipo, d2.date_insert as Data, d2.note as note from devices d2 ";
+    query += "where d2.id = " + id_device + " and d2.note is not null ";
+    query += "UNION "; 
+    query += "select CONCAT('CONSEGNA n. ', cb.id_consegna), cb.data_consegna as Data, cb.note_consegna as note from consegna_beni cb ";
+    query += "where cb.id_bene = " + id_device + " and cb.note_consegna is not null ";
+    query += "UNION "; 
+    query += "select CONCAT('RESTITUZIONE n. ', cb2.id_consegna) as Tipo, cb2.data_restituzione as Data, cb2.note_restituzione as note from consegna_beni cb2 ";
+    query += "where cb.id_bene = " + id_device + " and cb2.note_restituzione is not null ";
+    query += "UNION ";
+    query += "select CONCAT('INTERVENTO n. ', di.id) as Tipo, di.date_start as Data, di.note_intervento as note from device_interventi di ";
+    query += "where di.id_device = " + id_device + " and di.note_intervento is not null ";
+    return query;
+}
+
+// End Notes for devices
 // Exports
 
 module.exports = { 
@@ -17546,6 +17569,8 @@ module.exports = {
     readCountersPrinterRechargeUser,
     writeCountersPrinterRechargeUser,
     updateCountersPrinterRechargeUser,
-    deleteCountersPrinterRechargeUser
+    deleteCountersPrinterRechargeUser,
+    //
+    getNotesByIdDevice
 };
 // end of source

package/package.json

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