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

UWVA#37141 Notificatie-overrules configureerbaar

Browse Source 
svn path=/Website/trunk/; revision=30155
This commit is contained in:
Peter Feij
2016-07-27 07:24:00 +00:00
parent d91ebed2fb
commit 028b2dd641
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/FAC/fac_user_info.asp
View File

@@ -448,16 +448,16 @@ oRs.Close();
var anyOverrule = oRs(0).Value > 0; var anyOverrule = oRs(0).Value > 0;
oRs.Close(); oRs.Close();
if (itsme && anyOverrule) if (itsme && anyOverrule && S("prs_personal_noti_options")>0)
{ {
BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur")); BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur"));
if (thisUser.noti_niks() == 1 || thisUser.noti_portal() == 1 || thisUser.noti_email() == 1 || thisUser.noti_sms() == 1 || thisUser.noti_popup() == 1) if (thisUser.noti_niks() == 1 || thisUser.noti_portal() == 1 || thisUser.noti_email() == 1 || thisUser.noti_sms() == 1 || thisUser.noti_popup() == 1)
{ {
CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", thisUser.noti_niks(), { html: " disabled" }); CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", thisUser.noti_niks(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal(), { html: " disabled" }); if (S("prs_personal_noti_options")&1) CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email(), { html: " disabled" }); if (S("prs_personal_noti_options")&2) CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms(), { html: " disabled" }); if (S("prs_personal_noti_options")&4) CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup(), { html: " disabled" }); if (S("prs_personal_noti_options")&8) CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup(), { html: " disabled" });
} }
else else
{%> {%>

14
APPL/PRS/prs_edit_perslid.asp
View File

@@ -194,8 +194,8 @@ if (prs_key > 0) // Fotoblokje alleen bij bestaande records
{ {
Response.write("<tr><td style='text-align: right'>"); Response.write("<tr><td style='text-align: right'>");
if (prsauthparams.writeuse) if (prsauthparams.writeuse)
{ {
%><img src='../../appl/Pictures/wijzigen.png' class='details' title='<%=L("lcl_change")%>' onclick='edit_photo(this)'><% %><img src='../../appl/Pictures/wijzigen.png' class='details' title='<%=L("lcl_change")%>' onclick='edit_photo(this)'><%
} }
Response.write("</td><td class='profile'><img id='photo' class='profile' src='" + thisUser.photoinfo().photopaththumb + "'></td></tr>"); Response.write("</td><td class='profile'><img id='photo' class='profile' src='" + thisUser.photoinfo().photopaththumb + "'></td></tr>");
} }
@@ -344,14 +344,14 @@ var oRs = Oracle.Execute(sql);
var anyOverrule = oRs(0).Value > 0; var anyOverrule = oRs(0).Value > 0;
oRs.Close(); oRs.Close();
if (prs_key > 0 && (prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule) if (prs_key > 0 && (prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule && S("prs_personal_noti_options") > 0 )
{ {
BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur")); BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur"));
CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", thisUser.noti_niks()); CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", thisUser.noti_niks());
CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal()); if (S("prs_personal_noti_options")&1) CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal());
CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email()); if (S("prs_personal_noti_options")&2) CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email());
CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms()); if (S("prs_personal_noti_options")&4) CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms());
CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup()); if (S("prs_personal_noti_options")&8) CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup());
BLOCK_END(); BLOCK_END();
} }

10
APPL/PRS/prs_show_perslid.asp
View File

@@ -374,16 +374,16 @@ var prs_user = new Perslid(prs_key);
var anyOverrule = oRs(0).Value > 0; var anyOverrule = oRs(0).Value > 0;
oRs.Close(); oRs.Close();
if ((prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule) if ((prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule && S("prs_personal_noti_options") > 0)
{ {
BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur")); BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur"));
if (prs_user.noti_niks() == 1 || prs_user.noti_portal() == 1 || prs_user.noti_email() == 1 || prs_user.noti_sms() == 1 || prs_user.noti_popup() == 1) if (prs_user.noti_niks() == 1 || prs_user.noti_portal() == 1 || prs_user.noti_email() == 1 || prs_user.noti_sms() == 1 || prs_user.noti_popup() == 1)
{ {
CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", prs_user.noti_niks(), { html: " disabled" }); CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", prs_user.noti_niks(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", prs_user.noti_portal(), { html: " disabled" }); if (S("prs_personal_noti_options")&1) CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", prs_user.noti_portal(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", prs_user.noti_email(), { html: " disabled" }); if (S("prs_personal_noti_options")&2) CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", prs_user.noti_email(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", prs_user.noti_sms(), { html: " disabled" }); if (S("prs_personal_noti_options")&4) CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", prs_user.noti_sms(), { html: " disabled" });
CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", prs_user.noti_popup(), { html: " disabled" }); if (S("prs_personal_noti_options")&8) CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", prs_user.noti_popup(), { html: " disabled" });
} }
else else
{%> {%>