alsmanager_lib 3.0.199 → 3.0.201
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 +2 -1
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -16431,6 +16431,7 @@ function selectPrinters(id_place, only_external) {
|
|
|
16431
16431
|
query += "left join device_gestioni dg on d.id = dg.id_device ";
|
|
16432
16432
|
query += "left join gestori_fornitori gf on dg.id_gestione = gf.id ";
|
|
16433
16433
|
query += "where sd.date_start <= date('now') and sd.date_end >= date('now') ";
|
|
16434
|
+
query += "and ds.date_in <= date('now') and ds.date_out >= date('now') ";
|
|
16434
16435
|
query += "and d.type = 'STAMPANTE' ";
|
|
16435
16436
|
query += "and (dg.id is null or (dg.date_start <= date('now') and dg.date_end >= date('now'))) ";
|
|
16436
16437
|
if (only_external && only_external == 1)
|
|
@@ -16462,7 +16463,7 @@ function readCountersPrinterBeforeDate(id_device, operazione, date_ref) {
|
|
|
16462
16463
|
var dr_str = convertDateToStringDB(date_ref);
|
|
16463
16464
|
var query = "select id, id_device, date_read, operation, num_bw, num_colors from printer_counters ";
|
|
16464
16465
|
query += "where id_device = " + id_device + " ";
|
|
16465
|
-
query += "and
|
|
16466
|
+
query += "and operation = '" + operazione + "' ";
|
|
16466
16467
|
query += "and date_read < '" + dr_str + "' ";
|
|
16467
16468
|
query += "order by date_read desc limit 1";
|
|
16468
16469
|
return query;
|