admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zelfde alias (r) voor res_reservering en res_ruimte gebruikt. gewijzigd in r en rr.

Browse Source 
svn path=/Website/trunk/; revision=29596
This commit is contained in:
Erik Groener
2016-06-01 09:04:49 +00:00
parent 85146c2cdb
commit b1f8ef9dfc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/RES/res_list.inc
View File

@@ -348,7 +348,7 @@ function res_list (pautfunction, params)
+ ", rm.res_status_fo_key"
+ ", rm.res_rsv_ruimte_flag"
+ ", rm.res_rsv_ruimte_dirtlevel dirtlevel"
+ "," + lcl.xsql('r.res_ruimte_nr', 'r.res_ruimte_key') + " waar"
+ "," + lcl.xsql('rr.res_ruimte_nr', 'rr.res_ruimte_key') + " waar"
+ ", res_rsv_ruimte_van datumvan"
+ ", res_rsv_ruimte_tot datumtot"
+ ", pcontact.naam contact"
@@ -362,11 +362,11 @@ function res_list (pautfunction, params)
+ ", rm.res_rsv_ruimte_opmerking remark"
+ ", rm.res_rsv_ruimte_volgnr"
+ ", sa.res_srtactiviteit_prefix"
+ ", r.res_ruimte_vervaldatum"
+ ", rr.res_ruimte_vervaldatum"
+ " FROM theResrsv rm"
+ ", res_reservering r"
+ ", res_ruimte_opstelling ro"
+ ", res_ruimte r"
+ ", res_ruimte rr"
+ ", alg_v_ruimte_gegevens_all rg"
+ ", alg_district di"
+ ", res_v_aanwezigalg_ruimte rar"
@@ -378,14 +378,14 @@ function res_list (pautfunction, params)
+ " WHERE rm.res_reservering_key = r.res_reservering_key"
+ " AND rm.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND rg.alg_district_key = di.alg_district_key"
+ " AND ro.res_ruimte_key = r.res_ruimte_key"
+ " AND r.res_ruimte_key = rar.res_ruimte_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
+ " AND rr.res_ruimte_key = rar.res_ruimte_key"
+ " AND rar.alg_ruimte_key = rg.alg_ruimte_key"
+ " AND rm.res_activiteit_key = ract.res_activiteit_key"
+ " AND ract.res_srtactiviteit_key = sa.res_srtactiviteit_key"
+ " AND rar.alg_ruimte_key = (SELECT MIN (rar2.alg_ruimte_key)"
+ " FROM res_v_aanwezigalg_ruimte rar2"
+ " WHERE rar2.res_ruimte_key = r.res_ruimte_key)"
+ " WHERE rar2.res_ruimte_key = rr.res_ruimte_key)"
+ " AND rm.res_rsv_ruimte_contact_key = pcontact.prs_perslid_key"
+ " AND pHost.prs_perslid_key = rm.res_rsv_ruimte_host_key"
+ " AND pcontact.prs_afdeling_key = boom.prs_afdeling_key";
@@ -408,7 +408,7 @@ function res_list (pautfunction, params)
sqlR += " AND ract.res_srtactiviteit_key = " + srtact;
if (room_key_arr.length != 0)
sqlR += " AND r.res_discipline_key IN (" + room_key_arr.join(",") + ")";
sqlR += " AND rr.res_discipline_key IN (" + room_key_arr.join(",") + ")";
// fronto en frontend hebben dezelfde levels.
var sql_onrgoed = "";
@@ -448,7 +448,7 @@ function res_list (pautfunction, params)
// apply 3D authorization to the locations (both ALG and PRS)
sqlR = discx3d (sqlR,
"r.res_discipline_key",
"rr.res_discipline_key",
"di.alg_regio_key",
"rg.alg_district_key",
"rg.alg_locatie_key",