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

UWVA#36890 RES: de 'alleen FO' activiteit Evenement is kiesbaar wanneer dit niet hoort

Browse Source 
svn path=/Website/trunk/; revision=31094
This commit is contained in:
Erik Groener
2016-10-14 10:08:53 +00:00
parent f8054594c6
commit b5a6638825
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -199,7 +199,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
+ " where rr.res_ruimte_key = " + res_ruimte_key
+ " and rad.res_discipline_key = rr.res_discipline_key"
+ " and rad.res_activiteit_key = ra.res_activiteit_key";
if (feonly)
if (autfunction == "WEB_RESUSE")
sql += " AND ra.res_activiteit_notfrontend = 0"
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
@@ -535,7 +535,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
+ " WHERE ad.res_discipline_key = rd.res_ins_discipline_key"
+ " AND ad.res_activiteit_key = ra.res_activiteit_key"
+ " AND ra.res_srtactiviteit_key = " + srtact;
if (feonly)
if (autfunction == "WEB_RESUSE")
sql += " AND ra.res_activiteit_notfrontend = 0"
var oRsa = Oracle.Execute(sql);
rrr.fe_expire_dagen = oRsa(0).Value || 0;
@@ -1034,9 +1034,9 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
+ " AND a.res_srtactiviteit_key = sa.res_srtactiviteit_key"
+ " AND sa.res_srtactiviteit_key = " + srtact
+ " AND sa.res_srtactiviteit_soort = " + (restype == "R"? "0" : "1")
+ " AND EXISTS (SELECT res_activiteit_key"
+ " FROM res_activiteitdiscipline rad,"
+ " ins_tab_discipline disc"
+ " AND EXISTS (SELECT rad.res_activiteit_key"
+ " FROM res_activiteitdiscipline rad"
+ " , ins_tab_discipline disc"
+ " , fac_v_my_disciplines md"
+ " WHERE rad.res_discipline_key = md.ins_discipline_key"
+ " AND md.prs_perslid_key = " + user_key
@@ -1053,7 +1053,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
+ (getQParamInt("activiteit_key", -1) > 0
? " AND a.res_activiteit_key = " + getQParamInt("activiteit_key", -1)
: "")
+ (feonly
+ (autfunction == "WEB_RESUSE"
? " AND a.res_activiteit_notfrontend = 0"
: "")
+ (res_deel_key > 0 || res_artikel_key > 0