alsmanager_lib 3.0.114 → 3.0.116

package/lib/modules.js

@@ -11151,7 +11151,7 @@ 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 dt_end = convertDateToStringDB(date_end);
 
     var query = "insert into site_destinations (id_site, id_place, date_start, date_end, name, type) values ";
     query += "(" + id_site + ", ";
@@ -11168,8 +11168,8 @@ function updateSiteDestination(id_site, id_place, date_start, date_end, name, fu
     var dt_end = convertDateToStringDB(date_end);
 
     var query = "update site_destinations set ";
-    query += "'" + dt_start + "', ";
-    query += "'" + dt_end + "' ";
+    query += "date_start = '" + dt_start + "', ";
+    query += "date_end = '" + dt_end + "' ";
     if (name) { 
         query += ", name = '" + name + "', ";
     }
@@ -11181,11 +11181,9 @@ function updateSiteDestination(id_site, id_place, date_start, date_end, name, fu
 }
 
 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 += "date_end = date('" + dt_end + "', '-1 day') ";
     query += "where id_site = " + id_site + " and id_place = '" + id_place + "'";
     return query;
 }
@@ -11197,6 +11195,17 @@ function getSiteDestinationsByIdSite(id_site, id_place) {
     return query;
 }
 
+function getLastSiteDestinationsByIdSite(id_site, id_place, date_ref) {
+    var dt_ref = convertDateToStringDB(date_ref);
+    var query = "select date_start, date_end, name, type from site_destinations ";
+    query += "where id_site = " + id_site + " and id_place = '" + id_place + "' ";
+    if (date_ref) {
+        query += "and date('" + dt_ref + "') >= date_start and date('" + dt_ref + "') <= date_end ";
+    }
+    query += "order by date_start desc LIMIT 1";
+    return query;
+}
+
 
 //Sites by devices
 function getSitesFromDeviceSQLite(id_device, prec_pos) {
@@ -15197,6 +15206,7 @@ module.exports = {
     updateSiteDestination,
     updateSiteDestinationAfterMove,
     getSiteDestinationsByIdSite,
+    getLastSiteDestinationsByIdSite,
     getSitesFromDevice,
     getSitesWithDatesFromDevice,
     querySitesWithDefaults,

package/package.json

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