NYBU#38220 Aantal personen en opstelling wijzigen toch ongewenst.
svn path=/Website/branches/v2016.2/; revision=31256
This commit is contained in:
@@ -518,7 +518,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
|
||||
});
|
||||
</script>
|
||||
<%
|
||||
}
|
||||
} // einde Bestaande reservering
|
||||
|
||||
lcl.set_dialect(srtact, "RES_SRTACTIVITEIT_KEY");
|
||||
|
||||
// Afhankelijk van activiteitsoort de eerstvolgende dag waarop deze reservering mag worden gedaan bepalen.
|
||||
@@ -535,6 +536,29 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
|
||||
rrr.fe_expire_dagen = oRsa(0).Value || 0;
|
||||
oRsa.Close();
|
||||
|
||||
var reado_rsv_ruimte = false;
|
||||
if (rsv_ruimte_key > 0)
|
||||
{
|
||||
var reado_rsv_ruimte = rrr.status_bo_key == 6;
|
||||
}
|
||||
|
||||
// last_minute mag frontend niet meer de zaal of tijdstippen wijzigen
|
||||
// (noch de catering zelf maar dat regelt res_show_objcat.asp)
|
||||
var fe_lastminute = false;
|
||||
|
||||
if (restype == "CV")
|
||||
{
|
||||
reado_rsv_ruimte = ordernr_reado;
|
||||
if (rsv_ruimte_key > 0) // Existing reservation
|
||||
{
|
||||
if (rrr.rsv_ruimte_van < this_res.earliest_expire_change)
|
||||
last_minute = true;
|
||||
else
|
||||
last_minute = false;
|
||||
fe_lastminute = (urole=="fe" && last_minute);
|
||||
}
|
||||
} // restype = "CV"
|
||||
|
||||
%>
|
||||
|
||||
<script type="text/javascript">
|
||||
@@ -575,33 +599,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
|
||||
var sel_room = {RoomConfigs: [], // Hierin houden we clientside informatie over onze gekozen ruimte bij
|
||||
org_opstel_key : <%= rsv_ruimte_key>0?rrr.ruimte_opstel_key||-1:-1 %>
|
||||
};
|
||||
</script>
|
||||
<%
|
||||
var reado_rsv_ruimte = false;
|
||||
if (rsv_ruimte_key > 0)
|
||||
{
|
||||
var reado_rsv_ruimte = rrr.status_bo_key == 6;
|
||||
}
|
||||
|
||||
// last_minute mag frontend niet meer de zaal of tijdstippen wijzigen
|
||||
// (noch de catering zelf maar dat regelt res_show_objcat.asp)
|
||||
var fe_lastminute = false;
|
||||
|
||||
if (restype == "CV")
|
||||
{
|
||||
reado_rsv_ruimte = ordernr_reado;
|
||||
if (rsv_ruimte_key > 0) // Existing reservation
|
||||
{
|
||||
if (rrr.rsv_ruimte_van < this_res.earliest_expire_change)
|
||||
last_minute = true;
|
||||
else
|
||||
last_minute = false;
|
||||
fe_lastminute = (urole=="fe" && last_minute);
|
||||
}
|
||||
} // restype = "CV"
|
||||
|
||||
%>
|
||||
<script type="text/javascript">
|
||||
var srtdisc_kpnverplicht = <%=rrr.srtactiviteit_kpnverplicht%>;
|
||||
var srtdisc_metaantalvis = <%=rrr.srtactiviteit_metaantal ? "true" : "false"%>;
|
||||
var frontend = <%=frontend? 1 : 0%> == 1;
|
||||
@@ -843,32 +841,34 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
|
||||
function rsv_ruimteOnSubmit()
|
||||
{
|
||||
// check if visitors will fit
|
||||
for( i=0; i<sel_room.RoomConfigs.length; i++ ) {
|
||||
for( i=0; i<sel_room.RoomConfigs.length; i++ )
|
||||
{
|
||||
if( sel_room.RoomConfigs[i].ruimte_opstel_key == document.u2.ruimte_opstel.value &&
|
||||
sel_room.RoomConfigs[i].bezoekers > 0 &&
|
||||
sel_room.RoomConfigs[i].bezoekers < document.u2.bezoekers.value ) {
|
||||
sel_room.RoomConfigs[i].bezoekers < document.u2.bezoekers.value )
|
||||
{
|
||||
if( ! confirm( L("lcl_res_too_many_visitors") ) ) return false;
|
||||
}
|
||||
}
|
||||
|
||||
<% if (S("res_247organisation") != 1) { /* Geen popup voor 24/7 organisation */ %>
|
||||
<% if (S("res_247organisation") != 1) { /* Geen popup voor 24/7 organisation */ %>
|
||||
var startDate = new Date(parseInt($('#date_from').val()));
|
||||
if( cal_isVrijeDag(startDate) || cal_isWeekend(startDate))
|
||||
{
|
||||
if( ! confirm( "<%=L("lcl_holiday")%>" ) )
|
||||
if( ! confirm( "<%=L("lcl_holiday")%>" ) )
|
||||
return false;
|
||||
}
|
||||
<% } %>
|
||||
<% if ((S("res_hide_remark")==0) || ((S("res_hide_remark")==2) && (rsv_ruimte_key>=0))) { %>
|
||||
if(document.forms.u2.opmerk)
|
||||
{
|
||||
<% } %>
|
||||
<% if ((S("res_hide_remark")==0) || ((S("res_hide_remark")==2) && (rsv_ruimte_key>=0))) { %>
|
||||
if(document.forms.u2.opmerk)
|
||||
{
|
||||
s = document.forms.u2.opmerk.value;
|
||||
if (s.length > 2000 )
|
||||
document.forms.u2.opmerk.value = s.substring(0,2000);
|
||||
}
|
||||
<% } %>
|
||||
}
|
||||
<% } %>
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
function onChangeStarttijd()
|
||||
@@ -1174,23 +1174,23 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
|
||||
var attrValue = "hasvalue='" + (rsv_ruimte_key == -1 && rrr.res_ruimte_key == -1? "0" : "1") + "'";
|
||||
%>
|
||||
<tr><td class="label"><label for='sel_room'><%=L("lcl_room")%>:</label></td>
|
||||
<td><div id='req_sel_room'>
|
||||
<input type="text" id="sel_room"
|
||||
class="<%=((!rrr.res_ruimte_extern && !readonlyFE) ? "button fldresroomedit required" : "")%> fldresroom"
|
||||
readonly
|
||||
<% if (!rrr.res_ruimte_extern && !readonlyFE) { %>
|
||||
onclick="FindAvailableRooms()"
|
||||
value="<%=L("lcl_res_select_room")%>"
|
||||
<% } else {%>
|
||||
value="<%=safe.html(rri.ruimte_nr)%>"
|
||||
<% } %>
|
||||
name="sel_room" <%=attrValue%> />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<td><div id='req_sel_room'>
|
||||
<input type="text" id="sel_room"
|
||||
class="<%=((!rrr.res_ruimte_extern && !readonlyFE) ? "button fldresroomedit required" : "")%> fldresroom"
|
||||
readonly
|
||||
<% if (!rrr.res_ruimte_extern && !readonlyFE) { %>
|
||||
onclick="FindAvailableRooms()"
|
||||
value="<%=L("lcl_res_select_room")%>"
|
||||
<% } else {%>
|
||||
value="<%=safe.htmlattr(rri.ruimte_nr)%>"
|
||||
<% } %>
|
||||
name="sel_room" <%=attrValue%> />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<!-- Opstelling -->
|
||||
<tr><td class="label"><label for='ruimte_opstel<%=rrr.res_ruimte_extern? "_ro" : ""%>'><%=L("lcl_config") %>:</label></td>
|
||||
<tr><td class="label"><label for='ruimte_opstel<%=rrr.res_ruimte_extern || readonlyFE ? "_ro" : ""%>'><%=L("lcl_config") %>:</label></td>
|
||||
<td>
|
||||
<!--[if lt IE 8]><div id='req_ruimte_opstel' class='fldopstel required'><![endif]-->
|
||||
<% if (rrr.res_ruimte_extern || readonlyFE)
|
||||
@@ -1207,7 +1207,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
|
||||
<% } %>
|
||||
|
||||
<!--[if lt IE 8]></div><![endif]-->
|
||||
<% if (rrr.res_ruimte_extern)
|
||||
<% if (rrr.res_ruimte_extern || readonlyFE)
|
||||
{ %>
|
||||
<input type="hidden" name="ruimte_opstel" id="ruimte_opstel" value="<%=rrr.ruimte_opstel_key%>" />
|
||||
<% } %>
|
||||
|
||||
Reference in New Issue
Block a user