alsmanager_lib 3.0.28 → 3.0.30

package/lib/modules.js

@@ -7707,7 +7707,7 @@ function removeConsegnaBene(db_used, id_benecons) {
     return query;
 }
 function selectBeniPerConsegnaSQLite(id_consegna) {
-    var query =  "select cb.id_bene as id, cb.numero as Numero, cb.tipo_bene as Tipologia, ";
+    var query =  "select cb.id, cb.id_bene, cb.numero as Numero, cb.tipo_bene as Tipologia, ";
     query += "case ";
     query += "when cb.tipo_bene = 'DEVICE' then d.type "; 
     query += "when cb.tipo_bene = 'SOFTWARE' then s.support "; 
@@ -7799,51 +7799,33 @@ function selectBeniPerConsegna(db_used, id_consegna) {
     return query;
 }
 
-function selectDeviceConsegnaSQLite(id_consegna, id_device) {
-    var query =  "select dc.id as id_dev_cons, d.id, d.type, d.manifacturer, d.model, ";
-    query += "case ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
-    query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
-    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
-    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
-    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
-    query += "end as codice ";    
-    query += ", dc.note as note_cons from device_consegne dc";
-    query += " join devices d on d.id = dc.id_device";
-    query += " where dc.id_consegna = " + id_consegna; 
-    query += " and d.id = " + id_device;
+function selectBeneConsegnaSQLite(id_consegna, id_benecons) {
+    var query =  "select cb.id as id_benecons, cb.id_consegna, cb.id_bene, cb.tipo_bene,  ";
+    query += "cb.note_consegna, cb.numero, cb.stato_restituzione, cb.data_consegna, cb.data_restituzione from consegna_beni cb";
+    query += " where cb.id = " + id_benecons; 
     return query;
 }
 
-function selectDeviceConsegnaMySQL(id_consegna, id_device) {
-    var query =  "select dc.id as id_dev_cons, d.id, d.type, d.manifacturer, d.model, ";
-    query += "case ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
-    query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
-    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
-    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
-    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
-    query += "end as codice ";    
-    query += ", dc.note as note_cons from device_consegne dc";
-    query += " join devices d on d.id = dc.id_device";
-    query += " where dc.id_consegna = :id_consegna"; 
-    query += " and d.id :id_device";
+function selectBeneConsegnaMySQL(id_consegna, id_benecons) {
+    var query =  "select cb.id as id_benecons, cb.id_consegna, cb.id_bene, cb.tipo_bene,  ";
+    query += "cb.note_consegna, cb.numero, cb.stato_restituzione, cb.data_consegna, cb.data_restituzione from consegna_beni cb";
+    query += " where cb.id = :id_benecons"; 
     return query;
 }
 
 
-function selectDeviceConsegna(db_used, id_consegna, id_device) {
+function selectBeneConsegna(db_used, id_consegna, id_benecons) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = selectDeviceConsegnaSQLite(id_consegna, id_device);
+                query = selectBeneConsegnaSQLite(id_consegna, id_benecons);
                 break;
             case 'MYSQL':
-                query = selectDeviceConsegnaMySQL(id_consegna, id_device);
+                query = selectBeneConsegnaMySQL(id_consegna, id_benecons);
                 break;
             case 'MYSQL2':
-                query = selectDeviceConsegnaSQLite(id_consegna, id_device);
+                query = selectBeneConsegnaSQLite(id_consegna, id_benecons);
                 break;
         }
     }
@@ -13997,6 +13979,7 @@ module.exports = {
     updateConsegnaBene,
     removeConsegnaBene,
     selectBeniPerConsegna,
+    selectBeneConsegna,
     selectDevicePerConsegna,
     selectDeviceConsegna, 
     selectSoftwarePerConsegna,

package/package.json

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