alsmanager_lib 3.0.33 → 3.0.34

package/lib/modules.js

@@ -8007,15 +8007,17 @@ function selectDeviceInDepositoSQLite(inv_code) {
     query += "when inv_tndigit_number != '' and inv_tndigit_number is not null then concat(inv_tndigit_number,'(TNDigit)') ";
     query += "when serial_no != '' and serial_no is not null then concat(serial_no,'(S/N)') ";
     query += "end as Codice ";
-    query += " from devices d";
-    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 += " where (inv_ict3_number = '" + inv_code + "' or ";
+    query += "from devices d ";
+    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 += "where (inv_ict3_number = '" + inv_code + "' or ";
     query += "inv_tn_number = '" + inv_code + "' or ";
-    //query += "serial_no like '" + inv_code + "%' or ";
-    query += "inv_pnrr_number = '" + inv_code + "') and ";
-    query += "sd.type = 'MAGAZZINO'";
+    query += "serial_no = '" + inv_code + "' or ";
+    query += "inv_pnrr_number = '" + inv_code + "') ";
+    query += "and sd.type = 'MAGAZZINO'";
+    query += "and (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))";
     return query;    
 }
 function selectDeviceInDepositoMySQL(inv_code) {
@@ -8027,15 +8029,17 @@ function selectDeviceInDepositoMySQL(inv_code) {
     query += "when inv_tndigit_number != '' and inv_tndigit_number is not null then concat(inv_tndigit_number,'(TNDigit)') ";
     query += "when serial_no != '' and serial_no is not null then concat(serial_no,'(S/N)') ";
     query += "end as Codice ";
-    query += " from devices d";
-    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 += "from devices d ";
+    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 += " where (inv_ict3_number = :inv_code or ";
     query += "inv_tn_number = :inv_code or ";
-    //query += "serial_no like ':inv_code%' or ";
+    query += "serial_no = :inv_code or ";
     query += "inv_pnrr_number = :inv_code) and ";
     query += "sd.type = 'MAGAZZINO'";
+    query += "and (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))";
     return query;    
 }
 function selectDeviceInDeposito(db_used, inv_code) {
@@ -8156,16 +8160,53 @@ function selectSoftwareConsegna(db_used, id_consegna, id_software) {
     return query;
 }
 
-function insertConsegnaSoftware() {
-
+function selectSoftwaresInDepositoSQLite(inv_code) {
+    var query = "SELECT s.id, s.support, s.platform, s.version, s.licence_type, s.maker, s.model, ";
+    query += "case ";
+    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 += "else concat(s.id,'(ID)') ";
+    query += "end as Codice ";
+    query += "from softwares s ";
+    query += "left join consegna_bene cb on d.id = cb.id_bene "
+    query += "where (inv_ict3_number = '" + inv_code + "' or ";
+    query += "serial_no = '" + inv_code + "')";
+    query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2))";
+    return query;    
 }
-function updateConsegnaSoftware() {
-    
+function selectSoftwaresInDepositoMySQL(inv_code) {
+    var query = "SELECT s.id, s.support, s.platform, s.version, s.licence_type, s.maker, s.model, ";
+    query += "case ";
+    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 += "else concat(s.id,'(ID)') ";
+    query += "end as Codice ";
+    query += "from softwares s ";
+    query += "left join consegna_bene cb on d.id = cb.id_bene "
+    query += "where (inv_ict3_number = :inv_code or ";
+    query += "serial_no = :inv_code)";
+    query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2))";
+    return query;    
 }
-function removeConsegnaSoftware() {
-    
+function selectSoftwaresInDeposito(db_used, inv_code) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectSoftwaresInDepositoSQLite(inv_code);
+                break;
+            case 'MYSQL':
+                query = selectSoftwaresInDepositoMySQL(inv_code);
+                break;
+            case 'MYSQL2':
+                query = selectSoftwaresInDepositoSQLite(inv_code);
+                break;
+        }
+    }
+    return query;
 }
 
+
 //get connection types 
 function getConnectionTypesSQLite() {
     var query = "select id, conn_type from connection_types";
@@ -14038,9 +14079,7 @@ module.exports = {
     selectDeviceConsegna, 
     selectSoftwarePerConsegna,
     selectSoftwareConsegna, 
-    insertConsegnaSoftware,
-    updateConsegnaSoftware,
-    removeConsegnaSoftware,       
+    selectSoftwaresInDeposito,
     //
     selectDeviceInDeposito,   
     queryDeviceStatusCombo,

package/package.json

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