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

DENB#56126 mobile ook S(res_default_cvab_mode) in acht nemen, en meegeven van &roo_key ondersteunen

Browse Source 
svn path=/Website/trunk/; revision=41112
This commit is contained in:
Koen Reefman
2019-02-22 09:11:16 +00:00
parent d96397fbb5
commit c5a1868b84
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/PDA/reservering.asp
View File

@@ -147,7 +147,7 @@ else
var ruimtekey = getQParamInt("res_ruimte_key", null);
var alg_ruimtekey = getQParamInt("roo_key", null);
if (!res_van && !ruimtekey && !alg_ruimtekey)
if (!res_van || (!ruimtekey && !alg_ruimtekey))
{
Server.Transfer("reservering_new.asp"); // Ga maar eerst datum kiezen
}

8
APPL/PDA/reservering_new.asp
View File

@@ -149,6 +149,8 @@ if (rsv_ruimte_key == -1)
var res_duur = oRs("res_activiteit_duur").Value;
var res_verp = oRs("res_activiteit_aantalverplicht").Value;
cvab = oRs("res_activiteit_cvab_mode").Value;
if (cvab == null) // 0 is ook een correcte waarde.
cvab = S("res_default_cvab_mode");
oRs.Close();
// determine minimum expire days
@@ -387,16 +389,16 @@ if (rsv_ruimte_key == -1)
var purl = "?rsv_ruimte_key=-1"
+ "&date_from=" + datum
+ "&date_to=" + $("#date_to").val()
+ (typeof cvab != 'undefined' && (cvab % 1) === 0 ? "&cvab=" + cvab : "")
+ (typeof cvab != "undefined" && (cvab % 1) === 0 ? "&cvab=" + cvab : "")
+ (bezoekers ? "&bez_cnt=" + bezoekers : "")
+ "<%=safe.jsstring(transitParam)%>";
purl = "plaatsselector.asp"
+ "?act_key=" + activiteit
+ "<%=safe.jsstring(transitParamPlaats)%>"
+ "&filtCode="+<%=(restype == "R" ? "\"RES\"" : "(cvab & 1 ? \"RESB\" : \"RESA\")")%>
+ "&filtCode=<%=(restype == "R" ? "RES" : (cvab & 1 ? "RESB" : "RESA"))%>"
+ "&autlevel=<%=autlevel%>"
+ "&eindlevel="+<%=(restype == "R" ? "\"2\"" : "(cvab & 1 ? \"5\" : \"2\")")%>
+ "&eindlevel=<%=(restype == "R" ? "2" : (cvab & 1 ? "5" : "2"))%>"
+ "&return_to=<%=safe.url("reservering_new.asp")%>" + encodeURIComponent(purl);
window.location.href = purl;