alsmanager_lib 1.0.75 → 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;
         }
     }
@@ -707,12 +705,14 @@ function getAddonsByConfig(db_used, id_device, id_conf) {
 // Device configurations
 function getDeviceConfigurationsSQLite(id_device) {
     var query = "select id, date_conf, note from device_changes ";
-    query += "where id_device = " + id_device;
+    query += "where id_device = " + id_device + " ";
+    query += "order by date_conf desc"
     return query;
 }
 function getDeviceConfigurationsMySQL(id_device) {
     var query = "select id, date_conf, note from device_changes ";
-    query += "where id_device = :id_device";
+    query += "where id_device = :id_device ";
+    query += "order by date_conf desc"
     return query;
 }
 function getDeviceConfigurations(db_used, id_device) {
@@ -730,6 +730,33 @@ function getDeviceConfigurations(db_used, id_device) {
     return query;    
 }
 
+function getLastDeviceConfigurationSQLite(id_device) {
+    var query = "select id, date_conf, note from device_changes ";
+    query += "where id_device = " + id_device + " ";
+    query += "order by date_conf desc LIMIT 1";
+    return query;
+}
+function getLastDeviceConfigurationMySQL(id_device) {
+    var query = "select id, date_conf, note from device_changes ";
+    query += "where id_device = :id_device ";
+    query += "order by date_conf desc LIMIT 1";
+    return query;
+}
+function getLastDeviceConfiguration(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getLastDeviceConfigurationSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = getLastDeviceConfigurationMySQL(id_device);
+                break;
+        }
+    }
+    return query;    
+}
+
 
 function getDeviceConfigurationByIdSQLite(id_conf) {
     var query = "select id, id_device, date_conf, note from device_changes ";
@@ -738,7 +765,7 @@ function getDeviceConfigurationByIdSQLite(id_conf) {
 }
 function getDeviceConfigurationByIdMySQL(id_conf) {
     var query = "select id, id_device, date_conf, note from device_changes ";
-    query += "where id = " + id_conf;
+    query += "where id = :id_conf";
     return query;
 }
 function getDeviceConfigurationById(db_used, id_conf) {
@@ -756,63 +783,79 @@ function getDeviceConfigurationById(db_used, id_conf) {
     return query;    
 }
 
-function insertDeviceConfigurationSQLite(id_device, date_ref, note) {
-
+function insertDeviceConfigurationSQLite(id_device, data, note) {
+    var query = "insert into device_changes (id_device, date_conf, note) values (";
+    query += id_device + ", '" + data + "', '" + note + "')";
+    return query;
 }
-function insertDeviceConfigurationMySQL(id_device, date_ref, note) {
-    
+function insertDeviceConfigurationMySQL(id_device, data, note) {
+    var query = "insert into device_changes (id_device, date_conf, note) values (";
+    query += ":id_device, :data, :note)";
+    return query;    
 }
-function insertDeviceConfiguration(db_used, id_device, date_ref) {
+function insertDeviceConfiguration(db_used, id_device, data, note) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = insertDeviceConfigurationSQLite(id_device, date_ref);
+                query = insertDeviceConfigurationSQLite(id_device, data, note);
                 break;
             case 'MYSQL':
-                query = insertDeviceConfigurationMySQL(id_device, date_ref);
+                query = insertDeviceConfigurationMySQL(id_device, data, note);
                 break;
         }
     }
     return query;    
 }
 
-function updateDeviceConfigurationSQLite(id_device, date_ref, note) {
-
+function updateDeviceConfigurationSQLite(id_conf, data, note) {
+    var query = "update device_changes set ";
+    query += "date_conf = '" + data +"',";
+    query += "note = '" + note + "' ";
+    query += "where id = " + id_conf;
+    return query;
 }
-function updateDeviceConfigurationMySQL(id_device, date_ref, note) {
-    
+function updateDeviceConfigurationMySQL(id_conf, data, note) {
+    var query = "update device_changes set ";
+    query += "date_conf = :data,";
+    query += "note = :note ";
+    query += "where id = :id_conf";
+    return query;    
 }
-function updateDeviceConfiguration(db_used, id_conf, id_device, date_ref) {
+function updateDeviceConfiguration(db_used, id_conf, data, note) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = updateDeviceConfigurationSQLite(id_conf, id_device, date_ref);
+                query = updateDeviceConfigurationSQLite(id_conf, data, note);
                 break;
             case 'MYSQL':
-                query = updateDeviceConfigurationMySQL(id_conf, id_device, date_ref);
+                query = updateDeviceConfigurationMySQL(id_conf, data, note);
                 break;
         }
     }
     return query;    
 }
 
-function removeDeviceConfigurationSQLite(id_conf, id_device, date_ref) {
-
+function removeDeviceConfigurationSQLite(id_conf) {
+    var query = "delete from device_changes ";
+    query += "where id = " + id_conf;
+    return query;
 }
-function removeDeviceConfigurationMySQL(id_conf, id_device, date_ref) {
-    
+function removeDeviceConfigurationMySQL(id_conf) {
+    var query = "delete from device_changes ";
+    query += "where id = :id_conf";
+    return query;    
 }
-function removeDeviceConfiguration(db_used, id_conf, id_device, date_ref) {
+function removeDeviceConfiguration(db_used, id_conf) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = removeDeviceConfigurationSQLite(id_conf, id_device, date_ref);
+                query = removeDeviceConfigurationSQLite(id_conf);
                 break;
             case 'MYSQL':
-                query = removeDeviceConfigurationMySQL(id_conf, id_device, date_ref);
+                query = removeDeviceConfigurationMySQL(id_conf);
                 break;
         }
     }
@@ -8217,9 +8260,10 @@ module.exports = {
     insertAddOn,
     updateAddOn,
     removeAddOn,
-    getAddonsByConfig,
+    getAddOnsByConfig,
     //
     getDeviceConfigurations,
+    getLastDeviceConfiguration,
     getDeviceConfigurationById,
     insertDeviceConfiguration,
     updateDeviceConfiguration,

package/package.json

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