alsmanager_lib 3.0.111 → 3.0.113

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,8 @@ 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 dt_scadenza = convertDateToStringDB(software.data_scadenza);
+    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,19 +1278,31 @@ 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.data_scadenza + "', ";
+    query += "'" + software.license_type + "', ";
+    query += "'" + software.license_key + "', ";
+    query += "'" + dt_scadenza + "', ";
     query += software.is_pnrr + ", ";
-    query += "'" + software.inventario + "', ";
+    if (!software.inventario) {
+        query += "'', ";
+    }
+    else {
+        query += "'" + software.inventario + "', ";
+    }
     query += "'" + software.serial_no + "', ";
     query += "'" + software.architettura + "', ";
-    query += software.life_licence + " ";
+    query += software.life_license + ", ";
+    if (software.no_inventario) {
+        query += "0 ";
+    }
+    else {
+        query += software.no_inventario + " ";
+    }
     query += ")";
     return query;
 }
 
 function updateSoftware(db_used, id_sw, software) {
+    var dt_scadenza = convertDateToStringDB(software.data_scadenza);
     var query = "update softwares set ";
     query += "maker = '" + software.marca + "', ";
     query += "model = '" + software.modello + "', ";
@@ -1298,14 +1311,25 @@ 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 += "expired_date = '" + software.data_scadenza + "', ";
+    query += "license_type = '" + software.license_type + "', ";
+    query += "license_key = '" + software.license_key + "', ";
+    query += "expired_date = '" + dt_scadenza + "', ";
     query += "is_pnrr = " + software.is_pnrr + ", ";
-    query += "inv_ict3_number = '" + software.inventario + "', ";
+    if (!software.inventario) {
+        query += "inv_ict3_number = '', ";
+    }
+    else {
+        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 + ", ";
+    if (software.no_inventario) {
+        query += "no_inventario = 0 ";
+    }
+    else {
+        query += "no_inventario = " + software.no_inventario + " ";
+    } 
     query += "where id = " + id_sw;
     return query;
 }
@@ -8584,7 +8608,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)') ";
@@ -8598,7 +8622,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)') ";
@@ -12603,6 +12627,14 @@ function convertDateToStringDB(date_to_conv) {
     return date_str;
 }
 
+function convertDateFromStringDBToDisplay(date_db) {
+    var date_str = "";
+    if (date_db & date_db.trim() != '') {
+        var d = new Date(date_db);
+        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 = "";

package/package.json

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