alsmanager_lib 3.0.103 → 3.0.105

package/lib/modules.js

@@ -11450,41 +11450,79 @@ function getTipiPorta() {
     return query;
 }
 
-function insertMatchPortToDevice(id_device, id_network, id_port, date_start, date_end, note) {
-    var query = "insert into device_port (id_device, id_network, id_port, date_start, date_end, 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 + ", '" + date_start + "', '" + date_end + "', '" + note + "'";
+    query += id_device + ", " + id_network + ", " + id_port;
     query += ")";
     return query;     
 }
 
-function updateMatchPortToDevice(id_match, id_device, id_network, id_port, date_start, date_end, 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 += "'" + date_start + "', ";
-    query += "'" + date_end + "', ";
-    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 getPortByIdDevice(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 ";
+function getCurrentMatchByIdDeviceIdNetwork(id_device, 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_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;    
 }
 
+function getPorteComboByIdSiteDevice(id_device) {
+    var query = "select distinct sp.id, concat(sp.port_type, ' - ', sp.port_sign) as description from devices d ";
+    query += "join device_site ds on ds.id_device  = d.id ";
+    query += "join site_ports sp on sp.id_site = ds.id_site ";
+    query += "where d.id = " + id_device + " ";
+    query += "and date('now') >= ds.date_in and date('now') <= ds.date_out ";
+    query += "and sp.port_type = 'LAN' ";
+    query += "and sp.port_sign is not null "
+    query += "order by port_type, port_sign";
+    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
@@ -15072,8 +15110,13 @@ module.exports = {
     getSwitches,
     getTipiPorta,
     insertMatchPortToDevice,
-    updateMatchPortToDevice,deleteMatchPortToDevice,
-    getPortByIdDevice,
+    updateMatchPortToDevice,
+    deleteMatchPortToDevice,
+    getCurrentMatchByIdDeviceIdNetwork,
+    getPorteByIdDevice,
+    getPorteComboByIdSiteDevice,
+    getNetworksAndPortOnDevice,
+    getNetworksAndPortByConfig,
     //
     queryStatistic,
     queryStatisticInventary,

package/package.json

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