alsmanager_lib 3.0.237 → 3.0.239

package/lib/modules.js

@@ -13087,12 +13087,13 @@ function queryFunzioneByPlaceAndFloor(db_used, id_place, piano, date_ref) {
 
 function querySitesSQLite(place, piano, funzione, date_ref) {
     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 += " LEFT JOIN sites s ON s.id = sd.id_site ";
+    query += "where is_removed <> 1 ";
     if (date_ref) {
-        query += " where " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
+        query += "and " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
     }
     else {
-        query += " where date('now') >= sd.date_start and date('now') <= sd.date_end";
+        query += "and date('now') >= sd.date_start and date('now') <= sd.date_end";
     }   
     if (place) {
         query += " and s.id_place = '" + place + "'";
@@ -13110,12 +13111,13 @@ function querySitesSQLite(place, piano, funzione, date_ref) {
 
 function querySitesMySQL(place, piano, funzione, date_ref) {
     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 += " LEFT JOIN sites s ON s.id = sd.id_site ";
+    query += "where is_removed <> 1 ";
     if (date_ref) {
-        query += " where :date_ref >= sd.date_start and :date_ref <= sd.date_end";
+        query += " and :date_ref >= sd.date_start and :date_ref <= sd.date_end";
     }
     else {
-        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        query += " and CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
     }       
    
     if (place) {
@@ -13134,12 +13136,13 @@ function querySitesMySQL(place, piano, funzione, date_ref) {
 
 function querySitesMySQL2(place, piano, funzione, date_ref) {
     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 += " LEFT JOIN sites s ON s.id = sd.id_site ";
+    query += "where is_removed <> 1 ";    
     if (date_ref) {
-        query += " where " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
+        query += " and " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
     }
     else {
-        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        query += " and CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
     }   
 
     if (place) {
@@ -13194,22 +13197,23 @@ function updateSite(id_site, id_place, mark, floor, size) {
     return query;
 }
 
-function writeSiteDestination(id_site, id_place, date_start, date_end, name, funzione) {
+function writeSiteDestination(id_site, id_place, date_start, date_end, name, funzione, is_removed) {
     var dt_start = convertDateToStringDB(date_start);
     var dt_end = convertDateToStringDB(date_end);
 
-    var query = "insert into site_destinations (id_site, id_place, date_start, date_end, name, type) values ";
+    var query = "insert into site_destinations (id_site, id_place, date_start, date_end, name, type, is_removed) values ";
     query += "(" + id_site + ", ";
     query += "'" + id_place + "', ";
     query += "'" + dt_start + "', ";
     query += "'" + dt_end + "', ";
     query += "'" + name + "', ";
-    query += "'" + funzione + "' ";
+    query += "'" + funzione + "', ";
+    query += is_removed + " ";
     query += ")";
     return query;
 }
 
-function updateSiteDestination(id_site, id_place, date_start, date_end, name, funzione) {
+function updateSiteDestination(id_site, id_place, date_start, date_end, name, funzione, is_removed) {
     var dt_start = convertDateToStringDB(date_start);
     var dt_end = convertDateToStringDB(date_end);
 
@@ -13223,6 +13227,9 @@ function updateSiteDestination(id_site, id_place, date_start, date_end, name, fu
         query += ", type = '" + funzione + "' ";
     }
     query += "where id_site = " + id_site + " and id_place = '" + id_place + "'";
+    if (is_removed) {
+        query += ", is_removed = " + is_removed + " ";
+    }
     return query;
 }
 
@@ -13266,7 +13273,7 @@ function updateSiteDestinationAfterMove(db_used, id_site, id_place, date_start,
 }
 
 function getSiteDestinationsByIdSite(id_site, id_place) {
-    var query = "select date_start, date_end, name, type from site_destinations ";
+    var query = "select date_start, date_end, name, type, is_removed from site_destinations ";
     query += "where id_site = " + id_site + " and id_place = '" + id_place + "' ";
     query += "order by date_start desc ";
     return query;
@@ -13956,7 +13963,7 @@ function removeDeviceFromAllSites(db_used, id_device) {
 //Get Sites for Combo
 function getSitesSelectComboSQLite(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
-    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join site_destinations sd on sd.id_site = s.id and sd.id_place = s.id_place ";
     query += "join places p on p.mark = s.id_place ";
     query += "where date('now') >= sd.date_start and date('now') <= sd.date_end ";
     if (id_place || tipo_aula) {
@@ -13977,7 +13984,7 @@ function getSitesSelectComboSQLite(id_place, tipo_aula) {
 
 function getSitesSelectComboMySQL(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
-    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join site_destinations sd on sd.id_site = s.id and sd.id_place = s.id_place ";
     query += "join places p on p.mark = s.id_place ";
     query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
     if (id_place || tipo_aula) {
@@ -13998,7 +14005,7 @@ function getSitesSelectComboMySQL(id_place, tipo_aula) {
 
 function getSitesSelectComboMySQL2(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
-    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join site_destinations sd on sd.id_site = s.id and sd.id_place = s.id_place ";
     query += "join places p on p.mark = s.id_place ";
     query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
     if (id_place || tipo_aula) {

package/package.json

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