alsmanager_lib 2.0.67 → 2.0.69

package/lib/modules.js

@@ -507,7 +507,7 @@ function getStoragesByConfigSQLite(id_device, id_conf) {
         query += "and ds.id in (select id_part from change_config where id_conf = " + id_conf + ")";
     }
     else {
-        query += "and ds.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'STORAGE' order by id desc LIMIT 1)"
+        query += "and ds.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'STORAGE' order by id desc)"
     }
     return query;
 }
@@ -519,7 +519,19 @@ function getStoragesByConfigMySQL(id_device, id_conf) {
         query += "and ds.id in (select id_part from change_config where id_conf = :id_conf)";
     }
     else {
-        query += "and ds.id in (select id_part from change_config where id_device = :id_device and part_type = 'STORAGE' order by id desc LIMIT 1)"
+        query += "and ds.id in (select id_part from change_config where id_device = :id_device and part_type = 'STORAGE' order by id desc)"
+    }
+    return query;
+}
+function getStoragesByConfigMySQL2(id_device, id_conf) {
+    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    query += "join storage_types st on st.id = ds.storage_type ";
+    query += "where id_device = " + id_device + " ";
+    if (id_conf > 0) { 
+        query += "and ds.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    }
+    else {
+        query += "and ds.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'STORAGE' order by id desc)"
     }
     return query;
 }
@@ -534,7 +546,7 @@ function getStoragesByConfig(db_used, id_device, id_conf) {
                 query = getStoragesByConfigMySQL(id_device, id_conf);
                 break;
             case 'MYSQL2':
-                query = getStoragesByConfigSQLite(id_device, id_conf);
+                query = getStoragesByConfigMySQL2(id_device, id_conf);
                 break;
         }
     }
@@ -810,7 +822,7 @@ function getNetworksByConfigSQLite(id_device, id_conf) {
         query += "and dn.id in (select id_part from change_config where id_conf = " + id_conf + ")";
     }
     else {
-        query += "and dn.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'NETWORK' order by id desc LIMIT 1)"
+        query += "and dn.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'NETWORK' order by id desc)"
     }
     return query;
 }
@@ -821,10 +833,21 @@ function getNetworksByConfigMySQL(id_device, id_conf) {
         query += "and dn.id in (select id_part from change_config where id_conf = :id_conf)";
     }
     else {
-        query += "and dn.id in (select id_part from change_config where id_device = :id_device and part_type = 'NETWORK' order by id desc LIMIT 1)"
+        query += "and dn.id in (select id_part from change_config where id_device = :id_device and part_type = 'NETWORK' order by id desc)"
     }    
     return query;
 }
+function getNetworksByConfigMySQL2(id_device, id_conf) {
+    var query = "select dn.id, dn.net_type as Tipo, dn.mac_address as MAC, dn.ipv4_static as IP4, dn.ipv6_static as IP6 from device_networks dn ";
+    query += "where dn.id_device = " + id_device + " ";
+    if (id_conf > 0) { 
+        query += "and dn.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    }
+    else {
+        query += "and dn.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'NETWORK' order by id desc)"
+    }
+    return query;
+}
 function getNetworksByConfig(db_used, id_device, id_conf) {
     var query = "";
     if (db_used) {
@@ -836,7 +859,7 @@ function getNetworksByConfig(db_used, id_device, id_conf) {
                 query = getNetworksByConfigMySQL(id_device, id_conf);
                 break;
             case 'MYSQL2':
-                query = getNetworksByConfigSQLite(id_device, id_conf);
+                query = getNetworksByConfigMySQL2(id_device, id_conf);
                 break;
         }
     }
@@ -1142,7 +1165,7 @@ function getAddOnsByConfigSQLite(id_device, id_conf) {
         query += "and da.id in (select id_part from change_config where id_conf = " + id_conf + ")";
     }
     else {
-        query += "and da.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'ADDON' order by id desc LIMIT 1)"
+        query += "and da.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'ADDON' order by id desc)"
     }
     return query;
 }
@@ -1154,7 +1177,19 @@ function getAddOnsByConfigMySQL(id_device, id_conf) {
         query += "and da.id in (select id_part from change_config where id_conf = :id_conf)";
     }
     else {
-        query += "and da.id in (select id_part from change_config where id_device = :id_device and part_type = 'ADDON' order by id desc LIMIT 1)"
+        query += "and da.id in (select id_part from change_config where id_device = :id_device and part_type = 'ADDON' order by id desc)"
+    }
+    return query;
+}
+function getAddOnsByConfigMySQL2(id_device, id_conf) {
+    var query = "select da.id, a.name as Tipo, da.maker as Marca, da.model as Modello, da.description as Descrizione from device_addons da ";
+    query += "join addon_types a on a.id = da.addon_type ";
+    query += "where da.id_device = " + id_device + " ";
+    if (id_conf > 0) { 
+        query += "and da.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    }
+    else {
+        query += "and da.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'ADDON' order by id desc)"
     }
     return query;
 }
@@ -1169,7 +1204,7 @@ function getAddOnsByConfig(db_used, id_device, id_conf) {
                 query = getAddOnsByConfigMySQL(id_device, id_conf);
                 break;
             case 'MYSQL2':
-                query = getAddOnsByConfigSQLite(id_device, id_conf);
+                query = getAddOnsByConfigMySQL2(id_device, id_conf);
                 break;
         }
     }
@@ -1584,12 +1619,14 @@ function existPartInConfig(db_used, id_device, id_conf, id_part, part_type) {
 // Disk usage
 function getDiskUsagesByIdStorageSQLite(id_storage) {
     var query = "select id, date_ref, id_device, id_storage, size_unit, available_space from disk_usage ";
-    query += "where id_storage = " + id_storage;
+    query += "where id_storage = " + id_storage + " ";
+    query += "order by id desc";
     return query
 } 
 function getDiskUsagesByIdStorageMySQL(id_storage) {
     var query = "select id, date_ref, id_device, id_storage, size_unit, available_space from disk_usage ";
-    query += "where id_storage = :id_storage";
+    query += "where id_storage = :id_storage ";
+    query += "order by id desc";
     return query    
 } 
 function getDiskUsagesByIdStorage(db_used, id_storage) {
@@ -6128,7 +6165,7 @@ function queryConsegne(db_used,data_da, data_a, data_filter) {
                 query = queryConsegneMySQL(data_da, data_a, data_filter);
                 break;
             case 'MYSQL2':
-                query = queryConsegneMySQL2(data_da, data_a, data_filter);
+                query = queryConsegneSQLite(data_da, data_a, data_filter);
                 break;
         }
     }

package/package.json

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