alsmanager_lib 3.0.25 → 3.0.27

package/lib/modules.js

@@ -7709,35 +7709,35 @@ function removeConsegnaBene(db_used, id_benecons) {
 function selectBeniPerConsegnaSQLite(id_consegna) {
     var query =  "select cb.id_bene as id, cb.numero as Numero, cb.tipo_bene as Tipologia, ";
     query += "case ";
-    query += "when cd.tipo_bene = 'DEVICE' then d.type "; 
-    query += "when cd.tipo_bene = 'SOFTWARE' then s.type "; 
-    query += "when cd.tipo_bene = 'BENE_CONSUMO' then bc.type "; 
-    query += "when cd.tipo_bene = 'ALTRO' then a.type ";
+    query += "when cb.tipo_bene = 'DEVICE' then d.type "; 
+    query += "when cb.tipo_bene = 'SOFTWARE' then s.support "; 
+    query += "when cb.tipo_bene = 'BENE_CONSUMO' then bc.Tipo "; 
+    query += "when cb.tipo_bene = 'ALTRO' then atd.name ";
     query += "else '' "
     query += "end as Tipo, "; 
     query += "case ";
-    query += "when cd.tipo_bene = 'DEVICE' then d.manifacturer "; 
-    query += "when cd.tipo_bene = 'SOFTWARE' then s.maker "; 
-    query += "when cd.tipo_bene = 'BENE_CONSUMO' then bc.Marca "; 
-    query += "when cd.tipo_bene = 'ALTRO' then a.manifacturer ";
+    query += "when cb.tipo_bene = 'DEVICE' then d.manifacturer "; 
+    query += "when cb.tipo_bene = 'SOFTWARE' then s.maker "; 
+    query += "when cb.tipo_bene = 'BENE_CONSUMO' then bc.Marca "; 
+    query += "when cb.tipo_bene = 'ALTRO' then a.manifacturer ";
     query += "else '' "
     query += "end as Marca, "; 
     query += "case ";
-    query += "when cd.tipo_bene = 'DEVICE' then d.model "; 
-    query += "when cd.tipo_bene = 'SOFTWARE' then s.model "; 
-    query += "when cd.tipo_bene = 'BENE_CONSUMO' then bc.Modello "; 
-    query += "when cd.tipo_bene = 'ALTRO' then a.model ";
+    query += "when cb.tipo_bene = 'DEVICE' then d.model "; 
+    query += "when cb.tipo_bene = 'SOFTWARE' then s.model "; 
+    query += "when cb.tipo_bene = 'BENE_CONSUMO' then bc.Modello "; 
+    query += "when cb.tipo_bene = 'ALTRO' then a.model ";
     query += "else '' "
     query += "end as Modello, "; 
     query += "case ";
-    query += "when cd.tipo_bene = 'DEVICE' and d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
-    query += "when cd.tipo_bene = 'DEVICE' and d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
-    query += "when cd.tipo_bene = 'DEVICE' and when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
-    query += "when cd.tipo_bene = 'DEVICE' and d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
-    query += "when cd.tipo_bene = 'DEVICE' and d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
+    query += "when cb.tipo_bene = 'DEVICE' and d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
     //
-    query += "when cd.tipo_bene = 'SOFTWARE' and s.inv_ict3_number != '' and s.inv_ict3_number is not null then s.inv_ict3_number ";
-    query += "when cd.tipo_bene = 'SOFTWARE' and s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)') ";
+    query += "when cb.tipo_bene = 'SOFTWARE' and s.inv_ict3_number != '' and s.inv_ict3_number is not null then s.inv_ict3_number ";
+    query += "when cb.tipo_bene = 'SOFTWARE' and s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)') ";
     //
     // Temporaneamente non considerato
     //query += "when cd.tipo_bene = 'BENE_CONSUMO' and d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
@@ -7748,15 +7748,17 @@ function selectBeniPerConsegnaSQLite(id_consegna) {
     //
     query += "end as Codice, ";
     query += "case ";
-    query += "when cd.tipo_bene = 'DEVICE' and trim(d.inv_pnrr_number) is null then '' ";
-    query += "when cd.tipo_bene = 'DEVICE' and trim(d.inv_pnrr_number) = '' then '' ";
+    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 += "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";
-    query += " left join softwares s on cb.id_bene = s.id";
-    query += " left join beni_consumo bc on cb.id_bene = bc.id";
-    query += " where cb.id_consegna = " + id_consegna; 
+    query += "from consegna_beni cb ";
+    query += "left join devices d on cb.id_bene = d.id ";
+    query += "left join softwares s on cb.id_bene = s.id ";
+    query += "left join beni_consumo bc on cb.id_bene = bc.id ";
+    query += "left join altri_beni a on cb.id_bene = a.id ";
+    query += "left join altro_tipi atd on a.id_type = atd.id ";
+    query += "where cb.id_consegna = " + id_consegna; 
     return query;
 }
 

package/package.json

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