alsmanager_lib 3.0.197 → 3.0.199

package/lib/modules.js

@@ -16418,7 +16418,7 @@ CREATE TABLE "printer_stampe_user" (
 */
 
 function selectPrinters(id_place, only_external) {
-    var query = "select d.id, concat(d.manifacturer, ' - ', d.model, ' (', p.name, ' - ', sd.name, ' - p.no : ', s.floor, ')') as descrizione, ";
+    var query = "select distinct d.id, concat(d.manifacturer, ' - ', d.model, ' (', p.name, ' - ', sd.name, ' - p.no : ', s.floor, ')') as descrizione, ";
     query += "case "; 
     query += "when dg.id is not null then gf.name ";
     query += "else 'Interno' ";
@@ -16458,6 +16458,16 @@ function readCountersPrinter(id_device) {
     return query;
 }
 
+function readCountersPrinterBeforeDate(id_device, operazione, date_ref) {
+    var dr_str = convertDateToStringDB(date_ref);
+    var query = "select id, id_device, date_read, operation, num_bw, num_colors from printer_counters ";
+    query += "where id_device = " + id_device + " ";
+    query += "and operazione = '" + operazione + "' ";
+    query += "and date_read < '" + dr_str + "' ";
+    query += "order by date_read desc limit 1";
+    return query;
+}
+
 function writeCountersPrinter(id_device, date_read, operation, num_bw, num_colors) {
     var dr_str = convertDateToStringDB(date_read);
     var query = "insert into printer_counters (id_device, date_read, operation, num_bw, num_colors) values (";
@@ -16465,10 +16475,9 @@ function writeCountersPrinter(id_device, date_read, operation, num_bw, num_color
     return query;
 }
 
-function updateCountersPrinter(id_prnread, id_device, date_read, operation, num_bw, num_colors, ) {
+function updateCountersPrinter(id_prnread, date_read, operation, num_bw, num_colors) {
     var dr_str = convertDateToStringDB(date_read);
     var query = "update printer_counters set ";
-    query += "id_device = " + id_device + ", ";
     query += "date_read = '" + dr_str + "',";
     query += "operation = '" + operation + "', ";
     query += "num_bw = " + num_bw + ", ";
@@ -17020,6 +17029,7 @@ module.exports = {
     selectPrinters,
     selectCountersPrinters,
     readCountersPrinter,
+    readCountersPrinterBeforeDate,
     writeCountersPrinter,
     updateCountersPrinter,
     deleteCountersPrinter,

package/package.json

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