alsmanager_lib 3.0.219 → 3.0.221

package/lib/modules.js

@@ -1356,29 +1356,26 @@ function getUtentiCombo() {
 }
 
 function getUtentiByIdDeviceSQLite(id_device) {
-    var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo from device_utenza du ";
+    var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo, du.date_start, du.date_end, du.note from device_utenza du ";
     query += "join anagrafica_utenze au on au.id = du.id_utenza ";
     query += "where du.id_device = " + id_device + " ";
-    query += "and du.date_start <= date('now') and du.date_end >= date('now') ";
     query += "order by titolo, cognome_denominazione ";
     return query;
 }
 
 function getUtentiByIdDeviceMySQL(id_device) {
-    var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo from device_utenza du ";
+    var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo, du.date_start, du.date_end, du.note from device_utenza du ";
     query += "join anagrafica_utenze au on au.id = du.id_utenza ";
     query += "where du.id_device = :id_device ";
-    query += "and du.date_start <= CURDATE() and du.date_end >= CURDATE() ";
     query += "order by titolo, cognome_denominazione ";
     return query;
 }
 
 
 function getUtentiByIdDeviceMYSQL2(id_device) {
-    var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo from device_utenza du ";
+    var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo, du.date_start, du.date_end, du.note from device_utenza du ";
     query += "join anagrafica_utenze au on au.id = du.id_utenza ";
     query += "where du.id_device = " + id_device + " ";
-    query += "and du.date_start <= CURDATE() and du.date_end >= CURDATE() ";
     query += "order by titolo, cognome_denominazione ";
     return query;
 }
@@ -1401,16 +1398,65 @@ function getUtentiByIdDevice(db_used, id_device) {
     return query;    
 }
 
-function insertUtentePerDevice(id_utente, id_device, note) {
+function getUtenteDeviceByIdSQLite(id_dev_user) {
+    var query = "select du.id, du.id_utente, du.date_start, du.date_end, du.note from device_utenza du ";
+    query += "where du.id = " + id_dev_user + " ";
+    return query;
+}
 
+function getUtenteDeviceByIdMySQL(id_dev_user) {
+    var query = "select du.id, du.id_utente, du.date_start, du.date_end, du.note from device_utenza du ";
+    query += "where du.id = :id_dev_user ";
+    return query;
+}
+
+
+function getUtenteDeviceById (db_used, id_dev_user) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getUtenteDeviceByIdSQLite(id_dev_user);
+                break;
+            case 'MYSQL':
+                query = getUtenteDeviceByIdMySQL(id_dev_user);
+                break;
+            case 'MYSQL2':
+                query = getUtenteDeviceByIdSQLite(id_dev_user);
+                break;
+        }
+    }
+    return query;    
 }
-    
-function updateUtentePerDevice(id_dev_user, id_utente, id_device, note) {
 
+function insertUtentePerDevice(id_utente, id_device, date_start, date_end, note) {
+    var date_start_str = convertDateToStringDB(date_start);
+    var date_end_str = convertDateToStringDB(date_end);
+    var query = "insert into device_utenza (id_utente, id_device, date_start, date_end, note) values (";
+    query += id_utente + ", ";
+    query += id_device + ", ";
+    query += "'" + date_start_str + "', ";
+    query += "'" + date_end_str + "', ";
+    query += "'" + note + "'" ;
+    query += ")";
+    return query;
+}
+    
+function updateUtentePerDevice(id_dev_user, date_start, date_end, note) {
+    var date_start_str = convertDateToStringDB(date_start);
+    var date_end_str = convertDateToStringDB(date_end);
+    var query = "update device_utenza set ";
+    query += "date_start = '" + date_start_str + "', ";
+    query += "date_end = '" + date_end_str + "', ";
+    query += "note = '" + note + "'" ;
+    query += "where id = " + id_dev_user;
+    return query;
 }
 
 function removeUtentePerDevice(id_dev_user) {
-
+    var query = "delete from device_utenza ";
+    query += "where id = " + id_dev_user;
+    return query;
 }
 
 // End Anagrafica utenti
@@ -4640,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() + "',";
@@ -4655,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, ";
@@ -4677,6 +4724,7 @@ function insertDeviceMySQL() {
     query += ":peso_g, ";
     query += ":part_of, ";
     query += ":is_unused, ";
+    query += "'" + convertDateToStringDB(new Date()) + "'";
     query += ")";
     return query;
 }
@@ -4754,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;
@@ -4775,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;
 }
@@ -4868,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;
 }
@@ -17010,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 = { 
@@ -17158,6 +17227,7 @@ module.exports = {
     getUtenti,
     getUtentiCombo,
     getUtentiByIdDevice,
+    getUtenteDeviceById,
     insertUtentePerDevice,
     updateUtentePerDevice,
     removeUtentePerDevice,
@@ -17499,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.219",
+  "version": "3.0.221",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",