alsmanager_lib 3.0.30 → 3.0.32

package/lib/modules.js

@@ -3474,6 +3474,58 @@ function queryDeviceById(db_used, id_device) {
     }
     return query;
 }
+function queryDeviceForConsegneByIdSQLite(id_device) {
+    var query = "SELECT d.id, d.type as Tipo, "; 
+    query += "d.manifacturer as Marca, d.model as Modello, ";
+    query += "d.manifacturer as Marca, d.model as Modello, ";
+    query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_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 += "else concat(d.id, '(ID)') "
+    query += "end as Codice, ";
+    query += "d.note, d.num_objects, d.no_inventario from devices d ";
+    query += "where d.id = " + id_device;
+    return query;
+}
+function queryDeviceForConsegneByIdMySQL(id_device) {
+    var query = "SELECT d.id, d.type as Tipo, ";
+    query += "d.manifacturer as Marca, d.model as Modello, ";
+    query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_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 += "else concat(d.id, '(ID)') "
+    query += "end as Codice, ";
+    query += "d.note, d.num_objects, d.no_inventario from devices d ";
+    query += "where d.id = :id_device";
+    return query;
+}
+function queryDeviceForConsegneById(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryDeviceForConsegneByIdSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = queryDeviceForConsegneByIdMySQL(id_device);
+                break;
+            case 'MYSQL2':
+                query = queryDeviceForConsegneByIdSQLite(id_device);
+                break;
+        }
+    }
+    return query;
+}
+
+
+
+
 //End Get Device by Id
 //Get Device by Identificativo
 function queryDeviceByIdentificativoSQLite(identificativo) {
@@ -7799,14 +7851,14 @@ function selectBeniPerConsegna(db_used, id_consegna) {
     return query;
 }
 
-function selectBeneConsegnaSQLite(id_consegna, id_benecons) {
+function selectBeneConsegnaSQLite(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 selectBeneConsegnaMySQL(id_consegna, id_benecons) {
+function selectBeneConsegnaMySQL(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"; 
@@ -7814,18 +7866,18 @@ function selectBeneConsegnaMySQL(id_consegna, id_benecons) {
 }
 
 
-function selectBeneConsegna(db_used, id_consegna, id_benecons) {
+function selectBeneConsegna(db_used, id_benecons) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = selectBeneConsegnaSQLite(id_consegna, id_benecons);
+                query = selectBeneConsegnaSQLite(id_benecons);
                 break;
             case 'MYSQL':
-                query = selectBeneConsegnaMySQL(id_consegna, id_benecons);
+                query = selectBeneConsegnaMySQL(id_benecons);
                 break;
             case 'MYSQL2':
-                query = selectBeneConsegnaSQLite(id_consegna, id_benecons);
+                query = selectBeneConsegnaSQLite(id_benecons);
                 break;
         }
     }
@@ -7945,8 +7997,9 @@ function selectDeviceConsegna(db_used, id_consegna, id_device) {
     return query;
 }
 
+
 function selectDeviceInDepositoSQLite(inv_code) {
-    var query = "SELECT d.id, d.type, d.manifacturer, d.model, ";
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
@@ -7966,7 +8019,7 @@ function selectDeviceInDepositoSQLite(inv_code) {
     return query;    
 }
 function selectDeviceInDepositoMySQL(inv_code) {
-    var query = "SELECT d.id, d.type, d.manifacturer, d.model, ";
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
     query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
@@ -13750,6 +13803,7 @@ module.exports = {
     getDevicesSelectBySite,
     queryDeviceById,
     queryDeviceByIdentificativo,
+    queryDeviceForConsegneById,
     getDevicesCounterBySite,
     getDevicesCounterByPlace,
     queryDeviceStatus,

package/package.json

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