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

FCLT#43129 Vlaggen onderdrukken die vroeger voor communicatie gebruikt werden

Browse Source 
svn path=/Website/trunk/; revision=41514
This commit is contained in:
Jos Groot Lipman
2019-03-12 14:50:59 +00:00
parent a2060c5ab8
commit 0c25e05b38
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/MLD/mld_edit_melding.asp
View File

@@ -1162,13 +1162,14 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
if ((urole == "bo" || urole == "fo") && S("mld_melding_flags") > 0)
{
var mldflagnr = mld_melding.flag || 0;
sql = "";
var sqla = [];
for (var i=0; i<S("mld_melding_flags"); i++)
{
sql += "SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL" + (i<(parseInt(S("mld_melding_flags"))-1)?" UNION ALL ":"");
if (i != S("mld_flag_on_fenote") && i != S("mld_flag_on_bonote"))
sqla.push("SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL");
}
FCLTselector("mldflag",
sql,
sqla.join(" UNION ALL "),
{ initKey: mld_melding.flag,
label: L("lcl_mld_flags")
});

7
APPL/MLD/mld_flag.asp
View File

@@ -23,8 +23,11 @@ user.auth_required_or_abort(mfe.canWriteFlags);
var result = {};
flagkey += 1;
flagkey = flagkey % S('mld_melding_flags'); // cycle door de waarden 0, 1, 2, 3.
flagkey = (flagkey+1) % S('mld_melding_flags'); // cycle door de waarden 0, 1, 2, 3.
if (flagkey == S("mld_flag_on_fenote") || flagkey == S("mld_flag_on_bonote"))
flagkey = (flagkey+1) % S('mld_melding_flags');
if (flagkey == S("mld_flag_on_fenote") || flagkey == S("mld_flag_on_bonote"))
flagkey = (flagkey+1) % S('mld_melding_flags');
var updatesql = "UPDATE mld_melding"
+ " SET mld_melding_flag = " + flagkey

7
APPL/MLD/mld_forward.asp
View File

@@ -317,13 +317,14 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
if ((urole == "bo" || urole == "fo") && (S("mld_melding_flags") > 0))
{
var mldflagnr = mld_melding.flag || 0;
sql = "";
var sqla = [];
for (var i=0; i<S("mld_melding_flags"); i++)
{
sql += "SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL" + (i<(parseInt(S("mld_melding_flags"))-1)?" UNION ALL ":"");
if (i != S("mld_flag_on_fenote") && i != S("mld_flag_on_bonote"))
sqla.push("SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL");
}
FCLTselector("mldflag",
sql,
sqla.join(" UNION ALL "),
{ initKey: mld_melding.flag,
label: L("lcl_mld_flags")
});

3
APPL/MLD/mld_search.asp
View File

@@ -904,7 +904,8 @@ oRs.close();
{
for (flagkey=0; flagkey < S("mld_melding_flags"); flagkey++)
{
RWCHECKBOXTR("flag"+flagkey, "fldcheck", "<i class='fa "+ (flagkey==0?"fa-circle-o":"fa-circle")+" mldflag"+flagkey+" mlds'></i>&nbsp;"+safe.html(L("lcl_mld_flag"+flagkey)), 1, { boxfirst: true, twocols: true });
if (flagkey != S("mld_flag_on_fenote") && flagkey != S("mld_flag_on_bonote"))
RWCHECKBOXTR("flag"+flagkey, "fldcheck", "<i class='fa "+ (flagkey==0?"fa-circle-o":"fa-circle")+" mldflag"+flagkey+" mlds'></i>&nbsp;"+safe.html(L("lcl_mld_flag"+flagkey)), 1, { boxfirst: true, twocols: true });
}
}
if (!frontend)

7
APPL/PDA/melding.asp
View File

@@ -917,13 +917,14 @@ if (action != "forward")
if ((this_mld.canBOWrite || this_mld.canFOwrite) && (S("mld_melding_flags") > 0))
{
var mldflagnr = mld_info.flag || 0;
sql = "";
var sqla = [];
for (var i=0; i<S("mld_melding_flags"); i++)
{
sql += "SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL" + (i<(parseInt(S("mld_melding_flags"))-1)?" UNION ALL ":"");
if (i != S("mld_flag_on_fenote") && i != S("mld_flag_on_bonote"))
sqla.push("SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL");
}
FCLTselector("mldflag",
sql,
sqla.join(" UNION ALL "),
{ initKey: mld_info.flag,
label: L("lcl_mld_flags"),
mobile: true

5
APPL/PDA/mld_list.asp
View File

@@ -536,7 +536,10 @@ var authparams = user.checkAutorisation(autfunction);
if (S('mld_melding_flags') > 1)
{
for (flagkey=0; flagkey < S("mld_melding_flags"); flagkey++)
{ %>
{
if (flagkey == S("mld_flag_on_fenote") || flagkey == S("mld_flag_on_bonote"))
continue; // die onderdrukken
%>
<label for="flag<%=flagkey%>"><input type="checkbox" name="flag<%=flagkey%>" data-mini="true" id="flag<%=flagkey%>" <%=((checkboxParams[flagkey] == "on") ? "checked" : "")%>><i class="fa <%=flagkey==0?"fa-circle-o":"fa-circle"%> mldflag<%=flagkey%> mlds"></i>&nbsp;<%=safe.html(L("lcl_mld_flag"+flagkey))%></label><%
}
}