alsmanager_lib 3.0.110 → 3.0.112

package/lib/modules.js

@@ -1224,8 +1224,8 @@ function getVoIPDevices() {
 
 // End manage Voip
 // Software management
-function getSoftwares(db_used, maker, model, platform, licence_type) {
-    var query = "select id, maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_licence ";
+function getSoftwares(db_used, maker, model, platform, license_type) {
+    var query = "select id, maker, model, support, platform, release_year, version, build_no, license_type, license_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_license, no_inventario ";
     query += "from softwares ";
     query += "where (is_removed is null or is_removed = 0) ";
     if (maker) {
@@ -1237,27 +1237,27 @@ function getSoftwares(db_used, maker, model, platform, licence_type) {
     if (platform) {
         query += "and platform = '" + platform + "' ";
     }
-    if (licence_type) {
-        query += "and licence_type = '" + licence_type + "' ";
+    if (license_type) {
+        query += "and license_type = '" + license_type + "' ";
     }
     return query;
 }
 function getSoftwareByCodice(db_used, codice) {
-    var query = "select id, maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_licence ";
+    var query = "select id, maker, model, support, platform, release_year, version, build_no, license_type, license_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_license, no_inventario ";
     query += "from softwares ";
     query += "where (is_removed is null or is_removed = 0) ";
     query += "and inv_ict3_number = '" + codice + "' or serial_no = '" + codice + "'";
     return query;
 }
 function getSoftwareById(db_used, id_sw) {
-    var query = "select id, maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_licence ";
+    var query = "select id, maker, model, support, platform, release_year, version, build_no, license_type, license_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_license, no_inventario ";
     query += "from softwares ";
     query += "where (is_removed is null or is_removed = 0) ";
     query += "and id = " + id_sw;
     return query;
 }
 function getSoftwareForConsegnaById(db_used, id_sw) {
-    var query = "select id, maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_licence, ";
+    var query = "select s.id, s.maker, s.model, s.support, s.platform, s.release_year, s.version, s.build_no, s.license_type, s.license_key, s.expired_date, s.is_pnrr, s.inv_ict3_number, s.serial_no, s.architettura, s.life_license, s.no_inventario, ";
     query += "case ";
     query += "when s.no_inventario is not null and s.no_inventario > 0 then concat(s.id,'(ID)') ";
     query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then s.inv_ict3_number ";
@@ -1269,7 +1269,7 @@ function getSoftwareForConsegnaById(db_used, id_sw) {
     return query;
 }
 function insertSoftware(db_used, software) {
-    var query = "insert into softwares (maker, model, support, platform, release_year, version, build_no, licence_type, licence_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura) values (";
+    var query = "insert into softwares (maker, model, support, platform, release_year, version, build_no, license_type, license_key, expired_date, is_pnrr, inv_ict3_number, serial_no, architettura, life_license, no_inventario) values (";
     query += "'" + software.marca + "', ";
     query += "'" + software.modello + "', ";
     query += "'" + software.supporto + "', ";
@@ -1277,14 +1277,15 @@ function insertSoftware(db_used, software) {
     query += "'" + software.release_year + "', ";
     query += "'" + software.version + "', ";
     query += "'" + software.build_no + "', ";
-    query += "'" + software.licence_type + "', ";
-    query += "'" + software.licence_key + "', ";
+    query += "'" + software.license_type + "', ";
+    query += "'" + software.license_key + "', ";
     query += "'" + software.data_scadenza + "', ";
     query += software.is_pnrr + ", ";
     query += "'" + software.inventario + "', ";
     query += "'" + software.serial_no + "', ";
     query += "'" + software.architettura + "', ";
-    query += software.life_licence + " ";
+    query += software.life_license + ", ";
+    query += software.no_inventario + " ";
     query += ")";
     return query;
 }
@@ -1298,14 +1299,15 @@ function updateSoftware(db_used, id_sw, software) {
     query += "release_year = '" + software.release_year + "', ";
     query += "version = '" + software.version + "', ";
     query += "build_no = '" + software.build_no + "', ";
-    query += "licence_type = '" + software.licence_type + "', ";
-    query += "licence_key = '" + software.licence_key + "', ";
+    query += "license_type = '" + software.license_type + "', ";
+    query += "license_key = '" + software.license_key + "', ";
     query += "expired_date = '" + software.data_scadenza + "', ";
     query += "is_pnrr = " + software.is_pnrr + ", ";
     query += "inv_ict3_number = '" + software.inventario + "', ";
     query += "serial_no = '" + software.serial_no + "', ";
     query += "architettura = '" + software.architettura + "', ";
-    query += "life_licence = " + software.life_licence + " ";
+    query += "life_license = " + software.life_license + ", ";
+    query += "no_inventario = " + software.no_inventario + ", ";
     query += "where id = " + id_sw;
     return query;
 }
@@ -2318,7 +2320,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 +2328,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 +2355,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 +2390,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 +2400,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; 
 }
@@ -8580,7 +8586,7 @@ function selectSoftwareConsegna(db_used, id_consegna, id_software) {
 }
 
 function selectSoftwaresInDepositoSQLite(inv_code) {
-    var query = "SELECT s.id, s.support, s.platform, s.version, s.licence_type, s.maker, s.model, ";
+    var query = "SELECT s.id, s.support, s.platform, s.version, s.license_type, s.maker, s.model, ";
     query += "case ";
     query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then s.inv_ict3_number ";
     query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)') ";
@@ -8594,7 +8600,7 @@ function selectSoftwaresInDepositoSQLite(inv_code) {
     return query;    
 }
 function selectSoftwaresInDepositoMySQL(inv_code) {
-    var query = "SELECT s.id, s.support, s.platform, s.version, s.licence_type, s.maker, s.model, ";
+    var query = "SELECT s.id, s.support, s.platform, s.version, s.license_type, s.maker, s.model, ";
     query += "case ";
     query += "when s.inv_ict3_number != '' and s.inv_ict3_number is not null then s.inv_ict3_number ";
     query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)') ";
@@ -12510,7 +12516,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 +15170,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.112",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",