alsmanager_lib 3.0.161 → 3.0.163

package/lib/modules.js

@@ -9982,7 +9982,7 @@ function removeDismissioneById(db_used, id_dismiss) {
 function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
     var query = "select dm.id, ";
     query += "case ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
@@ -10002,7 +10002,7 @@ function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
 function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
     var query = "select dm.id, ";
     query += "case ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
     query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
     query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
@@ -12161,36 +12161,56 @@ function getSitesFromDevice(db_used, id_device, date_ref, prec_pos) {
 }
 //End Sites by devices
 //Sites from device with date
-function getSitesWithDatesFromDeviceSQLite(id_device) {
+function getSitesWithDatesFromDeviceSQLite(id_device, date_ref) {
+    var dr_str = "";
+    if (date_ref) {
+        var dr = new Date(date_ref);
+        dr_str = convertDateToStringDB(dr);
+    }
+    else {
+        var dr = new Date();
+        dr_str = convertDateToStringDB(dr);
+    }  
     var query = "SELECT DISTINCT ds.date_in as 'Data inizio', ds.date_out as 'Data fine', sd.id_place as Plesso, s.mark as Sigla, sd.name as Destinazione from device_site ds ";
     query += "join site_destinations sd on sd.id_site = ds.id_site ";
     query += "join sites s on s.id = sd.id_site ";
-    query += "where ds.id_device = " + id_device;
+    query += "where ds.id_device = " + id_device + " ";
+    query += "and ds.date_start <= '" + dr_str + "' and ds.date_end >= '" + dr_str + "' ";
     query += " order by date_in";
     return query;
 }
 
-function getSitesWithDatesFromDeviceMySQL(id_device) {
+function getSitesWithDatesFromDeviceMySQL(id_device, date_ref) {
+    var dr_str = "";
+    if (date_ref) {
+        var dr = new Date(date_ref);
+        dr_str = convertDateToStringDB(dr);
+    }
+    else {
+        var dr = new Date();
+        dr_str = convertDateToStringDB(dr);
+    }    
     var query = "SELECT DISTINCT ds.date_in as 'Data inizio', ds.date_out as 'Data fine', sd.id_place as Plesso, s.mark as Sigla, sd.name as Destinazione from device_site ds ";
     query += "join site_destinations sd on sd.id_site = ds.id_site ";
     query += "join sites s on s.id = sd.id_site ";
     query += "where ds.id_device = :id_device ";
+    query += "and ds.date_start <= '" + dr_str + "' and ds.date_end >= '" + dr_str + "' ";
     query += "order by date_in";
     return query;
 }
 
-function getSitesWithDatesFromDevice(db_used, id_device) {
+function getSitesWithDatesFromDevice(db_used, id_device, date_ref) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getSitesWithDatesFromDeviceSQLite(id_device);
+                query = getSitesWithDatesFromDeviceSQLite(id_device, date_ref);
                 break;
             case 'MYSQL':
-                query = getSitesWithDatesFromDeviceMySQL(id_device);
+                query = getSitesWithDatesFromDeviceMySQL(id_device, date_ref);
                 break;
             case 'MYSQL2':
-                query = getSitesWithDatesFromDeviceSQLite(id_device);
+                query = getSitesWithDatesFromDeviceSQLite(id_device, date_ref);
                 break;
         }
     }

package/package.json

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