alsmanager_lib 3.0.121 → 3.0.122

package/lib/modules.js

@@ -11248,7 +11248,7 @@ function getLastSiteDestinationsByIdSite(id_site, id_place, date_ref) {
 
 
 //Sites by devices
-function getSitesFromDeviceSQLite(id_device, prec_pos) {
+function getSitesFromDeviceSQLite(id_device, date_ref, prec_pos) {
     var query = "SELECT DISTINCT p.mark as Sigla, p.name as Plesso, sd.name as Aula, sd.type as Funzione, s.floor as Piano from device_site ds ";
     query += " JOIN sites s ON s.id = ds.id_site";
     query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
@@ -11257,8 +11257,17 @@ function getSitesFromDeviceSQLite(id_device, prec_pos) {
         query += " where ds.id_device = " + id_device;
     }
     else {
-        query += " where (date('now') >= ds.date_in and date('now') <= ds.date_out) and";
-        query += " ds.id_device = " + id_device;
+        if (date_ref) {
+            var dt_ref = convertDateToStringDB(dt_ref);
+            query += " where (dt_ref >= ds.date_in and dt_ref <= ds.date_out) ";
+            query += "and (dt_ref >= sd.date_start and dt_ref <= ds.date_end) ";
+            query += "and ds.id_device = " + id_device;
+        }
+        else {
+            query += " where (date('now') >= ds.date_in and date('now') <= ds.date_out) ";
+            query += "and (date('now') >= sd.date_start and date('now') <= ds.date_end) ";
+            query += "and ds.id_device = " + id_device;
+        }    
     }
     query += " order by sd.name, s.floor";
     return query;
@@ -11272,13 +11281,14 @@ function getSitesFromDeviceMySQL(id_device, prec_pos) {
         query += " where ds.id_device = :id_device";
     }
     else {
-        query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) and";
-        query += " ds.id_device = :id_device";
+        query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+        query += "and (CURDATE() >= sd.date_start and CURDATE() <= ds.date_end) ";
+        query += "and ds.id_device = :id_device";
     }
     query += " order by sd.name, s.floor";
     return query;
 }
-function getSitesFromDeviceMySQL2(id_device, prec_pos) {
+function getSitesFromDeviceMySQL2(id_device, date_ref, prec_pos) {
     var query = "SELECT DISTINCT p.mark as Sigla, p.name as Plesso, sd.name as Aula, sd.type as Funzione, s.floor as Piano from device_site ds ";
     query += " JOIN sites s ON s.id = ds.id_site";
     query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
@@ -11287,24 +11297,25 @@ function getSitesFromDeviceMySQL2(id_device, prec_pos) {
         query += " where ds.id_device = " + id_device;
     }
     else {
-        query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) and";
-        query += " ds.id_device = " + id_device;
+        query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+        query += "and (CURDATE() >= sd.date_start and CURDATE() <= ds.date_end) ";
+        query += "and ds.id_device = " + id_device;
     }
     query += " order by sd.name, s.floor";
     return query;
 }
-function getSitesFromDevice(db_used, id_device, prec_pos) {
+function getSitesFromDevice(db_used, id_device, date_ref, prec_pos) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getSitesFromDeviceSQLite(id_device, prec_pos);
+                query = getSitesFromDeviceSQLite(id_device, date_ref, prec_pos);
                 break;
             case 'MYSQL':
                 query = getSitesFromDeviceMySQL(id_device, prec_pos);
                 break;
             case 'MYSQL2':
-                query = getSitesFromDeviceMySQL2(id_device, prec_pos);
+                query = getSitesFromDeviceMySQL2(id_device, date_ref, prec_pos);
                 break;
         }
     }

package/package.json

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