alsmanager_lib 2.0.25 → 2.0.27

package/lib/modules.js

@@ -3368,7 +3368,7 @@ function getBeniDaInventariNonAllocatiSQLite(table_name, is_pnrr, is_dismissione
             query += "from " + table_name + " imp ";
             query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
         else if (table_name == "devices") {
             query = getDevicesSelectForInventarioRawSQLite(inv_code);
@@ -3383,7 +3383,7 @@ function getBeniDaInventariNonAllocatiSQLite(table_name, is_pnrr, is_dismissione
             query += "from " + table_name + " imp ";
             query += "left join devices d on imp.inventario = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
         else if (is_dismissione == 1) {
             query = "Select ";
@@ -3395,7 +3395,7 @@ function getBeniDaInventariNonAllocatiSQLite(table_name, is_pnrr, is_dismissione
             query += "from " + table_name + " imp ";
             query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
         else {
             query = "Select ";
@@ -3414,7 +3414,7 @@ function getBeniDaInventariNonAllocatiSQLite(table_name, is_pnrr, is_dismissione
             query += "from " + table_name + " imp ";
             query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
     }
     return query;
@@ -3439,7 +3439,7 @@ function getBeniDaInventariNonAllocatiMySQL(table_name, is_pnrr, is_dismissione)
             query += "from :table_name imp ";
             query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
         else if (table_name == "devices") {
             query = getDevicesSelectForInventarioRawMySQL(inv_code);
@@ -3454,7 +3454,7 @@ function getBeniDaInventariNonAllocatiMySQL(table_name, is_pnrr, is_dismissione)
             query += "from :table_name imp ";
             query += "left join devices d on imp.inventario = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
         else if (is_dismissione == 1) {
             query = "Select ";
@@ -3466,7 +3466,7 @@ function getBeniDaInventariNonAllocatiMySQL(table_name, is_pnrr, is_dismissione)
             query += "from :table_name imp ";
             query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
         else {
             query = "Select ";
@@ -3485,7 +3485,7 @@ function getBeniDaInventariNonAllocatiMySQL(table_name, is_pnrr, is_dismissione)
             query += "from :table_name imp ";
             query += "left join devices d on imp.inv_ict3 = d.inv_ict3_number "
             query += "left join device_site ds on d.id = ds.id_device "
-            query += "where ds.id is null and d.id is not null"
+            query += "where ds.id_site is null and d.id is not null"
         }
     }
     
@@ -4479,7 +4479,15 @@ function queryDeviceTypes() {
     return query;
 }
 // Define getDevicesNotAllocatedCombo
-function getDevicesNotAllocatedComboSQLite(ordered_by) {
+function getDevicesNotAllocatedComboSQLite(sel_type, sel_maker, ordered_by) {
+    var sel_type_str = "";
+    if (sel_type) {
+        sel_type_str = sel_type;
+    }
+    var sel_maker_str = "";
+    if (sel_maker) {
+        sel_maker_str = sel_maker;
+    }
     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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -4494,6 +4502,12 @@ function getDevicesNotAllocatedComboSQLite(ordered_by) {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is null ";
     query += "or (ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) ";
+    if (sel_type_str.trim() != '') {
+        query += "and d.type = '" + sel_type_str.trim() + "' ";
+    }
+    if (sel_maker_str.trim() != '') {
+        query += "and d.manifacturer = '" + sel_maker_str.trim() + "' ";
+    }
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
     }
@@ -4503,7 +4517,15 @@ function getDevicesNotAllocatedComboSQLite(ordered_by) {
     return query;
 }
 
-function getDevicesNotAllocatedComboMySQL(ordered_by) {
+function getDevicesNotAllocatedComboMySQL(sel_type, sel_maker,ordered_by) {
+    var sel_type_str = "";
+    if (sel_type) {
+        sel_type_str = sel_type;
+    }
+    var sel_maker_str = "";
+    if (sel_maker) {
+        sel_maker_str = sel_maker;
+    }
     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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -4518,6 +4540,12 @@ function getDevicesNotAllocatedComboMySQL(ordered_by) {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is null ";
     query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) ";
+    if (sel_type_str.trim() != '') {
+        query += "and d.type = :dev_type ";
+    }
+    if (sel_maker_str.trim() != '') {
+        query += "and d.manifacturer = :dev_manifacturer ";
+    }
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
     }
@@ -4526,15 +4554,15 @@ function getDevicesNotAllocatedComboMySQL(ordered_by) {
     }
     return query;
 }
-function getDevicesNotAllocatedCombo(db_used,ordered_by) {
+function getDevicesNotAllocatedCombo(db_used, sel_type, sel_maker, ordered_by) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesNotAllocatedComboSQLite(ordered_by);
+                query = getDevicesNotAllocatedComboSQLite(sel_type, sel_maker, ordered_by);
                 break;
             case 'MYSQL':
-                query = getDevicesNotAllocatedComboMySQL(ordered_by);
+                query = getDevicesNotAllocatedComboMySQL(sel_type, sel_maker, ordered_by);
                 break;
         }
     }
@@ -4542,7 +4570,16 @@ function getDevicesNotAllocatedCombo(db_used,ordered_by) {
 }
 // End getDevicesNotAllocatedCombo
 // Define getDevicesAllocatedCombo
-function getDevicesAllocatedComboSQLite(id_site, id_place, ordered_by) {
+function getDevicesAllocatedComboSQLite(id_site, id_place, sel_type, sel_maker, ordered_by) {
+    var sel_type_str = "";
+    if (sel_type) {
+        sel_type_str = sel_type;
+    }
+    var sel_maker_str = "";
+    if (sel_maker) {
+        sel_maker_str = sel_maker;
+    }
+
     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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -4557,6 +4594,12 @@ function getDevicesAllocatedComboSQLite(id_site, id_place, ordered_by) {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is not null ";
     query += "or (ds.date_in <= date('now') and ds.date_out >= date('now') and ds.id_site <> " + id_site + " and ds.id_place <> '" + id_place + "')) ";
+    if (sel_type_str.trim() != '') {
+        query += "and d.type = '" + sel_type_str.trim() + "' ";
+    }
+    if (sel_maker_str.trim() != '') {
+        query += "and d.manifacturer = '" + sel_maker_str.trim() + "' ";
+    }
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
     }
@@ -4565,7 +4608,15 @@ function getDevicesAllocatedComboSQLite(id_site, id_place, ordered_by) {
     }
     return query;
 }
-function getDevicesAllocatedComboMySQL(id_site, id_place, ordered_by) {
+function getDevicesAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker, ordered_by) {
+    var sel_type_str = "";
+    if (sel_type) {
+        sel_type_str = sel_type;
+    }
+    var sel_maker_str = "";
+    if (sel_maker) {
+        sel_maker_str = sel_maker;
+    }
     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 concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -4580,6 +4631,12 @@ function getDevicesAllocatedComboMySQL(id_site, id_place, ordered_by) {
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (ds.id_place is not null ";
     query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and ds.id_site <> :id_site and ds.id_place <> :id_place)) ";
+    if (sel_type_str.trim() != '') {
+        query += "and d.type = :dev_type ";
+    }
+    if (sel_maker_str.trim() != '') {
+        query += "and d.manifacturer = :dev_manifacturer ";
+    }    
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
     }
@@ -4588,15 +4645,15 @@ function getDevicesAllocatedComboMySQL(id_site, id_place, ordered_by) {
     }
     return query;
 }
-function getDevicesAllocatedCombo(db_used, id_site, id_place, ordered_by) {
+function getDevicesAllocatedCombo(db_used, id_site, id_place, sel_type, sel_maker, ordered_by) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesAllocatedComboSQLite(id_site, id_place, ordered_by);
+                query = getDevicesAllocatedComboSQLite(id_site, id_place, sel_type, sel_maker, ordered_by);
                 break;
             case 'MYSQL':
-                query = getDevicesAllocatedComboMySQL(id_site, id_place, ordered_by);
+                query = getDevicesAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker, ordered_by);
                 break;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alsmanager_lib",
-  "version": "2.0.25",
+  "version": "2.0.27",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",