alsmanager_lib 3.0.104 → 3.0.106

package/lib/modules.js

@@ -11405,14 +11405,18 @@ function getPortById(id_port) {
 }
 
 function writePortPerSite(id_site, id_place, port_sign, port_type, port_switch, id_switch, local_switch_exists, port_note, is_connected, installed_date, last_replaced_date) {
+    var data_repl_str = convertDateToString(last_replaced_date);
+    var data_inst_str = convertDateToString(installed_date);
+
     var query = "insert into site_ports (id_site, id_place, port_sign, port_type, port_switch, local_switch_exists, note, is_connected, installed_date, last_replaced_date) values ";
     query += "(";
-    query += id_site + ", '" + id_place + "', '" + port_sign + "', '" + port_type + "', '" + port_switch + "', " + local_switch_exists + ", '" + port_note + "', " + is_connected + ", " + id_switch + ", '" + installed_date + "', '" + last_replaced_date + "'";
+    query += id_site + ", '" + id_place + "', '" + port_sign + "', '" + port_type + "', '" + port_switch + "', " + local_switch_exists + ", '" + port_note + "', " + is_connected + ", " + id_switch + ", '" + data_inst_str + "', '" + data_repl_str + "'";
     query += ")";
     return query;
 } 
 
 function updatePortPerSite(id_port, port_type, port_switch, id_switch, local_switch_exists, port_note, is_connected, last_replaced_date) {
+    var data_repl_str = convertDateToString(last_replaced_date);
     var query = "update site_ports set ";
     query += "port_sign = '" + port_sign + "', ";
     query += "port_type = '" + port_type + "', ";
@@ -11421,7 +11425,7 @@ function updatePortPerSite(id_port, port_type, port_switch, id_switch, local_swi
     query += "note = '" + port_note + "', ";
     query += "is_connected = " + is_connected + ", ";
     query += "id_switch = " + id_switch + ", ";
-    query += "last_replaced_date = '" + last_replaced_date + "' ";
+    query += "last_replaced_date = '" + data_repl_str + "' ";
     query += "where id = " + id_port;
     return query;
 } 
@@ -11450,41 +11454,40 @@ function getTipiPorta() {
     return query;
 }
 
-function insertMatchPortToDevice(id_device, id_network, id_port, note) {
-    var query = "insert into device_port (id_device, id_network, id_port, note) values ";
+function insertMatchPortToDevice(id_device, id_network, id_port) {
+    var query = "insert into device_lan_ports (id_device, id_card, id_port) values ";
     query += "(";
-    query += id_device + ", " + id_network + ", " + id_port + ", '" + note + "'";
+    query += id_device + ", " + id_network + ", " + id_port;
     query += ")";
     return query;     
 }
 
-function updateMatchPortToDevice(id_match, id_device, id_network, id_port, note) {
-    var query = "update device_port set ";
+function updateMatchPortToDevice(id_match, id_device, id_network, id_port) {
+    var query = "update device_lan_ports set ";
     query += "id_device = " + id_device + ", ";
-    query += "id_network = " + id_network + ", ";
+    query += "id_card = " + id_network + ", ";
     query += "id_port = " + id_port + ", ";
-    query += "'" + note + "' ";
     query += "where id = " + id_match;
     return query;
 }
 
 function deleteMatchPortToDevice(id_match) {
-    var query = "delete from device_port ";
+    var query = "delete from device_lan_ports ";
     query += "where id = " + id_match;
     return query;
 }
 
 function getCurrentMatchByIdDeviceIdNetwork(id_device, id_network) {
-    var query = "select id from device_port ";
-    query += "where id_device = " + id_device + " and id_network = " + id_network;
+    var query = "select id from device_lan_ports ";
+    query += "where id_device = " + id_device + " and id_card = " + id_network;
     return query;
 }
 
 function getPorteByIdDevice(id_device, id_network) {
-    var query = "select dp.id, sp.port_type as Tipo, sp.port_sign as Porta, sp.note as Note from device_port dp ";
+    var query = "select dp.id, sp.port_type as Tipo, sp.port_sign as Porta, sp.note as Note from device_lan_ports dp ";
     query += "join site_ports sp on sp.id = dp.id_port "
     query += "where dp.id_device = " + id_device + " ";
-    query += "and dp.id_network = " + id_network + " ";
+    query += "and dp.id_card = " + id_network + " ";
     query += "order by sp.port_type, sp.port_sign";
     return query;    
 }
@@ -11501,6 +11504,29 @@ function getPorteComboByIdSiteDevice(id_device) {
     return query;
 } 
 
+function getNetworksAndPortOnDevice(id_device) { 
+    var query = "";
+    query += "select dn.id, sp.port_sign as Porta, dn.net_type as Tipo, dn.ipv4_static as IP4, dn.ipv6_static as IP6, dn.mac_address as MAC from device_networks dn ";
+    query += "left join device_lan_ports dlp on dn.id = dlp.id_card ";
+    query += "left join site_ports sp on dlp.id_port = sp.id ";
+    query += "where dn.id_device = " + id_device;
+    return query;
+}
+
+function getNetworksAndPortByConfig(id_device, id_conf) {
+    var query = "select dn.id, sp.port_sign as Porta, 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 += "left join device_lan_ports dlp on dn.id = dlp.id_card ";
+    query += "left join site_ports sp on dlp.id_port = sp.id ";
+    query += "where dn.id_device = " + id_device + " ";
+    if (id_conf > 0) { 
+        query += "and dn.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+    }
+    else {
+        query += "and dn.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'NETWORK' order by id desc)"
+    }
+    return query;
+}
+
 //End Manage ports 
 
 // Manage updateDevicesSite
@@ -12532,6 +12558,15 @@ function queryStatisticsDeviceStatus(db_used) {
     return query;
 }
 
+function convertDateToString(date_to_conv) {
+    var date_str = "";
+    if (date_to_conv) {
+        var d = new Date(date_to_conv);
+        date_str = ("0" + d.getDate()).slice(-2) + '/' + ("0"+(d.getMonth()+1)).slice(-2) + '/' + d.getFullYear(); 
+    }
+    return date_str;
+}
+
 function tokenizer(marker, input, marker2) {
     var retValue = "";
     let wordRegex = new RegExp("\/*" + marker + "\/*.", "g");
@@ -15093,6 +15128,8 @@ module.exports = {
     getCurrentMatchByIdDeviceIdNetwork,
     getPorteByIdDevice,
     getPorteComboByIdSiteDevice,
+    getNetworksAndPortOnDevice,
+    getNetworksAndPortByConfig,
     //
     queryStatistic,
     queryStatisticInventary,

package/package.json

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