alsmanager_lib 3.0.35 → 3.0.37

package/lib/modules.js

@@ -5745,8 +5745,10 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
     query += "left join device_consegne dc on d.id = dc.id_device ";
+    query += "left join consegna_bene cb on d.id = cb.id_bene "
     query += "where (d.is_removed is null or d.is_removed = 0) "
     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 + ")) ";
     if (sel_type_str.trim() != '') {
@@ -5786,8 +5788,10 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
     query += "left join device_consegne dc on d.id = dc.id_device ";
+    query += "left join consegna_bene cb on d.id = cb.id_bene "
     query += "where (d.is_removed is null or d.is_removed = 0) "
     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)) ";
     if (sel_type_str.trim() != '') {
@@ -5827,8 +5831,10 @@ function getDevicesNotAllocatedComboMySQL2(id_site, id_place, sel_type, sel_make
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
     query += "left join device_consegne dc on d.id = dc.id_device ";
+    query += "left join consegna_bene cb on d.id = cb.id_bene "
     query += "where (d.is_removed is null or d.is_removed = 0) "
     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 + ")) ";
     if (sel_type_str.trim() != '') {
@@ -8168,9 +8174,9 @@ function selectSoftwaresInDepositoSQLite(inv_code) {
     query += "else concat(s.id,'(ID)') ";
     query += "end as Codice ";
     query += "from softwares s ";
-    query += "left join consegna_beni cb on d.id = cb.id_bene "
-    query += "where (inv_ict3_number = '" + inv_code + "' or ";
-    query += "serial_no = '" + inv_code + "')";
+    query += "left join consegna_beni cb on s.id = cb.id_bene "
+    query += "where (s.inv_ict3_number = '" + inv_code + "' or ";
+    query += "s.serial_no = '" + inv_code + "')";
     query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2))";
     return query;    
 }
@@ -8206,6 +8212,68 @@ function selectSoftwaresInDeposito(db_used, inv_code) {
     return query;
 }
 
+function getSoftwaresNotAllocatedComboSQLite() {
+    var query = "SELECT s.id, s.platform, s.maker as Marca, s.model as Modello, ";    
+    query += "case ";
+    query += "when s.no_inventario is not null and s.no_inventario > 0 then concat(s.id, '(ID)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then concat(s.inv_ict3_number, ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "else '' "
+    query += "end as Descrizione ";
+    query += "from Softwares s ";
+    query += "left join consegna_bene cb on s.id = cb.id_bene "
+    query += "where (s.is_removed is null or s.is_removed = 0) "
+    query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2)) ";
+    return query;
+}
+
+function getSoftwaresNotAllocatedComboMySQL() {
+    var query = "SELECT s.id, s.platform, s.maker as Marca, s.model as Modello, ";    
+    query += "case ";
+    query += "when s.no_inventario is not null and s.no_inventario > 0 then concat(s.id, '(ID)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then concat(s.inv_ict3_number, ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "else '' "
+    query += "end as Descrizione ";
+    query += "from Softwares s ";
+    query += "left join consegna_bene cb on s.id = cb.id_bene "
+    query += "where (s.is_removed is null or s.is_removed = 0) "
+    query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2)) ";
+    return query;
+}
+
+function getSoftwaresNotAllocatedComboMySQL2() {
+    var query = "SELECT s.id, s.platform, s.maker as Marca, s.model as Modello, ";    
+    query += "case ";
+    query += "when s.no_inventario is not null and s.no_inventario > 0 then concat(s.id, '(ID)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then concat(s.inv_ict3_number, ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
+    query += "else '' "
+    query += "end as Descrizione ";
+    query += "from Softwares s ";
+    query += "left join consegna_bene cb on s.id = cb.id_bene "
+    query += "where (s.is_removed is null or s.is_removed = 0) "
+    query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2)) ";
+    return query;
+}
+
+function getSoftwaresNotAllocatedCombo(db_used) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getSoftwaresNotAllocatedComboSQLite();
+                break;
+            case 'MYSQL':
+                query = getSoftwaresNotAllocatedComboMySQL();
+                break;
+            case 'MYSQL2':
+                query = getSoftwaresNotAllocatedComboMySQL2();
+                break;
+        }
+    }
+    return query;
+}
 
 //get connection types 
 function getConnectionTypesSQLite() {
@@ -14080,6 +14148,7 @@ module.exports = {
     selectSoftwarePerConsegna,
     selectSoftwareConsegna, 
     selectSoftwaresInDeposito,
+    getSoftwaresNotAllocatedCombo,
     //
     selectDeviceInDeposito,   
     queryDeviceStatusCombo,

package/package.json

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