alsmanager_lib 3.0.110 → 3.0.111

package/lib/modules.js

@@ -2318,7 +2318,7 @@ function existsSwitchPatchProperties(db_used, id_device) {
 }
 function getSwitchPatchPropertiesSQLite(id_device) {
     var query = "select d.id as Id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello,";
-    query += "ds.num_ports as NumeroPorte, ds.num_poe as NumPOE  ";
+    query += "ds.num_ports as NumeroPorte, ds.num_poe as NumPOE, ds.rete_appartenenza  ";
     query += "from devices d ";
     query += "left join device_switch ds on d.id = ds.id_device ";
     query += "where d.id = " + id_device;
@@ -2326,7 +2326,7 @@ function getSwitchPatchPropertiesSQLite(id_device) {
 }
 function getSwitchPatchPropertiesMySQL(id_device) {
     var query = "select d.id as Id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello,";
-    query += "ds.num_ports as NumeroPorte, ds.num_poe as NumPOE  ";
+    query += "ds.num_ports as NumeroPorte, ds.num_poe as NumPOE, ds.rete_appartenenza  ";
     query += "from devices d ";
     query += "left join device_switch ds on d.id = ds.id_device ";
     query += "where d.id = :id_device";
@@ -2353,16 +2353,18 @@ function createSwitchPatchPropertiesMySQLObj(id_device, dev_prop) {
     var obj = {};
     obj.id_device = id_device;
     obj.num_ports = dev_prop.num_ports;
+    obj.num_poe = dev_prop.num_poe;
+    obj.rete_appartenenza = dev_prop.rete_appartenenza;
     return obj; 
 }
 function insertSwitchPatchPropertiesSQLite(id_device, dev_prop) {
-    var query = "insert into device_switch (id_device, num_ports, num_poe, tipo) values ";
-    query += "(" + id_device + ", " + dev_prop.num_ports + ", " + dev_prop.num_poe + ", '" + dev_prop.tipo + "')";
+    var query = "insert into device_switch (id_device, num_ports, num_poe, tipo, rete_appartenenza) values ";
+    query += "(" + id_device + ", " + dev_prop.num_ports + ", " + dev_prop.num_poe + ", '" + dev_prop.tipo + ", '" + dev_prop.rete_appartenenza + "')";
     return query; 
 }
 function insertSwitchPatchPropertiesMySQL() {
-    var query = "insert into device_switch (id_device, num_ports, num_poe, tipo) values ";
-    query += "(:id_device, :num_ports, :num_poe, :tipo)";
+    var query = "insert into device_switch (id_device, num_ports, num_poe, tipo, rete_appartenenza) values ";
+    query += "(:id_device, :num_ports, :num_poe, :tipo, :rete_appartenenza)";
 }
 function insertSwitchPatchProperties(db_used, id_device, dev_prop) {
     var query = "";
@@ -2386,7 +2388,8 @@ function updateSwitchPatchPropertiesSQLite(id_device, dev_prop) {
     var query = "update device_switch set ";
     query += "id_device = " + id_device + ", ";
     query += "num_ports = " + dev_prop.num_ports + ", ";
-    query += "num_poe = " + dev_prop.num_poe + " ";
+    query += "num_poe = " + dev_prop.num_poe + ", ";
+    query += "rete_appartenenza = '" + dev_prop.rete_appartenenza + " ";
     query += "where id_device = " + id_device;
     return query; 
 }
@@ -2395,7 +2398,8 @@ function updateSwitchPatchPropertiesMySQL() {
     var query = "update device_switch set ";
     query += "id_device = :id_device, ";
     query += "num_ports = :num_ports, ";
-    query += "num_poe = :num_poe ";
+    query += "num_poe = :num_poe, ";
+    query += "rete_appartenenza = :rete_appartenenza ";
     query += "where id_device = :id_device";
     return query; 
 }
@@ -12510,7 +12514,31 @@ function removeBenchmarkById(db_used, id_device) {
 }
 
 //End benchmarking
+// Manage Armadio
+function getArmadioStructure(id_place, date_ref) {
+    var query = "select d.id, d.type, d.manifacturer, d.model, ds.num_ports from armadio_structure ast ";
+    query += "join devices d on d.id = ast.id_device ";
+    query += "left join device_switch ds on ast.id_device = ds.id_device ";
+    query += "join device_site dt on dt.id_device = ast.id_device ";
+    query += "where dt.id_place = '" + id_place + "' ";
+    if (date_ref) {
+        var dt_ref = convertDateToStringDB(date_ref);
+        query += "and '" + dt_ref + "' >= dt.date_in and '" + dt_ref + "' <= dt.date_out ";
+    }
+    else {
+        query += "and date('now') >= dt.date_in and date('now') <= dt.date_out ";
+    }
+    query += "order by ast.level ";
+    return query;
+}
 
+function getConnectedDevices(id_device) {
+    var query = "";
+    query += "";
+    return query;
+}
+
+// End Manage Armadio
 //Get Devices Statistics bt Status
 function queryStatisticsDeviceStatusSQLite() {
     var query = "select case when ds.status is null then 0 else ds.status end as Stato, sd.name as Descrizione, count(*) as Numero from devices d ";
@@ -15140,6 +15168,9 @@ module.exports = {
     getNetworksAndPortOnDevice,
     getNetworksAndPortByConfig,
     //
+    getArmadioStructure,
+    getConnectedDevices,
+    //
     queryStatistic,
     queryStatisticInventary,
     queryStatisticsDeviceStatus,

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "3.0.110",
+  "version": "3.0.111",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",