alsmanager_lib 2.0.76 → 2.0.77

package/lib/modules.js

@@ -2378,32 +2378,38 @@ function queryDeviceModels() {
     return query;
 }
 //
-function queryDeviceModelsByManifacturerSQLite(manifacturer) {
+function queryDeviceModelsByFilterSQLite(manifacturer, dev_type) {
     var query = "SELECT DISTINCT model from devices ";
     query += "where manifacturer = '" + manifacturer + "' ";
+    if (dev_type && dev_type != '') {
+        query += "and type = '" + dev_type + "' ";
+    }
     query += "order by model";
     return query;
 }
 
-function queryDeviceModelsByManifacturerMySQL(manifacturer) {
+function queryDeviceModelsByFilterMySQL(manifacturer, dev_type) {
     var query = "SELECT DISTINCT model from devices ";
     query += "where manifacturer = :manifacturer ";
+    if (dev_type && dev_type != '') {
+        query += "and type = :dev_type ";
+    }    
     query += "order by model";
     return query;
 }
 
-function queryDeviceModelsByManifacturer(db_used, manifacturer) {
+function queryDeviceModelsByFilter(db_used, manifacturer, dev_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryDeviceModelsByManifacturerSQLite(manifacturer);
+                query = queryDeviceModelsByFilterSQLite(manifacturer, dev_type);
                 break;
             case 'MYSQL':
-                query = queryDeviceModelsByManifacturerMySQL(manifacturer);
+                query = queryDeviceModelsByFilterMySQL(manifacturer, dev_type);
                 break;
             case 'MYSQL2':
-                query = queryDeviceModelsByManifacturerSQLite(manifacturer);
+                query = queryDeviceModelsByFilterSQLite(manifacturer, dev_type);
                 break;
         }
     }
@@ -11047,7 +11053,7 @@ module.exports = {
     queryDeviceTypes,
     queryDeviceManifactures,
     queryDeviceModels,
-    queryDeviceModelsByManifacturer,
+    queryDeviceModelsByFilter,
     getDevicesSelectByRelated,
     getDevicesSelect,
     getDevicesSelectBySite,

package/package.json

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