alsmanager_lib 3.0.97 → 3.0.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/modules.js +6 -6
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -11709,7 +11709,7 @@ function getSitesSelectComboByPlace(db_used, id_place, floor, date_ref) {
|
|
|
11709
11709
|
//End Site in Combo Parziale
|
|
11710
11710
|
// Select Site in Combo Parziale
|
|
11711
11711
|
function getSitesSelectComboExcludeIdSQLite(id_place, id_site, date_ref) {
|
|
11712
|
-
var query = "select s.id, concat(sd.name, ' - ', s.mark) as Descrizione from sites s ";
|
|
11712
|
+
var query = "select s.id, concat('Piano ', s.floor, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
|
|
11713
11713
|
query += "join site_destinations sd on sd.id_site = s.id ";
|
|
11714
11714
|
if (date_ref) {
|
|
11715
11715
|
query += "where '" + date_ref + "' >= sd.date_start and '" + date_ref + "' <= sd.date_end ";
|
|
@@ -11719,12 +11719,12 @@ function getSitesSelectComboExcludeIdSQLite(id_place, id_site, date_ref) {
|
|
|
11719
11719
|
}
|
|
11720
11720
|
query += "and s.id <> " + id_site + " ";
|
|
11721
11721
|
query += "and s.id_place = '" + id_place +"' ";
|
|
11722
|
-
query += "order by sd.name ";
|
|
11722
|
+
query += "order by s.floor, sd.name ";
|
|
11723
11723
|
return query;
|
|
11724
11724
|
}
|
|
11725
11725
|
|
|
11726
11726
|
function getSitesSelectComboExcludeIdMySQL(id_place, id_site, date_ref) {
|
|
11727
|
-
var query = "select s.id, concat(sd.name, ' - ', s.mark) as Descrizione from sites s ";
|
|
11727
|
+
var query = "select s.id, concat('Piano ', s.floor, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
|
|
11728
11728
|
query += "join site_destinations sd on sd.id_site = s.id ";
|
|
11729
11729
|
if (date_ref) {
|
|
11730
11730
|
query += "where :date_ref >= sd.date_start and :date_ref <= sd.date_end ";
|
|
@@ -11734,12 +11734,12 @@ function getSitesSelectComboExcludeIdMySQL(id_place, id_site, date_ref) {
|
|
|
11734
11734
|
}
|
|
11735
11735
|
query += "and s.id <> :id_site ";
|
|
11736
11736
|
query += "and s.id_place = :id_place ";
|
|
11737
|
-
query += "order by sd.name ";
|
|
11737
|
+
query += "order by s.floor, sd.name ";
|
|
11738
11738
|
return query;
|
|
11739
11739
|
}
|
|
11740
11740
|
|
|
11741
11741
|
function getSitesSelectComboExcludeIdMySQL2(id_place, id_site, date_ref) {
|
|
11742
|
-
var query = "select s.id, concat(sd.name, ' - ', s.mark) as Descrizione from sites s ";
|
|
11742
|
+
var query = "select s.id, concat('Piano ', s.floor, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
|
|
11743
11743
|
query += "join site_destinations sd on sd.id_site = s.id ";
|
|
11744
11744
|
if (date_ref) {
|
|
11745
11745
|
query += "where '" + date_ref + "' >= sd.date_start and '" + date_ref + "' <= sd.date_end ";
|
|
@@ -11749,7 +11749,7 @@ function getSitesSelectComboExcludeIdMySQL2(id_place, id_site, date_ref) {
|
|
|
11749
11749
|
}
|
|
11750
11750
|
query += "and s.id <> " + id_site + " ";
|
|
11751
11751
|
query += "and s.id_place = '" + id_place +"' ";
|
|
11752
|
-
query += "order by sd.name ";
|
|
11752
|
+
query += "order by s.floor, sd.name ";
|
|
11753
11753
|
return query;
|
|
11754
11754
|
}
|
|
11755
11755
|
|