alsmanager_lib 1.0.52 → 1.0.53

package/lib/modules.js

@@ -56,6 +56,16 @@ function getConnectorById(db_used, id_conn) {
     return query;
 }
 
+function createConnectorObjMySQL(id_device, conn_obj) {
+    var obj = {};
+    obj.id_device = id_device;
+    obj.id = conn_obj.id;
+    obj.tipo = conn_obj.tipo;
+    obj.protocollo = conn_obj.protocollo;
+    obj.numero = conn_obj.numero;
+    obj.verso = conn_obj.verso;
+    return obj;
+}
 
 function insertConnectorSQLite(id_device, conn_obj) {
     //dc.id, ct.conn_type as Tipo, cp.name as Protocollo, dc.conn_number as Numero, dc.conn_verse as Verso from device_connectors
@@ -200,15 +210,31 @@ function getStorageById(db_used, id_storage) {
     return query;
 }
 
+function createStorageObjMySQL(id_device, storage_obj) {
+    var obj = {};
+    obj.id_device = id_device;
+    obj.id = storage_obj.id;
+    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;
+    obj.is_replaced = storage_obj.is_replaced;
+    obj.date_replaced = storage_obj.date_replaced;
+    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) 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_available, storage_manifacturer, storage_model, is_replaced, date_replaced) values ";
+    query += "(" + id_device + ", " + storage_obj.tipo + ", '" + storage_obj.unita + "'," + storage_obj.dimensione + ", " + storage_obj.dim_disponibile + ", ";
+    query += "'" + storage_obj.marca + "', '" + storage_obj.modello + "', " + storage_obj.is_replaced + ", '" + storage_obj.date_replaced + "')";
     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) values ";
-    query += "(:id_device, :tipo, :unita, :dimensione, :dim_disponibile)";
+    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model, is_replaced, date_replaced) values ";
+    query += "(:id_device, :tipo, :unita, :dimensione, :dim_disponibile, :marca, :modello, :is_replaced, :date_replaced)";
     return query;
 }
 
@@ -233,7 +259,11 @@ 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_available  =  " + storage_obj.dim_disponibile + ", ";
+    query += "storage_manifacturer = '" + storage_obj.marca + "', ";
+    query += "storage_model  = '" + storage_obj.modello + "', ";
+    query += "is_replaced = " + storage_obj.is_replaced + ", ";
+    query += "date_replaced  =  '" + storage_obj.date_replaced + "' ";
     query += "where id = " + storage_obj.id;
     return query;
 }
@@ -245,6 +275,10 @@ function updateStorageMySQL(id_device, storage_obj) {
     query += "storage_size_unit = :unita, ";
     query += "storage_totsize = :dimensione, ";
     query += "storage_available = :dim_disponibile ";
+    query += "storage_manifacturer = :marca, ";
+    query += "storage_model  = :modello, ";
+    query += "is_replaced = :is_replaced, ";
+    query += "date_replaced  = :date_replaced ";
     query += "where id = id_storage";
     return query;
 }
@@ -340,6 +374,18 @@ function getNetworkById(db_used, id_network) {
     }
     return query;
 }
+
+function createNetworkObjMySQL(id_device, network_obj) {
+    var obj = {};
+    obj.id_device = id_device;
+    obj.id = network_obj.id;
+    obj.tipo = network_obj.tipo;
+    obj.mac_address = network_obj.mac_address;
+    obj.ipv4_static = network_obj.ipv4_static;
+    obj.ipv6_static = network_obj.ipv6_static;
+    return obj;
+}
+
 function insertNetworkSQLite(id_device, network_obj) {
     var query = "insert into device_networks (id_device, net_type, mac_address, ipv4_static, ipv6_static) values ";
     query += "(" + id_device + ", '" + network_obj.tipo + "', '" + network_obj.mac_address + "', '" + network_obj.ipv4_static + "', '" + network_obj.ipv6_static + "')";
@@ -460,7 +506,7 @@ function getAddOnByIdMySQL() {
     query += "where id = :id_addon";
     return query;
 }
-function getAddOnById(id_addon) {
+function getAddOnById(db_used, id_addon) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -474,6 +520,19 @@ function getAddOnById(id_addon) {
     }
     return query;
 }
+
+function createAddOnObjMySQL(id_device, addon_obj) {
+    var obj = {};
+    obj.id_device = id_device;
+    obj.id = addon_obj.id;
+    obj.addon_type = addon_obj.addon_type;
+    obj.maker = addon_obj.maker;
+    obj.model = addon_obj.model;
+    obj.description = addon_obj.description;
+    return obj;
+}
+
+
 function insertAddOnSQLite(id_device, addon_obj) {
     var query = "insert into device_addons (id_device, addon_type, maker, model, description) values ";
     query += "(" + id_device + ", " + addon_obj.addon_type + ", '" + addon_obj.maker + "', '" + addon_obj.model + "', '" + addon_obj.description + "')";
@@ -612,7 +671,7 @@ function getPCProperties(db_used, id_device) {
                 query = getPCPropertiesSQLite(id_device);
                 break;
             case 'MYSQL':
-                query = getPCPropertiesSQLite(id_device);
+                query = getPCPropertiesMySQL(id_device);
                 break;
         }
     }
@@ -1280,10 +1339,10 @@ function getDevicesCounterByPlace(db_used, id_place) {
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = alsmgr.getDevicesCounterByPlaceSQLite(id_place);
+                query = getDevicesCounterByPlaceSQLite(id_place);
                 break;
             case 'MYSQL':
-                query = alsmgr.getDevicesCounterByPlaceMySQL(id_place);
+                query = getDevicesCounterByPlaceMySQL(id_place);
                 break;
         }
     }
@@ -7400,23 +7459,30 @@ module.exports = {
     insertDisplayProperties,
     updateDisplayProperties,
     getDisplayPartProperties,
+    existsDisplayPartProperties,
+    insertDisplayPartProperties,
+    updateDisplayPartProperties,
     getConnectorsByIdDevice,
     getConnectorById,
+    createConnectorObjMySQL,
     insertConnector,
     updateConnector,
     removeConnector,
     getStorageByIdDevice,
     getStorageById,
+    createStorageObjMySQL,
     insertStorage,
     updateStorage,
     removeStorage,
     getNetworkByIdDevice,
     getNetworkById,
+    createNetworkObjMySQL,
     insertNetwork,
     updateNetwork,
     removeNetwork,
     getAddOnByIdDevice,
     getAddOnById,
+    createAddOnObjMySQL,
     insertAddOn,
     updateAddOn,
     removeAddOn,

package/package.json

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