alsmanager_lib 3.0.38 → 3.0.40

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 + "', ";
@@ -7806,9 +7818,9 @@ function selectBeniPerConsegnaSQLite(id_consegna) {
     //
     query += "end as Codice, ";
     query += "case ";
-    query += "when cb.tipo_bene = 'DEVICE' and trim(d.inv_pnrr_number) is null then '' ";
-    query += "when cb.tipo_bene = 'DEVICE' and trim(d.inv_pnrr_number) = '' then '' ";
-    query += "else 'SI' ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.inv_pnrr_number is not null and trim(d.inv_pnrr_number) <> '' then 'SI' ";
+    query += "when cb.tipo_bene = 'SOFTWARE' and s.is_pnrr is not null and s.is_pnrr = 0 then 'SI' ";
+    query += "else 'NO' ";
     query += "end as PNRR, cb.note_consegna as Note_cons ";    
     query += "from consegna_beni cb ";
     query += "left join devices d on cb.id_bene = d.id ";
@@ -7830,9 +7842,9 @@ function selectBeniPerConsegnaMySQL(id_consegna) {
     query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
     query += "end as Codice, ";
     query += "case ";
-    query += "when trim(d.inv_pnrr_number) is null then '' ";
-    query += "when trim(d.inv_pnrr_number) = '' then '' ";
-    query += "else 'SI' ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.inv_pnrr_number is not null and trim(d.inv_pnrr_number) <> '' then 'SI' ";
+    query += "when cb.tipo_bene = 'SOFTWARE' and s.is_pnrr is not null and s.is_pnrr = 0 then 'SI' ";
+    query += "else 'NO' ";
     query += "end as PNRR, dc.note as Note_cons ";    
     query += " from devices d";
     query += " left join device_consegne dc on dc.id_device = d.id";
@@ -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.38",
+  "version": "3.0.40",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",