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

FSN#35992 Melding notitie zet niet per se actie bij melder

Browse Source 
svn path=/Website/trunk/; revision=31635
This commit is contained in:
Jos Groot Lipman
2016-11-23 12:27:16 +00:00
parent 06fdf8b4f5
commit c831578805
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/MLD/mld_edit_note.inc
View File

@@ -73,12 +73,12 @@ function note_save(mld_key, note, params)
txt = txt.substr(0, 80);
txt = txt + "...";
// Door de omschrijving expliciet te prefixen met een # wordt een event niet genotificeerd
mld.trackaddnote(mld_key, (eigenMelding? "#" : "") + txt); // MLDNOT tracking. Notificatie naar melder afhankelijk van setting voor fac_srtnotificatie_code
mld.trackaddnote(mld_key, (eigenMelding || !params.notifyFE? "#" : "") + txt); // MLDNOT tracking. Notificatie naar melder afhankelijk van setting voor fac_srtnotificatie_code
}
if (!params.isFE && zichtbaarFE)
{
if (S("mld_flag_on_fenote") > 0) // Misschien 'notificeren' naar FE
if (S("mld_flag_on_fenote") > 0 && params.notifyFE) // Misschien 'notificeren' naar FE
{
var sql = "UPDATE mld_melding"
+ " SET mld_melding_flag = " + S("mld_flag_on_fenote")

7
APPL/MLD/mld_edit_note_save.asp
View File

@@ -29,9 +29,10 @@ var changedby = note_recently_changed(mld_key, notestamp);
var note_key =
note_save(mld_key,
getFParam("note", ""),
{ note_key: getQParamInt("note_key", -1),
isFE: getQParam("urole","") == "fe",
zichtFE: getFParam("zichtbaarFE", "off" ) == "on" });
{ note_key: getQParamInt("note_key", -1),
isFE: getQParam("urole","") == "fe",
zichtFE: getFParam("zichtbaarFE", "off" ) == "on",
notifyFE: getFParam("notifyFE", "off" ) == "on" });
var result = {success: true,
mld_key: mld_key,

28
APPL/MLD/mld_show_note2.asp
View File

@@ -109,6 +109,13 @@ var timestamp_notes = new Date();
params.appendurl = "tmp_note=" + $("#note").val() + "&parent_reload=1";
FcltMgr.reload(params);
}
function notiToggler(deze)
{
var noti = $(deze).prop('checked');
$('#notifyFE').prop('disabled', !noti);
if (!noti)
$('#notifyFE').prop('checked', false);
}
$(function () {
$('textarea').autogrow();
@@ -279,20 +286,23 @@ var timestamp_notes = new Date();
{
safehtml = safe.fclthtml(note_oms, true);
var edittm = timestr;
var cls = '';
var cls = 'mldhtime';
var cls_tr = (srtnoti?" trtrack": "");
var note_zichtbaar_class = (note_zichtbaar?"note_fe_visible":(srtnoti?"" :"note_fe_hidden"));
if (LastIsSelfNote)
{
edittm = "<img src='../pictures/wijzigen.png' onclick='mld_notechange(" + last_note_key + ")' class='details' title='" + L("lcl_change") + "'></img>";
edittm = "<i class='fa fa-edit fa-fw fa-lg details' onclick='mld_notechange(" + last_note_key + ")' title='" + L("lcl_change") + "'></i>";
var cls = " mldnoteedit";
}
if (!note_zichtbaar && !srtnoti)
edittm += "<i class='fa fa-lock fa-fw fa-lg' title='{0}'></i>".format(L("lcl_mld_verborgen_FE"));
if (safehtml.length > S("rs_maxchar") * 5)
{
safehtml = "<div class='notetoggler'>{0}</div>".format(safehtml)
+ "<span class='notetoggler'>" + L("lcl_rs_truncated") + "</span>";
}
Response.Write("<tr class='mldhandlingdiv"+clsself+cls_tr+"'><td class='mldhtime " + cls + "'>{0}</td><td class='mldhandlingnote {1}'>{2}</td></tr>".format(edittm, note_zichtbaar_class, safehtml));
Response.Write("<tr class='mldhandlingdiv"+clsself+cls_tr+"'><td class='" + cls + "'>{0}</td><td class='mldhandlingnote {1}'>{2}</td></tr>".format(edittm, note_zichtbaar_class, safehtml));
}
else if (srtnoti)
@@ -350,9 +360,17 @@ var timestamp_notes = new Date();
if (mld_info.fenotes & 2 || mld_info.fenotes == 0)
{
if (note_key == -1 && !eigenMelding)
RWCHECKBOXTR("zichtbaarFE", "fldcheck", "<nobr>" + L("lcl_mld_zichtbaar_FE") + "</nobr>", note_zichtbaar, { boxfirst: true } );
{
CHECKBOX("fldcheck", "zichtbaarFE", note_zichtbaar, { html: "onchange='notiToggler(this)'" });
Response.Write("<label for='zichtbaarFE'>{0}</label>".format(L("lcl_mld_zichtbaar_FE")));
if (S("mld_flag_on_fenote") > 0)
{
CHECKBOX("fldcheck", "notifyFE", note_zichtbaar, { html: note_zichtbaar?"":" disabled=1" });
Response.Write("<label for='notifyFE'>{0}</label>".format(L("lcl_mld_toekennen_FE")));
}
}
else
Response.Write("<tr><td></td><td>{0}: {1}</td></tr>".format(L("lcl_mld_zichtbaar_FE"), note_zichtbaar?L("lcl_Yes"):L("lcl_No")));
Response.Write("{0}: {1}".format(L("lcl_mld_zichtbaar_FE"), note_zichtbaar?L("lcl_Yes"):L("lcl_No")));
}
IFACE.FORM_END();
%>