alsmanager_lib 3.0.112 → 3.0.114

package/lib/modules.js

@@ -1269,6 +1269,7 @@ function getSoftwareForConsegnaById(db_used, id_sw) {
     return query;
 }
 function insertSoftware(db_used, software) {
+    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 + "', ";
@@ -1279,18 +1280,29 @@ function insertSoftware(db_used, software) {
     query += "'" + software.build_no + "', ";
     query += "'" + software.license_type + "', ";
     query += "'" + software.license_key + "', ";
-    query += "'" + software.data_scadenza + "', ";
+    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_license + ", ";
-    query += software.no_inventario + " ";
+    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 + "', ";
@@ -1301,13 +1313,23 @@ function updateSoftware(db_used, id_sw, software) {
     query += "build_no = '" + software.build_no + "', ";
     query += "license_type = '" + software.license_type + "', ";
     query += "license_key = '" + software.license_key + "', ";
-    query += "expired_date = '" + software.data_scadenza + "', ";
+    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_license = " + software.life_license + ", ";
-    query += "no_inventario = " + software.no_inventario + ", ";
+    if (software.no_inventario) {
+        query += "no_inventario = 0 ";
+    }
+    else {
+        query += "no_inventario = " + software.no_inventario + " ";
+    } 
     query += "where id = " + id_sw;
     return query;
 }
@@ -11128,30 +11150,46 @@ function updateSite(id_site, id_place, mark, floor, size) {
 }
 
 function writeSiteDestination(id_site, id_place, date_start, date_end, name, funzione) {
+    var dt_start = convertDateToStringDB(date_start);
+    var dt_end = '2999-12-31';
+
     var query = "insert into site_destinations (id_site, id_place, date_start, date_end, name, type) values ";
     query += "(" + id_site + ", ";
     query += "'" + id_place + "', ";
-    query += "'" + date_start + "', ";
-    query += "'" + date_end + "', ";
+    query += "'" + dt_start + "', ";
+    query += "'" + dt_end + "', ";
     query += "'" + name + "', ";
     query += "'" + funzione + "' ";
     return query;
 }
 
 function updateSiteDestination(id_site, id_place, date_start, date_end, name, funzione) {
+    var dt_start = convertDateToStringDB(date_start);
+    var dt_end = convertDateToStringDB(date_end);
+
     var query = "update site_destinations set ";
-    query += "'" + date_start + "', ";
-    query += "'" + date_end + "', ";
+    query += "'" + dt_start + "', ";
+    query += "'" + dt_end + "' ";
     if (name) { 
-        query += "name = '" + name + "', ";
+        query += ", name = '" + name + "', ";
     }
     if (funzione) { 
-        query += "type = '" + funzione + "' ";
+        query += ", type = '" + funzione + "' ";
     }
     query += "where id_site = " + id_site + " and id_place = '" + id_place + "'";
     return query;
 }
 
+function updateSiteDestinationAfterMove(id_site, id_place, date_start_ref) {
+    var dt_start = convertDateToStringDB(date_start);
+    var dt_end = convertDateToStringDB(date_start_ref);
+
+    var query = "update site_destinations set ";
+    query += "date('" + dt_end + "', '-1 day') ";
+    query += "where id_site = " + id_site + " and id_place = '" + id_place + "'";
+    return query;
+}
+
 function getSiteDestinationsByIdSite(id_site, id_place) {
     var query = "select date_start, date_end, name, type from site_destinations ";
     query += "where id_site = " + id_site + " and id_place = '" + id_place + "' ";
@@ -12605,6 +12643,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 = "";
@@ -15149,6 +15195,7 @@ module.exports = {
     updateSite,
     writeSiteDestination,
     updateSiteDestination,
+    updateSiteDestinationAfterMove,
     getSiteDestinationsByIdSite,
     getSitesFromDevice,
     getSitesWithDatesFromDevice,

package/package.json

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