alsmanager_lib 3.0.121 → 3.0.123
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/modules.js +22 -11
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -11248,7 +11248,7 @@ function getLastSiteDestinationsByIdSite(id_site, id_place, date_ref) {
|
|
|
11248
11248
|
|
|
11249
11249
|
|
|
11250
11250
|
//Sites by devices
|
|
11251
|
-
function getSitesFromDeviceSQLite(id_device, prec_pos) {
|
|
11251
|
+
function getSitesFromDeviceSQLite(id_device, date_ref, prec_pos) {
|
|
11252
11252
|
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 ";
|
|
11253
11253
|
query += " JOIN sites s ON s.id = ds.id_site";
|
|
11254
11254
|
query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
|
|
@@ -11257,8 +11257,17 @@ function getSitesFromDeviceSQLite(id_device, prec_pos) {
|
|
|
11257
11257
|
query += " where ds.id_device = " + id_device;
|
|
11258
11258
|
}
|
|
11259
11259
|
else {
|
|
11260
|
-
|
|
11261
|
-
|
|
11260
|
+
if (date_ref) {
|
|
11261
|
+
var dt_ref = convertDateToStringDB(dt_ref);
|
|
11262
|
+
query += " where (dt_ref >= ds.date_in and dt_ref <= ds.date_out) ";
|
|
11263
|
+
query += "and (dt_ref >= sd.date_start and dt_ref <= ds.date_end) ";
|
|
11264
|
+
query += "and ds.id_device = " + id_device;
|
|
11265
|
+
}
|
|
11266
|
+
else {
|
|
11267
|
+
query += " where (date('now') >= ds.date_in and date('now') <= ds.date_out) ";
|
|
11268
|
+
query += "and (date('now') >= sd.date_start and date('now') <= sd.date_end) ";
|
|
11269
|
+
query += "and ds.id_device = " + id_device;
|
|
11270
|
+
}
|
|
11262
11271
|
}
|
|
11263
11272
|
query += " order by sd.name, s.floor";
|
|
11264
11273
|
return query;
|
|
@@ -11272,13 +11281,14 @@ function getSitesFromDeviceMySQL(id_device, prec_pos) {
|
|
|
11272
11281
|
query += " where ds.id_device = :id_device";
|
|
11273
11282
|
}
|
|
11274
11283
|
else {
|
|
11275
|
-
query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out)
|
|
11276
|
-
query += "
|
|
11284
|
+
query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
|
|
11285
|
+
query += "and (CURDATE() >= sd.date_start and CURDATE() <= sd.date_end) ";
|
|
11286
|
+
query += "and ds.id_device = :id_device";
|
|
11277
11287
|
}
|
|
11278
11288
|
query += " order by sd.name, s.floor";
|
|
11279
11289
|
return query;
|
|
11280
11290
|
}
|
|
11281
|
-
function getSitesFromDeviceMySQL2(id_device, prec_pos) {
|
|
11291
|
+
function getSitesFromDeviceMySQL2(id_device, date_ref, prec_pos) {
|
|
11282
11292
|
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 ";
|
|
11283
11293
|
query += " JOIN sites s ON s.id = ds.id_site";
|
|
11284
11294
|
query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
|
|
@@ -11287,24 +11297,25 @@ function getSitesFromDeviceMySQL2(id_device, prec_pos) {
|
|
|
11287
11297
|
query += " where ds.id_device = " + id_device;
|
|
11288
11298
|
}
|
|
11289
11299
|
else {
|
|
11290
|
-
query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out)
|
|
11291
|
-
query += "
|
|
11300
|
+
query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
|
|
11301
|
+
query += "and (CURDATE() >= sd.date_start and CURDATE() <= sd.date_end) ";
|
|
11302
|
+
query += "and ds.id_device = " + id_device;
|
|
11292
11303
|
}
|
|
11293
11304
|
query += " order by sd.name, s.floor";
|
|
11294
11305
|
return query;
|
|
11295
11306
|
}
|
|
11296
|
-
function getSitesFromDevice(db_used, id_device, prec_pos) {
|
|
11307
|
+
function getSitesFromDevice(db_used, id_device, date_ref, prec_pos) {
|
|
11297
11308
|
var query = "";
|
|
11298
11309
|
if (db_used) {
|
|
11299
11310
|
switch (db_used) {
|
|
11300
11311
|
case 'SQLITE':
|
|
11301
|
-
query = getSitesFromDeviceSQLite(id_device, prec_pos);
|
|
11312
|
+
query = getSitesFromDeviceSQLite(id_device, date_ref, prec_pos);
|
|
11302
11313
|
break;
|
|
11303
11314
|
case 'MYSQL':
|
|
11304
11315
|
query = getSitesFromDeviceMySQL(id_device, prec_pos);
|
|
11305
11316
|
break;
|
|
11306
11317
|
case 'MYSQL2':
|
|
11307
|
-
query = getSitesFromDeviceMySQL2(id_device, prec_pos);
|
|
11318
|
+
query = getSitesFromDeviceMySQL2(id_device, date_ref, prec_pos);
|
|
11308
11319
|
break;
|
|
11309
11320
|
}
|
|
11310
11321
|
}
|