alsmanager_lib 3.0.37 → 3.0.39

package/lib/modules.js

@@ -1256,6 +1256,18 @@ function getSoftwareById(db_used, id_sw) {
     query += "and id = " + id_sw;
     return query;
 }
+function getSoftwareForConsegnaById(db_used, id_sw) {
+    var query = "select id, maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, ";
+    query += "case ";
+    query += "when s.no_inventario is not null and s.no_inventario > 0 then concat(s.id,'(ID)') ";
+    query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then s.inv_ict3_number ";
+    query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)') ";
+    query += "end as Codice ";
+    query += "from softwares s ";
+    query += "where (is_removed is null or is_removed = 0) ";
+    query += "and id = " + id_sw;
+    return query;
+}
 function insertSoftware(db_used, software) {
     var query = "insert into softwares (maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura) values (";
     query += "'" + software.marca + "', ";
@@ -5745,7 +5757,7 @@ 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 += "left join consegna_beni 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)) ";
@@ -5788,7 +5800,7 @@ 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 += "left join consegna_beni 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)) ";
@@ -5831,7 +5843,7 @@ 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 += "left join consegna_beni 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)) ";
@@ -8017,7 +8029,7 @@ function selectDeviceInDepositoSQLite(inv_code) {
     query += "join device_site ds on ds.id_device = d.id "
     query += "join sites s on s.id = ds.id_site "
     query += "join site_destinations sd on sd.id_site = s.id "
-    query += "left join consegna_bene cb on d.id = cb.id_bene "
+    query += "left join consegna_beni cb on d.id = cb.id_bene "
     query += "where (inv_ict3_number = '" + inv_code + "' or ";
     query += "inv_tn_number = '" + inv_code + "' or ";
     query += "serial_no = '" + inv_code + "' or ";
@@ -8039,7 +8051,7 @@ function selectDeviceInDepositoMySQL(inv_code) {
     query += "join device_site ds on ds.id_device = d.id "
     query += "join sites s on s.id = ds.id_site "
     query += "join site_destinations sd on sd.id_site = s.id "
-    query += "left join consegna_bene cb on d.id = cb.id_bene "
+    query += "left join consegna_beni cb on d.id = cb.id_bene "
     query += " where (inv_ict3_number = :inv_code or ";
     query += "inv_tn_number = :inv_code or ";
     query += "serial_no = :inv_code or ";
@@ -8221,7 +8233,7 @@ function getSoftwaresNotAllocatedComboSQLite() {
     query += "else '' "
     query += "end as Descrizione ";
     query += "from Softwares s ";
-    query += "left join consegna_bene cb on s.id = cb.id_bene "
+    query += "left join consegna_beni 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;
@@ -8236,7 +8248,7 @@ function getSoftwaresNotAllocatedComboMySQL() {
     query += "else '' "
     query += "end as Descrizione ";
     query += "from Softwares s ";
-    query += "left join consegna_bene cb on s.id = cb.id_bene "
+    query += "left join consegna_beni 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;
@@ -8251,7 +8263,7 @@ function getSoftwaresNotAllocatedComboMySQL2() {
     query += "else '' "
     query += "end as Descrizione ";
     query += "from Softwares s ";
-    query += "left join consegna_bene cb on s.id = cb.id_bene "
+    query += "left join consegna_beni 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;
@@ -14025,6 +14037,7 @@ module.exports = {
     getSoftwares,
     getSoftwareByCodice,
     getSoftwareById,
+    getSoftwareForConsegnaById,
     insertSoftware,
     updateSoftware,
     removeSoftware,

package/package.json

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