alsmanager_lib 3.0.48 → 3.0.50

package/lib/modules.js

@@ -5813,7 +5813,7 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
     query += "and (dc.id_consegna is null) ";
     query += "and (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2)) ";
     query += "and (ds.id_place is null ";
-    query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
+    query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type in ('MAGAZZINO', 'CARRELLO DISPOSITIVI'))) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
     if (sel_type_str.trim() != '') {
         query += "and d.type = '" + sel_type_str.trim() + "' ";
     }
@@ -5856,7 +5856,7 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     query += "and (dc.id_consegna is null) ";
     query += "and (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2)) ";
     query += "and (ds.id_place is null ";
-    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
+    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type in ('MAGAZZINO', 'CARRELLO DISPOSITIVI'))) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
     if (sel_type_str.trim() != '') {
         query += "and d.type = :dev_type ";
     }
@@ -5899,7 +5899,7 @@ function getDevicesNotAllocatedComboMySQL2(id_site, id_place, sel_type, sel_make
     query += "and (dc.id_consegna is null) ";
     query += "and (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2)) ";
     query += "and (ds.id_place is null ";
-    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
+    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type in ('MAGAZZINO', 'CARRELLO DISPOSITIVI'))) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
     if (sel_type_str.trim() != '') {
         query += "and d.type = '" + sel_type_str.trim() + "' ";
     }
@@ -6882,6 +6882,24 @@ function queryConsegnaById(db_used,id_consegna) {
 }
 
 //Creazione email sollecito consegna
+function getDatiConsegneAttive() {
+    var query = "select c.richiedente_adulto as Nominativo, c.email_adulto as Email, concat('Consegna n.', c.id, ' del ', STRFTIME('%d/%m/%Y', c.data_consegna)) as Consegna, ";
+    query += "case ";
+    query += "when d.id is not null and d.inv_ict3_number is not null and trim(d.inv_ict3_number) <> ''  then concat(d.manifacturer, ' - ', d.model, ' - Inv.', d.inv_ict3_number) ";
+    query += "when d.id is not null and d.serial_no is not null and trim(d.serial_no) <> '' then concat(d.manifacturer, ' - ', d.model, ' - S/N:', d.serial_no) ";
+    query += "when s.id is not null and s.inv_ict3_number is not null and trim(s.inv_ict3_number) <> '' then concat(s.maker, ' - ', s.model, ' - Inv.', s.inv_ict3_number) ";
+    query += "when s.id is not null and s.serial_no is not null and trim(s.serial_no) <> '' then concat(s.maker, ' - ', s.model, ' - S/N:', s.serial_no) ";
+    query += "else '' ";
+    query += "end as bene_consegnato ";
+    query += "from consegna_beni cb ";
+    query += "join consegne c on c.id = cb.id_consegna ";
+    query += "left join devices d on cb.id_bene = d.id ";
+    query += "left join softwares s on cb.id_bene = s.id ";
+    query += "where cb.stato_restituzione = 0 ";
+    return query;
+}
+
+
 function createConsegnaMessage(consegna, listBeni, data_limite) {
     var msgObj = {};
     if (consegna) {
@@ -14252,6 +14270,7 @@ module.exports = {
     getLastGestioneDeviceByIdDevice,
     queryConsegne,
     queryConsegnaById,
+    getDatiConsegneAttive,
     createConsegnaMessage,
     createConsegnaMySQLObj,
     insertConsegna,

package/package.json

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