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

FCLT-SUP#43187 Actie bij melder zetten ontbreekt op mobile

Browse Source 
svn path=/Website/branches/v2017.2/; revision=35547
This commit is contained in:
Erik Groener
2017-10-04 08:09:35 +00:00
parent 1eff8346bb
commit 17504d35a2
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/mld_show_note2.asp
View File

@@ -425,7 +425,7 @@ var timestamp_notes = new Date();
var actie_bij_melder = (note_zichtbaarFE && S("mld_note_default_notifyFE")==1 ? true : false);
// We doen aan pingpongen
Response.Write("<span id='notioption'"+(note_zichtbaarFE? "style='display:inline'" :" style='display:none'")+">");
CHECKBOX("fldcheck", "notifyFE", actie_bij_melder); /* compatible ware: note_zichtbaarFE, maar dit lijkt mij beter */
CHECKBOX("fldcheck", "notifyFE", actie_bij_melder);
Response.Write("<label for='notifyFE'>{0}</label></span>".format(L("lcl_mld_toekennen_FE")));
}
}

17
APPL/PDA/notitie.asp
View File

@@ -49,7 +49,7 @@ var sql = "";
lcl.set_dialect(mld_info.srtdisc, "MLD_SRTDISCIPLINE_KEY");
pnote.subject = mld_info.prefix + pkey;
pnote.fenotes = mld_info.fenotes;
pnote.zichtbaar = (mld_info.fenotes & 1);
pnote.zichtbaar = (mld_info.fenotes == 1 || mld_info.fenotes == 3 );
pnote.eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.melder_key);
if (pnote.canwritenotes)
@@ -280,9 +280,12 @@ var sql = "";
var noti = $(deze).prop("checked");
$("#notioption").css("display", noti ? "inline":"none");
if (noti)
$("#notifyFE").prop("checked", <%=S("mld_note_default_notifyfe") == 1? 1 : 0%> == 1);
{
var v_actie_bij_melder = <%=(S("mld_note_default_notifyFE") == 1? 1 : 0)%> == 1;
$("#notifyFE").prop("checked", v_actie_bij_melder).checkboxradio("refresh");
}
else
$("#notifyFE").prop("checked", false);
$("#notifyFE").prop("checked", false).checkboxradio("refresh");
}
</script>
<%
@@ -299,13 +302,15 @@ var sql = "";
{
if (pnote.note_key == -1 && !pnote.eigenMelding && pnote.fenotes != 1)
{
// keuze voor wel of niet zichtbaar FE
CHB_FIELD("zichtbaarFE", "<nobr>" + L("lcl_mld_zichtbaar_FE") + "</nobr>", pnote.zichtbaar, {disabled: false, onclick: "notiToggler(this)"});
if (S("mld_flag_on_fenote")>0 && pnote.fenotes>0)
if (S("mld_flag_on_fenote"))
{
var actie_bij_melder = (pnote.zichtbaar && S("mld_note_default_notifyFE")==1 ? true : false);
var actie_bij_melder = (pnote.zichtbaar && S("mld_note_default_notifyFE")==1 ? 1 : 0);
Response.Write("<span id='notioption'"+(pnote.zichtbaar? "style='display:inline'" :" style='display:none'")+">");
CHB_FIELD("notifyFE", "<nobr>" + L("lcl_mld_toekennen_FE") + "</nobr>", actie_bij_melder, {disabled: false});
Response.Write("<label for='notifyFE'>{0}</label></span>".format(L("lcl_mld_toekennen_FE")));
Response.Write("</span>");
}
}
else