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

FCLT#56754 Stiekem ook wat RES

Browse Source 
svn path=/Website/trunk/; revision=41363
This commit is contained in:
Peter Feij
2019-03-06 22:07:20 +00:00
parent bae566f73a
commit 55df8f37f8
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -1176,7 +1176,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
<%
var buttons = [ {title: ((restype == "CV" && rsv_ruimte_key == -1) ? L("lcl_res_submit") : L("lcl_submit")), icon:"opslaan.png", action:"res_submit()", singlepress: true, id:"btn_res_submit" },
{title: L("lcl_cancel"), icon: "undo.png", action:"res_cancel()" } ];
IFRAMER_HEADER(L("lcl_res_frame_algemeen"), buttons);
IFRAMER_HEADER(rrr.descript? "R"+rrr.resnrtxt+": "+rrr.descript : L("lcl_res_frame_algemeen"), buttons);
%>
<form name="u2"
@@ -1186,7 +1186,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
<input type='hidden' id='restype' name='restype' value='<%= restype %>'>
<div class='leftcontainer'>
<%
BLOCK_START("resPlaats" , L("lcl_res_plaats"));
BLOCK_START("resPlaats" , I("fa-clock-o")+L("lcl_res_plaats"), {ishtmlsafe: true});
FCLTcalendar( "date_from",
{ label : restype == "CV"? L("lcl_res_starttime_CV") : L("lcl_date"),
datum : rrr.rsv_ruimte_van,
@@ -1478,6 +1478,17 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
scope: (S("res_fo_catering_scopeless") && (fronto || backo) ? 0 : 1)
});
}
if (rrr.srtactiviteit_metomschr)
{
%>
<tr>
<td class="label"><label for="descript"><%=L("lcl_descr")%>:</label></td>
<td><input class="fldresdesc<%=rrr.descript_required && !rrr.res_ruimte_extern? " required":""%>" name="descript" id="descript" <%=ordernr_reado || rrr.res_ruimte_extern ? "readonly " : ""%>
maxlength="60" value="<%=safe.htmlattr(rrr.descript)%>">
</td>
</tr>
<%
}
//======= FIELD 'Status' (alleen te editen door FO) =======
sql = "SELECT 1, " + safe.quoted_sql(res.getfostatustext(1)) + " FROM DUAL"
@@ -1507,7 +1518,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
}
BLOCK_END()
BLOCK_START("resUser",L("lcl_res_info"));
BLOCK_START("resUser",I("fa-user")+L("lcl_res_info"), {ishtmlsafe: true});
%>
<script type="text/javascript">
// Process de data die van de gastheer via Ajax terugkomt.
@@ -1639,17 +1650,6 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
RWFIELDTR("ordernr", "fldordernr", L("lcl_mld_inf_Ordernr"), rrr.res_ordernr,
{readonly: ordernr_reado, maxlength: 30});
}
if (rrr.srtactiviteit_metomschr)
{
%>
<tr>
<td class="label"><label for="descript"><%=L("lcl_descr")%>:</label></td>
<td><input class="fldresdesc<%=rrr.descript_required && !rrr.res_ruimte_extern? " required":""%>" name="descript" id="descript" <%=ordernr_reado || rrr.res_ruimte_extern ? "readonly " : ""%>
maxlength="60" value="<%=safe.htmlattr(rrr.descript)%>">
</td>
</tr>
<%
}
if (rrr.srtactiviteit_metopmerk)
{
RWTEXTAREATR("opmerk", "fldomschr", L("lcl_remark"), rrr.rsv_ruimte_opmerking, {html: "rows='4'" + (ordernr_reado ? " readonly" : ""), maxlength: 2000});
@@ -1661,7 +1661,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
// ============================================================================================================
BLOCK_START("resInfo", rsv_ruimte_key > -1 ? L("lcl_reservation") + " " + rrr.resnrtxt : L("lcl_res_new_reservation"));
BLOCK_START("resInfo", "<span class='resid'>" + (rsv_ruimte_key > -1 ? L("lcl_reservation") + " " + rrr.resnrtxt : L("lcl_res_new_reservation")) + "</span>", {ishtmlsafe: true});
if (rsv_ruimte_key > 0)
{
ROFIELDTR("fldresstatus", L("lcl_status_BO"), res.getbostatustext(rrr.status_bo_key),
@@ -1691,18 +1691,19 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
);
}
else
{
{
if (rrr.status_flag > 0) {
%>
<tr>
<td class="label"><label><%=L("lcl_res_flags")%>:</label></td>
<td>
<span class="readonly fld">
<%=I("fa-circle respl resflag"+rrr.status_flag)%>
<%=L("lcl_res_flag"+rrr.status_flag)%>
<%=I("fa-circle resflag"+rrr.status_flag)+"&nbsp;"+L("lcl_res_flag"+rrr.status_flag)%>
</span>
</td>
</tr>
<%
}
}
}

10
APPL/RES/res_show_rsv_ruimte.asp
View File

@@ -373,7 +373,7 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
buttons.push({ icon: "flike_none.png", title: L("lcl_fac_oordeel"), action: "fac_like()" });
}
IFRAMER_HEADER(L("lcl_res_frame_algemeen"), buttons);
IFRAMER_HEADER(rrr.descript? "R"+rrr.resnrtxt+": "+rrr.descript : L("lcl_res_frame_algemeen"), buttons);
%> <div id="show"><%
if (rrr.rsv_ruimte_dirtlevel & res.dirtlevel.ruimte.notavailable)
{
@@ -404,7 +404,7 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
{
res_ruimte_data = res.res_ruimte_info(rrr.res_ruimte_key);
}
BLOCK_START("resPlaats" , L("lcl_res_plaats"));
BLOCK_START("resPlaats" , I("fa-clock-o")+L("lcl_res_plaats"), {ishtmlsafe: true});
if (rrr.rsv_ruimte_tot.midnight().getTime() == rrr.rsv_ruimte_van.midnight().getTime())
{
@@ -478,10 +478,11 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
no_table: true
});
}
ROFIELDTR("fldresdesc", L("lcl_descr"), rrr.descript, {suppressEmpty: true});
ROFIELDTR("fldresstatus", L("lcl_status_FO"), res.getfostatustext(rrr.status_fo_key));
BLOCK_END()
BLOCK_START("resUser",L("lcl_res_info"));
BLOCK_START("resUser",I("fa-user")+L("lcl_res_info"), {ishtmlsafe: true});
if (rrr.satisfaction)
{
var ttl = rrr.satisfaction_op;
@@ -522,13 +523,12 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
}
ROFIELDTR("fldordernum", L("lcl_mld_inf_Ordernr"), rrr.res_ordernr, {suppressEmpty: true});
ROFIELDTR("fldresdesc", L("lcl_descr"), rrr.descript, {suppressEmpty: true});
ROTEXTAREATR('fldomschr', L("lcl_remark"), rrr.rsv_ruimte_opmerking, {suppressEmpty: true, mldlink: true});
BLOCK_END();
%></div><%
BLOCK_START("resInfo", L("lcl_reservation") + " " + rrr.resnrtxt);
BLOCK_START("resInfo", "<span class='resid'>" + L("lcl_reservation") + " " + rrr.resnrtxt + "</span>", {ishtmlsafe: true});
if (this_res.readoReason)
{