alsmanager_lib 1.0.85 → 1.0.87

package/lib/modules.js

@@ -413,14 +413,24 @@ function getStoragesByConfigSQLite(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 + " ";
-    query += "and ds.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    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 LIMIT 1)"
+    }
     return query;
 }
 function getStoragesByConfigMySQL(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 ";
-    query += "and ds.id in (select id_part from change_config where id_conf = :id_conf)";
+    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 LIMIT 1)"
+    }
     return query;
 }
 function getStoragesByConfig(db_used, id_device, id_conf) {
@@ -679,13 +689,23 @@ function getLastNetworkInserted(db_used, id_device) {
 function getNetworksByConfigSQLite(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 + " ";
-    query += "and dn.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    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 LIMIT 1)"
+    }
     return query;
 }
 function getNetworksByConfigMySQL(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 ";
-    query += "and dn.id in (select id_part from change_config where id_conf = :id_conf)";
+    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 LIMIT 1)"
+    }    
     return query;
 }
 function getNetworksByConfig(db_used, id_device, id_conf) {
@@ -971,14 +991,24 @@ function getAddOnsByConfigSQLite(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 + " ";
-    query += "and da.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    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 LIMIT 1)"
+    }
     return query;
 }
 function getAddOnsByConfigMySQL(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 ";
-    query += "and da.id in (select id_part from change_config where id_conf = :id_conf)";
+    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 LIMIT 1)"
+    }
     return query;
 }
 function getAddOnsByConfig(db_used, id_device, id_conf) {
@@ -1156,7 +1186,7 @@ function removeDeviceConfiguration(db_used, id_conf) {
     return query;    
 }
 //
-function insertPartChangedSQLite(id_conf, part_type, id_part, operation, id_part_replaced) {
+function insertPartChangedSQLite(id_conf, id_part, part_type, operation, id_part_replaced) {
     var query = "insert into change_config (id_conf, part_type, id_part, operation, id_part_replaced) values (";
     query += id_conf + ", ";
     query += "'" + part_type + "', ";
@@ -1167,17 +1197,24 @@ function insertPartChangedSQLite(id_conf, part_type, id_part, operation, id_part
     return query;
 }
 function insertPartChangedMySQL() {
-
+    var query = "insert into change_config (id_conf, part_type, id_part, operation, id_part_replaced) values (";
+    query += ":id_conf, ";
+    query += ":part_type, ";
+    query += ":id_part, ";
+    query += ":operation, ";
+    query += ":id_part_replaced";
+    query += ")";
+    return query;
 }
-function insertPartChanged(db_used, id_conf, part_type, id_part, operation, id_part_replaced) {
+function insertPartChanged(db_used, id_conf, id_part, part_type, operation, id_part_replaced) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = insertPartChangedSQLite(id_conf, part_type, id_part, operation, id_part_replaced);
+                query = insertPartChangedSQLite(id_conf, id_part, part_type, operation, id_part_replaced);
                 break;
             case 'MYSQL':
-                query = insertPartChangedMySQL(id_conf, part_type, id_part, operation, id_part_replaced);
+                query = insertPartChangedMySQL(id_conf, id_part, part_type, operation, id_part_replaced);
                 break;
         }
     }
@@ -1215,27 +1252,31 @@ function updatePartChanged(db_used, id_change, operation, id_part_replaced) {
     return query;    
 }    
 
-function removePartChangedSQLite(id_change, id_conf) {
+function removePartChangedSQLite(id_conf, id_part, part_type) {
     var query = "delete from change_config  ";
-    query += "where id = " + id_change + " and id_conf = " + id_conf;
+    query += "where id_device = " + id_part + " ";
+    query += "and id_conf = " + id_conf + " ";
+    query += "and part_type = '" + part_type + "'";
     return query;
 }
 
-function removePartChangedMySQL(id_change, id_conf) {
+function removePartChangedMySQL(id_conf, id_part) {
     var query = "delete from change_config  ";
-    query += "where id = :id_change  and id_conf = :id_conf";
+    query += "where id_device = :id_part ";
+    query += "and id_conf = :id_conf ";
+    query += "and part_type = :part_type";
     return query;
 }
 
-function removePartChanged(db_used, id_change, id_conf) {
+function removePartChanged(db_used, id_conf, id_part, part_type) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = removePartChangedSQLite(id_change, id_conf);
+                query = removePartChangedSQLite(id_conf, id_part, part_type);
                 break;
             case 'MYSQL':
-                query = removePartChangedMySQL(id_change, id_conf);
+                query = removePartChangedMySQL(id_conf, id_part, part_type);
                 break;
         }
     }

package/package.json

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