alsmanager_lib 3.0.122 → 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 +3 -3
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -11265,7 +11265,7 @@ function getSitesFromDeviceSQLite(id_device, date_ref, prec_pos) {
|
|
|
11265
11265
|
}
|
|
11266
11266
|
else {
|
|
11267
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') <=
|
|
11268
|
+
query += "and (date('now') >= sd.date_start and date('now') <= sd.date_end) ";
|
|
11269
11269
|
query += "and ds.id_device = " + id_device;
|
|
11270
11270
|
}
|
|
11271
11271
|
}
|
|
@@ -11282,7 +11282,7 @@ function getSitesFromDeviceMySQL(id_device, prec_pos) {
|
|
|
11282
11282
|
}
|
|
11283
11283
|
else {
|
|
11284
11284
|
query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
|
|
11285
|
-
query += "and (CURDATE() >= sd.date_start and CURDATE() <=
|
|
11285
|
+
query += "and (CURDATE() >= sd.date_start and CURDATE() <= sd.date_end) ";
|
|
11286
11286
|
query += "and ds.id_device = :id_device";
|
|
11287
11287
|
}
|
|
11288
11288
|
query += " order by sd.name, s.floor";
|
|
@@ -11298,7 +11298,7 @@ function getSitesFromDeviceMySQL2(id_device, date_ref, prec_pos) {
|
|
|
11298
11298
|
}
|
|
11299
11299
|
else {
|
|
11300
11300
|
query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
|
|
11301
|
-
query += "and (CURDATE() >= sd.date_start and CURDATE() <=
|
|
11301
|
+
query += "and (CURDATE() >= sd.date_start and CURDATE() <= sd.date_end) ";
|
|
11302
11302
|
query += "and ds.id_device = " + id_device;
|
|
11303
11303
|
}
|
|
11304
11304
|
query += " order by sd.name, s.floor";
|