alsmanager_lib 3.0.186 → 3.0.188

package/lib/modules.js

@@ -11570,30 +11570,28 @@ function queryDetailsByIdDevice(db_used,id_device) {
 }
 //End Get details by type
 //Get visible groups by id
-function queryVisibleGroupByIdDeviceSQLite(id_device) {
+function queryVisibleGroupByTypeSQLite(dev_type) {
     var query = "select pv.tipo, pv.group_name from properties_visible pv ";
-    query += "join devices d on d.type = pv.tipo ";
-    query += "where d.id = " + id_device;
+    query += "where pv.tipo = '" + dev_type + "'";
     return query;
 }
-function queryVisibleGroupByIdDeviceMySQL(id_device) {
+function queryVisibleGroupByTypeMySQL() {
     var query = "select pv.tipo, pv.group_name from properties_visible pv ";
-    query += "join devices d on d.type = pv.tipo ";
-    query += "where d.id = :id_device";
+    query += "where pv.tipo = :dev_type";
     return query;
 }
-function queryVisibleGroupByIdDevice(db_used,id_device) {
+function queryVisibleGroupByType(db_used, dev_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryVisibleGroupByIdDeviceSQLite(id_device);
+                query = queryVisibleGroupByTypeSQLite(dev_type);
                 break;
             case 'MYSQL':
-                query = queryVisibleGroupByIdDeviceMySQL(id_device);
+                query = queryVisibleGroupByTypeMySQL();
                 break;
             case 'MYSQL2':
-                query = queryVisibleGroupByIdDeviceSQLitez(id_device);
+                query = queryVisibleGroupByTypeSQLite(dev_type);
                 break;
         }
     }
@@ -11601,30 +11599,34 @@ function queryVisibleGroupByIdDevice(db_used,id_device) {
 }
 //End Get visible groups by id
 //Get hidden groups by id
-function queryHiddenGroupByIdDeviceSQLite(id_device) {
-    var query = "select pv.tipo, pv.group_name from properties_visible pv ";
-    query += "join devices d on d.type <> pv.tipo ";
-    query += "where d.id = " + id_device;
+function queryHiddenGroupByTypeSQLite(dev_type) {
+    var query = "select distinct group_name from properties_visible pv ";
+    query += "where pv.tipo != '" + dev_type + "' ";
+    query += "and group_name not in ";
+    query += "(select group_name from properties_visible ";
+    query += "where tipo = '" + dev_type + "')";    
     return query;
 }
-function queryHiddenGroupByIdDeviceMySQL(id_device) {
-    var query = "select pv.tipo, pv.group_name from properties_visible pv ";
-    query += "join devices d on d.type <> pv.tipo ";
-    query += "where d.id = :id_device";
+function queryHiddenGroupByTypeMySQL() {
+    var query = "select distinct group_name from properties_visible pv ";
+    query += "where pv.tipo != :dev_type ";
+    query += "and group_name not in ";
+    query += "(select group_name from properties_visible ";
+    query += "where tipo = :dev_type)";    
     return query;
 }
-function queryHiddenGroupByIdDevice(db_used,id_device) {
+function queryHiddenGroupByType(db_used,dev_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryHiddenGroupByIdDeviceSQLite(id_device);
+                query = queryHiddenGroupByTypeSQLite(dev_type);
                 break;
             case 'MYSQL':
-                query = queryHiddenGroupByIdDeviceMySQL(id_device);
+                query = queryHiddenGroupByTypeMySQL();
                 break;
             case 'MYSQL2':
-                query = queryHiddenGroupByIdDeviceSQLite(id_device);
+                query = queryHiddenGroupByTypeSQLite(dev_type);
                 break;
         }
     }
@@ -16422,8 +16424,8 @@ module.exports = {
     getConnectionByIdSet,
     getConnectionSetById,
     queryDetailsByIdDevice,
-    queryVisibleGroupByIdDevice,
-    queryHiddenGroupByIdDevice,
+    queryVisibleGroupByType,
+    queryHiddenGroupByType,
     //
     queryDocumentsIdDevice,
     insertDocumentoDevice,

package/package.json

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