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

AAIT#35858 Brainstorm vraagje: Iemand als totale gedelegeerde aan kunnen wijzen

Browse Source 
svn path=/Website/trunk/; revision=32749
This commit is contained in:
Erik Groener
2017-02-08 14:00:00 +00:00
parent 85dd452647
commit adb88a8b85
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
APPL/FAC/fac_user_messages.asp
View File

@@ -70,17 +70,27 @@ var buttons = [];
if (user_key != -1)
{
function fncolReceiver(oRs)
{
return (oRs("prs_perslid_key_receiver").Value == user_key ? "" : oRs("receiver_name").Value);
}
var prsKeys = (user.hasCollegas() ? user.collegakeylist() : user_key);
var sql = "SELECT m.web_user_mess_dsc"
+ ", sn.fac_srtnotificatie_url"
+ ", COALESCE(m.web_user_mess_action_params, ' ') web_user_mess_action_params"
+ ", m.web_user_mess_action_status"
+ ", m.web_user_mess_action_datum"
+ ", m.web_user_message_key"
+ ", web_user_mess_prioriteit"
+ " FROM web_user_messages m, fac_srtnotificatie sn"
+ " WHERE (m.prs_perslid_key_receiver = " + user_key
+ ", sn.fac_srtnotificatie_url"
+ ", COALESCE(m.web_user_mess_action_params, ' ') web_user_mess_action_params"
+ ", m.web_user_mess_action_status"
+ ", m.web_user_mess_action_datum"
+ ", m.web_user_message_key"
+ ", m.prs_perslid_key_receiver"
+ ", web_user_mess_prioriteit"
+ ", " + S("prs_pers_string") + " receiver_name"
+ " FROM web_user_messages m, fac_srtnotificatie sn, prs_perslid p"
+ " WHERE (m.prs_perslid_key_receiver IN (" + prsKeys + ")"
+ " OR m.prs_perslid_key_receiver IS NULL) " // General messages
+ " AND sn.fac_srtnotificatie_key(+)=m.fac_srtnotificatie_key"
+ " AND sn.fac_srtnotificatie_key(+)=m.fac_srtnotificatie_key"
+ " AND m.prs_perslid_key_receiver = p.prs_perslid_key"
+ " ORDER BY m.web_user_mess_action_datum DESC, m.web_user_message_key DESC";
// Tweeledig: beperken, maar tevens zorgen dat de sortering goed blijft!
@@ -98,6 +108,8 @@ var buttons = [];
outputmode: outputmode,
buttons: buttons
});
if (user.hasCollegas())
rst.addColumn(new Column({caption: L("lcl_name"), content: fncolReceiver, nowrap: true }));
rst.addColumn(new Column({caption: L("lcl_date"), content: "web_user_mess_action_datum", datatype: "datetime", prettydate: true, nowrap: true }));
rst.addColumn(new Column({caption: L("lcl_message"), content: "web_user_mess_dsc"}));
rst.addAction({ action: "DoAction", caption: "", enabler:"eDefault", isDefault: true });