alsmanager_lib 2.0.60 → 2.0.62

package/lib/modules.js

@@ -156,20 +156,20 @@ function removeConnector(db_used, id_device, conn_obj) {
 //End Manage connectors
 // Manage Storage
 function queryStorageManifactures() {
-    var query = "SELECT DISTINCT upper(storage_manifacturer) as marca from device_storages order by storage_manifacturer";
+    var query = "SELECT DISTINCT upper(trim(storage_manifacturer)) as marca from device_storages order by storage_manifacturer";
     return query;
 }
 
 function queryStorageModelsSQLite(marca) {
-    var query = "SELECT DISTINCT upper(storage_model) as modello from device_storages ";
-    query += "where upper(storage_manifacturer) = " + marca + " ";
+    var query = "SELECT DISTINCT upper(trim(storage_model)) as modello from device_storages ";
+    query += "where upper(trim(storage_manifacturer)) = '" + marca + "' ";
     query += "order by storage_model";
     return query;
 }
 
 function queryStorageModelsMySQL(marca) {
-    var query = "SELECT DISTINCT upper(storage_model) as modello from device_storages ";
-    query += "where upper(storage_manifacturer) = :marca ";
+    var query = "SELECT DISTINCT upper(trim(storage_model)) as modello from device_storages ";
+    query += "where upper(trim(storage_manifacturer)) = :marca ";
     query += "order by storage_model";
     return query;
 }
@@ -2126,7 +2126,7 @@ function queryDeviceModels() {
 }
 
 // Device select
-function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, id_dev_exclude) {
+function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
@@ -2138,9 +2138,11 @@ function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR,
     query += "from devices d ";
     if (dev_status)
         query += "left join device_usage du on d.id = du.id_device"
+    if (dev_gestione)
+        query += "left join device_gestioni dg on d.id = dg.id_device"
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
-    if (inv_code || dev_type || marca || (is_PNRR && is_PNRR > 0) || dev_status) {
+    if (inv_code || dev_type || marca || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione) {
         if (inv_code) {
             if (search_type == "ESATTA") {
                 where_clause += " and (d.inv_ict3_number = '" + inv_code + "' or ";
@@ -2180,6 +2182,9 @@ function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR,
             if (dev_status) {
                 where_clause += " du.status = " + dev_status + " and date('now') >= du.date_status";
             }
+            if (dev_gestione) {
+                where_clause += " dg.id_gestione = " + dev_gestione + " and date('now') >= dg.date_start and date('now') <= dg.date_end";
+            }
         }
     }
     else {
@@ -2191,7 +2196,7 @@ function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR,
     return query;
 }
 
-function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, id_dev_exclude) {
+function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
@@ -2203,9 +2208,12 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR,
     query += "from devices d ";
     if (dev_status)
         query += "left join device_usage du on d.id = du.id_device"
+    if (dev_gestione)
+        query += "left join device_gestioni dg on d.id = dg.id_device"
+
 
     var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
-    if (inv_code || dev_type || marca || (is_PNRR && is_PNRR > 0)) {
+    if (inv_code || dev_type || marca || (is_PNRR && is_PNRR > 0) || dev_gestione) {
         if (inv_code) {
             if (search_type == "ESATTA") {
                 where_clause += " and (d.inv_ict3_number = :inv_code or ";
@@ -2245,6 +2253,9 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR,
             if (dev_status) {
                 where_clause += " du.status = :dev_status and CURRDATE() >= du.date_status";
             }
+            if (dev_gestione) {
+                where_clause += " dg.id_gestione = :dev_gestione and CURDATE() >= dg.date_start and CURDATE() <= dg.date_end";
+            }
         }
     }
     else {
@@ -2257,15 +2268,15 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR,
     query += " order by id";
     return query;
 }
-function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, is_PNRR, dev_status, id_dev_exclude) {
+function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, id_dev_exclude);
+                query = getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
                 break;
             case 'MYSQL':
-                query = getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, id_dev_exclude);
+                query = getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
                 break;
         }
     }

package/package.json

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