alsmanager_lib 1.0.76 → 1.0.77

package/lib/modules.js

@@ -333,8 +333,8 @@ function getStoragesByConfigSQLite(id_device, id_conf) {
 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_available as Disponibile, 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 + ")";
+    query += "where id_device = :id_device ";
+    query += "and ds.id in (select id_part from change_config where id_conf = :id_conf)";
     return query;
 }
 function getStoragesByConfig(db_used, id_device, id_conf) {
@@ -501,17 +501,15 @@ function removeNetwork(db_used, id_device, network_obj) {
 }
 //
 function getNetworksByConfigSQLite(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_available as Disponibile, 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 + ")";
+    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 + ")";
     return query;
 }
 function getNetworksByConfigMySQL(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_available as Disponibile, 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 + ")";
+    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)";
     return query;
 }
 function getNetworksByConfig(db_used, id_device, id_conf) {
@@ -675,29 +673,29 @@ function removeAddOn(db_used, id_device, addon_obj) {
     return query;
 }
 //
-function getAddonsByConfigSQLite(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_available as Disponibile, 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 + ")";
+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 + ")";
     return query;
 }
-function getAddonsByConfigMySQL(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_available as Disponibile, 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 + ")";
+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)";
     return query;
 }
-function getAddonsByConfig(db_used, id_device, id_conf) {
+function getAddOnsByConfig(db_used, id_device, id_conf) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getAddonsByConfigSQLite(id_device, id_conf);
+                query = getAddOnsByConfigSQLite(id_device, id_conf);
                 break;
             case 'MYSQL':
-                query = getAddonsByConfigMySQL(id_device, id_conf);
+                query = getAddOnsByConfigMySQL(id_device, id_conf);
                 break;
         }
     }
@@ -8262,7 +8260,7 @@ module.exports = {
     insertAddOn,
     updateAddOn,
     removeAddOn,
-    getAddonsByConfig,
+    getAddOnsByConfig,
     //
     getDeviceConfigurations,
     getLastDeviceConfiguration,

package/package.json

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