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

FCLT#41606 bolletjes met setting zichtbaar voor FE

Browse Source 
svn path=/Website/trunk/; revision=41190
This commit is contained in:
Peter Feij
2019-02-27 11:04:25 +00:00
parent 3eb5731ff5
commit ccd36fe97a
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/FAC/fac_list.asp
View File

@@ -165,10 +165,10 @@ function fnExtra1(oRs)
{
var txt= "";
switch (oRs.Fields("xmlnode").Value) {
case "melding": txt = (oRs.Fields("extra1").Value ? L("lcl_mld_flag"+oRs.Fields("extra1").Value) : ""); break;
case "reservering": txt = (oRs.Fields("extra1").Value ? L("lcl_res_flag"+oRs.Fields("extra1").Value) : ""); break;
case "melding": txt = (oRs.Fields("extra1").Value ? "<i class='fa fa-circle mldflag"+oRs.Fields("extra1").Value+"'></i>&nbsp;"+L("lcl_mld_flag"+oRs.Fields("extra1").Value) : ""); break;
case "reservering": txt = (oRs.Fields("extra1").Value ? "<i class='fa fa-circle resflag"+oRs.Fields("extra1").Value+"'></i>&nbsp;"+L("lcl_res_flag"+oRs.Fields("extra1").Value) : ""); break;
case "afspraak": txt = (oRs.Fields("extra1").Value ? "<i class='fa fa-circle bezflag"+oRs.Fields("extra1").Value+"'></i>&nbsp;"+L("lcl_bez_flag"+oRs.Fields("extra1").Value) : ""); break;
case "bestelling":
case "afspraak":
case "deel": txt = ""; break;
}
return txt;
@@ -694,7 +694,7 @@ function sqlTracking(refkey, node)
+ " , NULL satisfaction_op"
+ " , NULL status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , b.bez_bezoekers_flag extra1"
+ " , NULL startdatum" // aanmaakdatum hebben we niet
+ sqlTracking('b.bez_afspraak_key', 'afspraak')
+ " FROM bez_bezoekers b"
@@ -714,7 +714,7 @@ function sqlTracking(refkey, node)
+ " , NULL satisfaction_op"
+ " , NULL status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , b.bez_bezoekers_flag extra1"
+ " , NULL startdatum" // aanmaakdatum hebben we niet
+ sqlTracking('b.bez_afspraak_key', 'afspraak')
+ " FROM bez_bezoekers b"
@@ -768,8 +768,9 @@ function sqlTracking(refkey, node)
rst.addColumn(new Column({caption: L("lcl_descr"), content: "detail"}));
rst.addColumn(new Column({caption: L("lcl_status"), content: fnstatus}));
if ((faclist_mode & 2) == 2)
rst.addColumn(new Column({caption: L("lcl_fac_laatste_actie"), content: "recentdatum", datatype: "datetime", prettydate: true})); // experiment
rst.addColumn(new Column({caption: L("lcl_fac_extra1"), content: fnExtra1}));
rst.addColumn(new Column({caption: L("lcl_fac_laatste_actie"), content: "recentdatum", datatype: "datetime", prettydate: true})); // experiment
if (urole == "fo" || (urole == "fe" && S("fac_flags_visible_for_fe") == 1))
rst.addColumn(new Column({caption: L("lcl_fac_extra1"), content: fnExtra1}));
if (S("facilities_flike_past") >= 0)
rst.addColumn(new Column({caption: L("lcl_fac_oordeel"), content: fnLike}));

15
APPL/MLD/mld_list.inc
View File

@@ -244,12 +244,14 @@ function mld_list (pautfunction, params)
<head>
<%
FCLTHeader.Generate({ outputmode: outputmode });
if (outputmode == 0) {
%>
<script type="text/javascript">
// Text strings used by mld_list.js
var urole = "<%=urole%>";
var setting_mld_accept_confirm = <%=S("mld_accept_confirm")?1:0%>;
</script>
<% } %>
</head>
<body id="listbody">
@@ -483,7 +485,8 @@ function mld_list (pautfunction, params)
+ " recentdatum";
// Voeg de flag toe
sqln += ", m.mld_melding_flag"
sqln += ", m.mld_melding_actiecode"
+ ", m.mld_melding_flag"
+ ", m.mld_melding_satisfaction oordeel"
+ ", m.mld_melding_satisfaction_op oordeel_opm"
@@ -938,19 +941,15 @@ function mld_list (pautfunction, params)
var ttl = L("lcl_mld_flag" + flagkey);
var displ = "";
if (print)
if (print || excel)
{
if (flagkey != 0) displ = safe.html(ttl); // else blijft-ie gewoon leeg
}
else if (excel) // dan gewoon maar de code, handig groeperen
{
displ = flagkey||"";
}
else // maak er dan nog leuke plaatjes van
{
var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
// Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
displ = "<div class='clickParent' " + ((urole == "bo" || urole == "fo") ? "onclick='toggleMldFlag(event, "+ mldkey +");'":"")
displ = "<div " + ((urole == "bo" || urole == "fo") ? "class='clickParent' onclick='toggleMldFlag(event, "+ mldkey +");'":"")
+ " title='"+safe.htmlattr(ttl)+"'>"
+ "<i id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" mldflag"+flagkey+"'></i>"
+ "<span style='display:none'>"+(flagkey||999)+"</span></div>";
@@ -1250,7 +1249,7 @@ function mld_list (pautfunction, params)
totalShow: fntotalShow
});
if (S('mld_melding_flags') > 0 && !frontend)
if (S("mld_melding_flags") > 0 && (!frontend || (frontend && S("fac_flags_visible_for_fe") == 1)))
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-circle") : L("lcl_mld_flags")), content: fncolFlags, align: "center"}));
rst.addColumn(new Column({caption: "!", content: fncolSpoed, hasActions: true}));
rst.addColumn(new Column({caption: L("lcl_mld_number"), datatype: "number", content: fncolKey }));