alsmanager_lib 2.0.26 → 2.0.28

package/lib/modules.js

@@ -2290,7 +2290,7 @@ function getDevicesSelectBySite(db_used, id_site) {
 }
 //End Device Select by site
 // Device per plesso
-function getDevicesSelectByPlaceSQLite(id_place) {
+function getDevicesSelectByPlaceSQLite(id_place, dev_type) {
     var query = "select distinct devices.id, devices.type as Tipo, devices.manifacturer as Marca, devices.model as modello, ";
     query += "case ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
@@ -2309,11 +2309,14 @@ function getDevicesSelectByPlaceSQLite(id_place) {
     query += "inner join sites on sites.id = device_site.id_site ";
     query += "where (date('now') >= device_site.date_in and date('now') <= device_site.date_out) ";
     query += "and (devices.is_removed is null or devices.is_removed = 0) ";
-    query += "and sites.id_place = '" + id_place + "'";
+    query += "and sites.id_place = '" + id_place + "' ";
+    if (dev_type && dev_type != '') {
+        query += "and devices.type = '" + dev_type + "' ";
+    }
     return query;
 }
 
-function getDevicesSelectByPlaceMySQL(id_place) {
+function getDevicesSelectByPlaceMySQL(id_place, dev_type) {
     var query = "select DISTINCT devices.id, devices.type as Tipo, devices.manifacturer as Marca, devices.model as modello, ";
     query += "case ";
     query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
@@ -2332,18 +2335,21 @@ function getDevicesSelectByPlaceMySQL(id_place) {
     query += "inner join sites on sites.id = device_site.id_site ";
     query += "where (CURDATE() >= device_site.date_in and CURDATE() <= device_site.date_out) ";
     query += "and (devices.is_removed is null or devices.is_removed = 0) ";
-    query += "and sites.id_place = :id_place";
+    query += "and sites.id_place = :id_place ";
+    if (dev_type && dev_type != '') {
+        query += "and devices.type = :dev_type ";
+    }
     return query;
 }
-function getDevicesSelectByPlace(db_used, id_place) {
+function getDevicesSelectByPlace(db_used, id_place, dev_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesSelectByPlaceSQLite(id_place);
+                query = getDevicesSelectByPlaceSQLite(id_place, dev_type);
                 break;
             case 'MYSQL':
-                query = getDevicesSelectByPlaceMySQL(id_place);
+                query = getDevicesSelectByPlaceMySQL(id_place, dev_type);
                 break;
         }
     }
@@ -2358,8 +2364,8 @@ function getDevicesCounterBySiteSQLite(id_site) {
     query += "inner join device_site ds on ds.id_device = d.id ";
     query += "where (date('now') >= ds.date_in and date('now') <= ds.date_out) ";
     query += "and (d.is_removed is null or d.is_removed = 0) ";
-    query += "and ds.id_site = " + id_site;
-    query += " group by d.type";
+    query += "and ds.id_site = " + id_site + " ";
+    query += "group by d.type";
     return query;
 }
 
@@ -3020,7 +3026,7 @@ function getDevicesSelectCombo(db_used, categoria, id_dev_exclude, with_properti
 }
 //End get devices for combo
 // Get device by site combo
-function getDevicesSelectBySiteComboSQLite(id_site) {
+function getDevicesSelectBySiteComboSQLite(id_site, dev_type) {
     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) ";
@@ -3034,10 +3040,13 @@ function getDevicesSelectBySiteComboSQLite(id_site) {
     query += "where (d.is_removed is null or d.is_removed = 0) ";
     query += "and ds.id_site = " + id_site + " ";
     query += "and date('now') >= ds.date_in and date('now') <= ds.date_out ";
+    if (dev_type && dev_type != '') {
+        query += "and d.type = '" + dev_type + "' ";
+    }
     query += "order by d.inv_ict3_number";
     return query;
 }
-function getDevicesSelectBySiteComboMySQL(id_site) {
+function getDevicesSelectBySiteComboMySQL(id_site, dev_type) {
     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) ";
@@ -3051,19 +3060,22 @@ function getDevicesSelectBySiteComboMySQL(id_site) {
     query += "where (d.is_removed is null or d.is_removed = 0) ";
     query += "and ds.id_site = :id_site ";
     query += "and CURDATE() >= ds.date_in and CURDATE() <= ds.date_out ";
+    if (dev_type && dev_type != '') {
+        query += "and d.type = :dev_type ";
+    }
     query += "order by d.inv_ict3_number";
     return query;
 }
 
-function getDevicesSelectBySiteCombo(db_used, id_site) {
+function getDevicesSelectBySiteCombo(db_used, id_site, dev_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesSelectBySiteComboSQLite(id_site);
+                query = getDevicesSelectBySiteComboSQLite(id_site, dev_type);
                 break;
             case 'MYSQL':
-                query = getDevicesSelectBySiteComboMySQL(id_site);
+                query = getDevicesSelectBySiteComboMySQL(id_site, dev_type);
                 break;
         }
     }
@@ -4479,7 +4491,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 +4514,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 +4529,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 +4552,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 +4566,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 +4582,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 +4606,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 +4620,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 +4643,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 +4657,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.26",
+  "version": "2.0.28",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",