alsmanager_lib 2.0.39 → 2.0.41

package/lib/modules.js

@@ -2332,29 +2332,29 @@ function getDevicesSelectByPlaceSQLite(id_place, dev_type) {
 }
 
 function getDevicesSelectByPlaceMySQL(id_place, dev_type) {
-    var query = "select DISTINCT devices.id, devices.type as Tipo, devices.manifacturer as Marca, devices.model as modello, ";
+    var query = "select DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
     query += "case ";
-    query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
-    query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
-    query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
-    query += "when inv_tndigit_number != '' and inv_tndigit_number is not null then concat(inv_tndigit_number,'(TNDigit)') ";
-    query += "when serial_no != '' and serial_no is not null then concat(serial_no,'(S/N)') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
+    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)') ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
     query += "end as Codice, ";
     query += "case ";
-    query += "when trim(inv_pnrr_number) is null then '' ";
-    query += "when trim(inv_pnrr_number) = '' then '' ";
+    query += "when trim(d.inv_pnrr_number) is null then '' ";
+    query += "when trim(d.inv_pnrr_number) = '' then '' ";
     query += "else 'SI' ";
     query += "end as PNRR ";
-    query += " from devices ";
-    query += "inner join device_site on device_site.id_device = devices.id ";
-    query += "inner join sites on sites.id = device_site.id_site ";
-    query += "where (CURDATE() >= device_site.date_in and CURDATE() <= device_site.date_out) ";
-    query += "and (devices.is_removed is null or devices.is_removed = 0) ";
-    query += "and sites.id_place = :id_place ";
+    query += " from devices d ";
+    query += "inner join device_site ds on ds.id_device = d.id ";
+    query += "inner join sites s on s.id = ds.id_site ";
+    query += "where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+    query += "and (d.is_removed is null or d.is_removed = 0) ";
+    query += "and s.id_place = :id_place ";
     if (dev_type && dev_type != '') {
-        query += "and devices.type = :dev_type ";
+        query += "and d.type = :dev_type ";
     }
-    query += "order by devices.type ";
+    query += "order by d.type ";
     return query;
 }
 function getDevicesSelectByPlace(db_used, id_place, dev_type) {
@@ -7961,7 +7961,7 @@ function queryFunzioneByPlaceAndFloorMySQL(id_place, piano) {
     query += " JOIN sites s ON s.id = sd.id_site"
     if (id_place) {
         query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
-        query += " and sd.id_place = ':id_place'";
+        query += " and sd.id_place = :id_place";
         if (piano) {
             query += " and s.floor = :piano";
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alsmanager_lib",
-  "version": "2.0.39",
+  "version": "2.0.41",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",