alsmanager_lib 2.0.28 → 2.0.29

package/lib/modules.js

@@ -2229,7 +2229,7 @@ function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, is_PN
 }
 // End Device select
 // Device Select by site
-function getDevicesSelectBySiteSQLite(id_site) {
+function getDevicesSelectBySiteSQLite(id_site, 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 ";
@@ -2248,11 +2248,14 @@ function getDevicesSelectBySiteSQLite(id_site) {
     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 = " + id_site;
+    query += "and sites.id = " + id_site + " ";
+    if (dev_type && dev_type != '') {
+        query += "and devices.type = '" + dev_type + "' ";
+    }    
     return query;
 }
 
-function getDevicesSelectBySiteMySQL(id_site) {
+function getDevicesSelectBySiteMySQL(id_site, 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 ";
@@ -2271,18 +2274,21 @@ function getDevicesSelectBySiteMySQL(id_site) {
     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 = :id_site";
+    query += "and sites.id = :id_site ";
+    if (dev_type && dev_type != '') {
+        query += "and devices.type = :dev_type ";
+    }    
     return query;
 }
-function getDevicesSelectBySite(db_used, id_site) {
+function getDevicesSelectBySite(db_used, id_site, dev_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getDevicesSelectBySiteSQLite(id_site);
+                query = getDevicesSelectBySiteSQLite(id_site, dev_type);
                 break;
             case 'MYSQL':
-                query = getDevicesSelectBySiteMySQL(id_site);
+                query = getDevicesSelectBySiteMySQL(id_site, dev_type);
                 break;
         }
     }

package/package.json

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