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

HSLE#57268 afgemeld rood bolletje wissen

Browse Source 
svn path=/Website/branches/v2019.1/; revision=42301
This commit is contained in:
Erik Groener
2019-04-30 09:56:41 +00:00
parent f00ea1453b
commit 1317295264
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
APPL/MLD/mld_edit_note.inc
View File

@@ -136,6 +136,7 @@ function note_save(mld_key, note, params)
+ ", " + safe.quoted_sql(txt)
+ ", NULL, NULL, NULL, NULL, 2, " + safe.quoted_sql(sender) + "); END;");
}
if (params.action2FE && (mld_info.actiecode & 2) != 2) // Misschien actie naar FE
{
var sql = "UPDATE mld_melding"
@@ -158,6 +159,18 @@ function note_save(mld_key, note, params)
}
}
}
else // niet zichtbaarFE, maar terugzetten naar backoffice?
{
if (!params.action2FE && (mld_info.actiecode & 1) != 1)
{
var sql = "UPDATE mld_melding"
+ " SET mld_melding_actiecode = 1" // Actie nu bij BO. Zelf gedaan dus geen attentie
+ " WHERE mld_melding_key = " + mld_key;
Oracle.Execute(sql);
shared.trackaction("MLDA2B", mld_key);
result.mustrefreshMLD = true;
}
}
}
}
if (mld_info.nobnotify && params.note_key == -1) // Backoffice nog een echte notificatie sturen bij nieuwe notitie

4
APPL/MLD/mld_show_note2.asp
View File

@@ -45,6 +45,7 @@ var mfe = mld.func_enabled_melding (mld_key);
user.auth_required_or_abort(mfe.canReadNotes);
var hasFOBOMIread = mfe.canFOread || mfe.canBOread || mfe.canMIread;
var actiebijaanvrager = (mld_info.actiecode & 2);
var eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.melder_key);
var afgehandeld = (mld_info.mld_status == 1 || mld_info.mld_status == 5 || mld_info.mld_status == 6);
var canDeleteNoteAttachment = (mld_info.mld_status == 6 ? 0 : 1);
@@ -181,7 +182,8 @@ if (mld_key > 0)
function visToggler(deze)
{
var vis = $(deze).prop('checked');
$('#notioption,#actionoption').css('display', vis ? "inline":"none");
$('#notioption').css('display', (vis ? "inline":"none"));
$('#actionoption').css('display', ((vis || <%=actiebijaanvrager%>) ? "inline":"none"));
if (vis)
$('#action2FE,#notifyFE').prop('checked', <%=S("mld_note_default_notifyFE")%> == 1);
else

4
APPL/PDA/notitie.asp
View File

@@ -54,6 +54,7 @@ var sql = "";
pnote.fenotes = mld_info.fenotes;
pnote.zichtbaar = (mld_info.fenotes == 1 || mld_info.fenotes == 3 );
pnote.eigenMelding = user_key == mld_info.melder_key || user.isCollega(mld_info.melder_key);
pnote.actiebijaanvrager = (mld_info.actiecode & 2);
if (pnote.canwritenotes)
{
@@ -332,7 +333,8 @@ if (pnode == "melding")
function visToggler(deze)
{
var vis = $(deze).prop("checked");
$("#notioption,#actionoption").css("display", vis ? "inline":"none");
$('#notioption').css('display', (vis ? "inline":"none"));
$('#actionoption').css('display', ((vis || <%=pnote.actiebijaanvrager%>) ? "inline":"none"));
if (vis)
$('#action2FE,#notifyFE').prop('checked', <%=S("mld_note_default_notifyFE")%> == 1).checkboxradio("refresh");
else