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

LING#39956 res_hide_remark gaat via opmerkingen. Restjes verwijderen

Browse Source 
svn path=/Website/trunk/; revision=33223
This commit is contained in:
Ruud Lipper
2017-03-23 08:10:55 +00:00
parent 014159fde8
commit 79848ee1e0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -876,7 +876,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
FcltMgr.confirm(L("lcl_res_too_many_visitors"), { autoconfirm: plentyOfRoom, fncancel: function() { iface.button.enable("btn_res_submit"); } }, function() {
<% if ((S("res_hide_remark")==0) || ((S("res_hide_remark")==2) && (rsv_ruimte_key>=0))) { %>
<% if (rrr.srtactiviteit_metopmerk) { %>
if(document.forms.u2.opmerk)
{
s = document.forms.u2.opmerk.value;

13
APPL/RES/res_list.inc
View File

@@ -114,7 +114,7 @@ function res_list (pautfunction, params)
// De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
var authparams = user.checkAutorisation(pautfunction);
var authparamsRESNOS = user.checkAutorisation("WEB_RESNOS", true);
var urole = params.urole;
var fronto = (urole == "fo");
var backo = (urole == "bo");
@@ -194,6 +194,14 @@ function res_list (pautfunction, params)
|| groupres == 12
|| groupres == 13
|| groupres == 14);
// Fast check to see if we remarks are used. To show/hide the colums
var sql= "SELECT 1 FROM res_srtactiviteit WHERE res_srtactiviteit_metopmerk = 1";
oRs = Oracle.Execute(sql);
var hasAnyOpmerkingen = !oRs.eof;
oRs.close();
%>
<html>
@@ -2137,6 +2145,7 @@ function res_list (pautfunction, params)
**********************************************************************/
var recent = new Date();
recent.setMinutes(recent.getMinutes() - S("res_reservering_recent"));
function fnrowClassB(oRs) // tr-class
{
// resR of resC of resV
@@ -2363,7 +2372,7 @@ function res_list (pautfunction, params)
if (S('show_ordernr') == 3 && outputmode != 0)
rst.addColumn(new Column({caption: L("lcl_mld_inf_Ordernr"), content: "res_rsv_ruimte_ordernr" }));
rst.addColumn(new Column({caption: L("lcl_descr"), content: "omschrijving"}));
if (!S("res_hide_remark"))
if (hasAnyOpmerkingen)
rst.addColumn(new Column({caption: L("lcl_remark"), content: "opmerking"}));
if (outputmode != 0)