alsmanager_lib 2.0.41 → 2.0.42

package/lib/modules.js

@@ -2235,7 +2235,7 @@ function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, is_PN
 // End Device select
 // Device Select by site
 function getDevicesSelectBySiteSQLite(id_site, 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 ";
@@ -2248,21 +2248,21 @@ function getDevicesSelectBySiteSQLite(id_site, dev_type) {
     query += "when trim(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 (date('now') >= device_site.date_in and date('now') <= device_site.date_out) ";
-    query += "and (devices.is_removed is null or devices.is_removed = 0) ";
-    query += "and sites.id = " + id_site + " ";
+    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 (date('now') >= ds.date_in and date('now') <= ds.date_out) ";
+    query += "and (d.is_removed is null or d.is_removed = 0) ";
+    query += "and s.id = " + id_site + " ";
     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 getDevicesSelectBySiteMySQL(id_site, 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 ";
@@ -2275,16 +2275,16 @@ function getDevicesSelectBySiteMySQL(id_site, dev_type) {
     query += "when trim(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 = :id_site ";
+    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 = :id_site ";
     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;
 }
@@ -2305,7 +2305,7 @@ function getDevicesSelectBySite(db_used, id_site, dev_type) {
 //End Device Select by site
 // Device per plesso
 function getDevicesSelectByPlaceSQLite(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 ";
@@ -2318,16 +2318,16 @@ function getDevicesSelectByPlaceSQLite(id_place, dev_type) {
     query += "when trim(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 (date('now') >= device_site.date_in and date('now') <= 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 (date('now') >= ds.date_in and date('now') <= 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;
 }
 
@@ -7989,40 +7989,40 @@ function queryFunzioneByPlaceAndFloor(db_used, id_place, piano) {
 
 
 function querySitesSQLite(place, piano, funzione) {
-    var query = "SELECT site_destinations.id_site as id, sites.id_place as Plesso, site_destinations.name as Nome, sites.mark as Codice, sites.floor as Piano, site_destinations.type as Funzione from site_destinations";
-    query += " LEFT JOIN sites ON sites.id = site_destinations.id_site"
-    query += " where date('now') >= site_destinations.date_start and date('now') <= site_destinations.date_end";
+    var query = "SELECT sd.id_site as id, s.id_place as Plesso, sd.name as Nome, s.mark as Codice, s.floor as Piano, sd.type as Funzione from site_destinations sd";
+    query += " LEFT JOIN sites s ON s.id = sd.id_site"
+    query += " where date('now') >= sd.date_start and date('now') <= sd.date_end";
 
     if (place) {
-        query += " and sites.id_place = '" + place + "'";
+        query += " and s.id_place = '" + place + "'";
     }
     if (funzione) {
-        query += " and site_destinations.type = '" + funzione + "'";
+        query += " and sd.type = '" + funzione + "'";
     }
 
     if (piano) {
-        query += " and sites.floor = '" + piano + "'";
+        query += " and s.floor = '" + piano + "'";
     }
-    query += " order by sites.id_place, sites.floor";
+    query += " order by s.id_place, s.floor";
     return query;
 }
 
 function querySitesMySQL(place, piano, funzione) {
-    var query = "SELECT DISTINCT site_destinations.id_site as id, sites.id_place as Plesso, site_destinations.name as Nome, sites.mark as Codice, sites.floor as Piano, site_destinations.type as Funzione from site_destinations";
-    query += " LEFT JOIN sites ON sites.id = site_destinations.id_site"
-    query += " where CURDATE() >= site_destinations.date_start and CURDATE() <= site_destinations.date_end";
+    var query = "SELECT DISTINCT sd.id_site as id, s.id_place as Plesso, sd.name as Nome, s.mark as Codice, s.floor as Piano, sd.type as Funzione from site_destinations sd ";
+    query += " LEFT JOIN sites s ON s.id = sd.id_site"
+    query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
 
     if (place) {
-        query += " and sites.id_place = :id_place";
+        query += " and s.id_place = :id_place";
     }
     if (funzione) {
-        query += " and site_destinations.type = :funzione";
+        query += " and sd.type = :funzione";
     }
 
     if (piano) {
-        query += " and sites.floor = :piano";
+        query += " and s.floor = :piano";
     }
-    query += " order by sites.id_place, sites.floor";
+    query += " order by s.id_place, s.floor";
     return query;
 }
 
@@ -8044,33 +8044,33 @@ function querySites(db_used, place, piano, funzione) {
 
 //Sites by devices
 function getSitesFromDeviceSQLite(id_device, prec_pos) {
-    var query = "SELECT places.mark as Sigla, places.name as Plesso, site_destinations.name as Aula, site_destinations.type as Funzione, sites.floor as Piano from device_site";
-    query += " JOIN sites ON sites.id = device_site.id_site";
-    query += " JOIN site_destinations ON site_destinations.id_site = device_site.id_site";
-    query += " JOIN places ON places.mark = site_destinations.id_place";
+    var query = "SELECT p.mark as Sigla, p.name as Plesso, sd.name as Aula, sd.type as Funzione, s.floor as Piano from device_site ds ";
+    query += " JOIN sites s ON s.id = ds.id_site";
+    query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
+    query += " JOIN places p ON p.mark = sd.id_place";
     if (prec_pos == 1) {
-        query += " where device_site.id_device = " + id_device;
+        query += " where ds.id_device = " + id_device;
     }
     else {
-        query += " where (date('now') >= device_site.date_in and date('now') <= device_site.date_out) and";
-        query += " device_site.id_device = " + id_device;
+        query += " where (date('now') >= ds.date_in and date('now') <= ds.date_out) and";
+        query += " ds.id_device = " + id_device;
     }
-    query += " order by site_destinations.name, sites.floor";
+    query += " order by sd.name, s.floor";
     return query;
 }
 function getSitesFromDeviceMySQL(id_device, prec_pos) {
-    var query = "SELECT places.mark as Sigla, places.name as Plesso, site_destinations.name as Aula, site_destinations.type as Funzione, sites.floor as Piano from device_site";
-    query += " JOIN sites ON sites.id = device_site.id_site";
-    query += " JOIN site_destinations ON site_destinations.id_site = device_site.id_site";
-    query += " JOIN places ON places.mark = site_destinations.id_place";
+    var query = "SELECT p.mark as Sigla, p.name as Plesso, sd.name as Aula, sd.type as Funzione, s.floor as Piano from device_site ds ";
+    query += " JOIN sites s ON s.id = ds.id_site";
+    query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
+    query += " JOIN places p  ON p.mark = sd.id_place";
     if (prec_pos == 1) {
-        query += " where device_site.id_device = :id_device";
+        query += " where ds.id_device = :id_device";
     }
     else {
-        query += " where (CURDATE() >= device_site.date_in and CURDATE() <= device_site.date_out) and";
-        query += " device_site.id_device = :id_device";
+        query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) and";
+        query += " ds.id_device = :id_device";
     }
-    query += " order by site_destinations.name, sites.floor";
+    query += " order by sd.name, s.floor";
     return query;
 }
 function getSitesFromDevice(db_used, id_device, prec_pos) {

package/package.json

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