alsmanager_lib 1.0.82 → 1.0.84

package/lib/modules.js

@@ -156,14 +156,14 @@ function removeConnector(db_used, id_device, conn_obj) {
 //End Manage connectors
 // Manage Storage
 function getStorageByIdDeviceSQLite(id_device) {
-    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 ";
+    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;
     return query;
 }
 
 function getStorageByIdDeviceMySQL(id_device) {
-    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 ";
+    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";
     return query;
@@ -252,13 +252,13 @@ function getStorageByIdPartAndIdConf(db_used, id_storage, id_conf) {
 
 
 function getStorageByIdSQLite(id_storage) {
-    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model from device_storages ";
+    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model from device_storages ";
     query += "where id = " + id_storage;
     return query;
 }
 
 function getStorageByIdMySQL() {
-    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model from device_storages ";
+    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model from device_storages ";
     query += "where id = :id_storage";
     return query;
 }
@@ -285,22 +285,21 @@ function createStorageObjMySQL(id_device, storage_obj) {
     obj.tipo = storage_obj.tipo;
     obj.unita = storage_obj.unita;
     obj.dimensione = storage_obj.dimensione;
-    obj.dim_disponibile = storage_obj.dim_disponibile;
     obj.marca = storage_obj.marca;
     obj.modello = storage_obj.modello;
     return obj;
 }
 
 function insertStorageSQLite(id_device, storage_obj) {
-    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model) values ";
-    query += "(" + id_device + ", " + storage_obj.tipo + ", '" + storage_obj.unita + "'," + storage_obj.dimensione + ", " + storage_obj.dim_disponibile + ", ";
+    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model) values ";
+    query += "(" + id_device + ", " + storage_obj.tipo + ", '" + storage_obj.unita + "'," + storage_obj.dimensione + ", ";
     query += "'" + storage_obj.marca + "', '" + storage_obj.modello + "')";
     return query;
 }
 
 function insertStorageMySQL(id_device, storage_obj) {
-    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model) values ";
-    query += "(:id_device, :tipo, :unita, :dimensione, :dim_disponibile, :marca, :modello)";
+    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model) values ";
+    query += "(:id_device, :tipo, :unita, :dimensione, :marca, :modello)";
     return query;
 }
 
@@ -325,7 +324,6 @@ function updateStorageSQLite(id_device, storage_obj) {
     query += "storage_type = " + storage_obj.tipo + ", ";
     query += "storage_size_unit  = '" + storage_obj.unita + "', ";
     query += "storage_totsize = " + storage_obj.dimensione + ", ";
-    query += "storage_available  =  " + storage_obj.dim_disponibile + ", ";
     query += "storage_manifacturer = '" + storage_obj.marca + "', ";
     query += "storage_model  = '" + storage_obj.modello + "' ";
     query += "where id = " + storage_obj.id;
@@ -338,7 +336,6 @@ function updateStorageMySQL(id_device, storage_obj) {
     query += "storage_type = :tipo, ";
     query += "storage_size_unit = :unita, ";
     query += "storage_totsize = :dimensione, ";
-    query += "storage_available = :dim_disponibile ";
     query += "storage_manifacturer = :marca, ";
     query += "storage_model  = :modello ";
     query += "where id = id_storage";
@@ -367,7 +364,7 @@ function removeStorageSQLite(id_device, storage_obj) {
 
 function removeStorageMySQL(id_device, storage_obj) {
     var query = "delete from device_storages ";
-    query += "where id = id_storage";
+    query += "where id = :id_storage";
     return query;
 }
 function removeStorage(db_used, id_device, storage_obj) {
@@ -386,14 +383,14 @@ function removeStorage(db_used, id_device, storage_obj) {
 }
 //
 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_available as Disponibile, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    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 + ")";
     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_available as Disponibile, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    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)";
@@ -1164,6 +1161,36 @@ function removePartChanged(db_used, id_change, id_conf) {
     return query;    
 }
 
+function getLastPartInsertedSQLite(id_device, id_conf, part_type) {
+    var query = "select id, id_conf, part_type, id_part, operation, id_part_replaced from change_config ";
+    query += "where id_device = " + id_device + " ";
+    query += "and id_conf = " + id_conf + " ";
+    query += "and part_type = '" + part_type + "' ";
+    query += "order by id desc LIMIT 1";
+    return query;
+}
+function getLastPartInsertedMySQL(id_device, id_conf, part_type) {
+    var query = "select id, id_conf, part_type, id_part, operation, id_part_replaced from change_config ";
+    query += "where id_device = :id_device ";
+    query += "and id_conf = :id_conf ";
+    query += "and part_type = :part_type ";
+    query += "order by id desc LIMIT 1";
+    return query;
+}
+function getLastPartInserted(db_used, id_device, id_conf, part_type) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getLastPartInsertedSQLite(id_device, id_conf, part_type);
+                break;
+            case 'MYSQL':
+                query = getLastPartInsertedMySQL(id_device, id_conf, part_type);
+                break;
+        }
+    }
+    return query;    
+}
 //End Device configurations
 // Disk usage
 function getDiskUsagesByIdStorageSQLite(id_storage) {
@@ -8719,6 +8746,7 @@ module.exports = {
     insertPartChanged,
     updatePartChanged,    
     removePartChanged,
+    getLastPartInserted,
     //
     selectBeneDaInventario,
     getDevicesSelectForInventarioRaw,

package/package.json

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