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

FCLT#43129 afhankelijk van setting mld_melding_actiecode

Browse Source 
svn path=/Website/trunk/; revision=41281
This commit is contained in:
Peter Feij
2019-03-04 16:18:17 +00:00
parent 33cfd3cf81
commit 4b8f042b83
6 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/fac_list.asp
View File

@@ -791,7 +791,7 @@ function sqlTracking(refkey, node)
emptySetString: L("lcl_geenfaciliteiten")
});
if (urole == "fe")
if (S("mld_melding_actiecode") == 1)
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-bell-o") : L("lcl_mld_actiecode")), content: fnMark, align: "center"}));
if ((faclist_mode & 1) == 1)
rst.addColumn(new Column({caption: L("lcl_myfacilities_date"), content: "datum", datatype: "datetime", prettydate: true }));

7
APPL/MLD/mld_edit_note_save.asp
View File

@@ -8,13 +8,13 @@
Parameters: mld_key Meldingnummer
note_key notitie key
note notitie tekst
urole
Context: Vanuit mld_edit_note.asp en pda/notitie.asp
Context: Vanuit mld_edit_note.asp, queuemail.asp en pda/notitie.asp
*/
var JSON_Result = true;
var mld_key = getQParamInt("mld_key");
var mailed = getQParamInt("mailed", 0);
var LOCKED_USER_OK = { "xmlnode": "melding", "key": mld_key };
%>
<!-- #include file="../Shared/common.inc" -->
@@ -36,7 +36,8 @@ var result =
zichtFE: getFParam("zichtbaarFE", "off" ) == "on",
notifyFE: getFParam("notifyFE", "off" ) == "on" ,
action2FE: getFParam("action2FE", "off" ) == "on" ,
notifyBO: getFParam("notifyBO", "off" ) == "on" });
notifyBO: getFParam("notifyBO", "off" ) == "on",
ismailnote: mailed });
result.success = true;

3
APPL/MLD/mld_list.inc
View File

@@ -1281,7 +1281,8 @@ function mld_list (pautfunction, params)
totalShow: fntotalShow
});
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-bell-o") : L("lcl_mld_actiecode")), content: fncolActiecode, align: "center"}));
if (S("mld_melding_actiecode") == 1)
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-bell-o") : L("lcl_mld_actiecode")), content: fncolActiecode, align: "center"}));
if (S("mld_melding_flags") > 0 && (!frontend || (frontend && S("fac_flags_visible_for_fe") == 1)))
rst.addColumn(new Column({caption: (outputmode == 0 ? I("fa-circle") : L("lcl_mld_flags")), content: fncolFlags, align: "center"}));
rst.addColumn(new Column({caption: "!", content: fncolSpoed, hasActions: true}));

15
APPL/MLD/mld_search.asp
View File

@@ -908,15 +908,20 @@ oRs.close();
}
if (!frontend)
{
RWCHECKBOXTR("actiecodeFE", "fldcheck", "<i class='fa fa-user-circle-o'></i>&nbsp;"+L("lcl_mld_actiecodeFEchk"), 1, { trclass: "secsearch noxd", boxfirst: true, twocols: true });
RWCHECKBOXTR("actiecodeATT", "fldcheck", "<i class='fa fa-bell-o'></i>&nbsp;"+L("lcl_mld_actiecodeATTchk"), 0, { trclass: "primsearch noxd", boxfirst: true, twocols: true });
if (S("mld_melding_actiecode") == 1)
{
RWCHECKBOXTR("actiecodeFE", "fldcheck", "<i class='fa fa-user-circle-o'></i>&nbsp;"+L("lcl_mld_actiecodeFEchk"), 1, { trclass: "secsearch noxd", boxfirst: true, twocols: true });
RWCHECKBOXTR("actiecodeATT", "fldcheck", "<i class='fa fa-bell-o'></i>&nbsp;"+L("lcl_mld_actiecodeATTchk"), 0, { trclass: "primsearch noxd", boxfirst: true, twocols: true });
}
RWCHECKBOXTR("linked", "fldcheck", L("lcl_mld_showlinked"), (chkShowlinked?1:0), { trclass: "secsearch", boxfirst: true, twocols: true});
RWCHECKBOXTR("respijt", "fldcheck", L("lcl_mld_showrespijt"), (chkShowRespijt?1:0), { trclass: "secsearch", boxfirst: true, twocols: true});
RWCHECKBOXTR("indult", "fldcheck", L("lcl_mld_showindult"), (chkShowIndult?1:0), { trclass: "secsearch", boxfirst: true, twocols: true});
} else {
// Hier zou je zo willen kunnen filteren dat je alleen de "actie vereist" meldingen ziet. Dat is dus de bij-BO (&2) uitzetten
RWCHECKBOXTR("actiecodeBO", "fldcheck", L("lcl_mld_actiecodeBOchk"), 1, { trclass: "primsearch noxd", boxfirst: true, twocols: true });
if (S("mld_melding_actiecode") == 1)
{
// Hier zou je zo willen kunnen filteren dat je alleen de "actie vereist" meldingen ziet. Dat is dus de bij-BO (&2) uitzetten
RWCHECKBOXTR("actiecodeBO", "fldcheck", L("lcl_mld_actiecodeBOchk"), 1, { trclass: "primsearch noxd", boxfirst: true, twocols: true });
}
}
%>
</table>

4
APPL/MLD/mld_show_melding.asp
View File

@@ -566,10 +566,10 @@ function parentButton()
}
if (mld_melding.actiecode & 2 || mld_melding.actiecode & 128) // Bij FE of extra attentie
{
var txt = mld_melding.actiecode & 2 ? L("lcl_mld_actiecodeFE"): L("lcl_mld_actiecodeBO");
var txt = mld_melding.actiecode & 2 ? L("lcl_mld_actiecodeFE"): "";
if (mld_melding.actiecode & 128)
txt += " " + L("lcl_mld_actiecodeATT");
ROFIELDTR("fld mldshowactie", L("lcl_mld_actiecode"), txt);
ROFIELDTR("mldshowactie", L("lcl_mld_actiecode"), txt, {suppressEmpty: true});
}
BLOCK_END();

8
APPL/MLD/mld_show_note2.asp
View File

@@ -465,7 +465,7 @@ if (mld_key > 0)
+ " FROM mld_melding_note n, prs_v_perslid_fullnames_all pf"
+ " WHERE n.prs_perslid_key = pf.prs_perslid_key (+)"
+ " AND n.mld_melding_key = " + mld_key
+ (mfe.haveOnlyFErights? " AND mld_melding_note_flag = 1" : "");
+ (mfe.haveOnlyFErights? " AND BITAND(mld_melding_note_flag,1) = 1" : "");
var sqls = [sql];
// Opdracht notes
@@ -564,7 +564,8 @@ if (mld_key > 0)
var fullname = fnPerslidNaamFull(oRs);
var last_note_key = oRs("mld_melding_note_key").Value;
var melding_note_wijzigdatum = oRs("mld_melding_note_wijzigdatum").Value!=null ? new Date(oRs("mld_melding_note_wijzigdatum").Value) : null;
var note_zichtbaarFE = oRs("mld_melding_note_flag").value == 1;
var note_zichtbaarFE = oRs("mld_melding_note_flag").value & 1;
var ismailnote = oRs("mld_melding_note_flag").value & 64;
var cls_tr = " rt"+ oRs("regeltype").value; // 1=melding, 2=opdracht
var isvanOpdracht = oRs("regeltype").value == 2;
oRs.MoveNext();
@@ -645,6 +646,7 @@ if (mld_key > 0)
var suffixstr = suffix ? L("lcl_shared_order")+" "+suffix+": " : "";
var note_zichtbaarFE_class = (note_zichtbaarFE?"note_fe_visible":(srtnoti?"" :"note_fe_hidden"));
note_zichtbaarFE_class += ( ismailnote ? " mailednote" : "");
if ((LastIsSelfNote || FirstIsSelfNote || canChangeSelfNote) && !isvanOpdracht)
{
edittm += "<i class='fa fa-pencil fa-fw fa-lg details' onclick='mld_notechange(" + last_note_key + ")' title='" + L("lcl_change") + "'></i>";
@@ -709,7 +711,7 @@ if (mld_key > 0)
+ " WHERE mld_melding_note_key = " + note_key;
var oRs = Oracle.Execute(sql);
note_oms = oRs("mld_melding_note_omschrijving").value;
note_zichtbaarFE = oRs("mld_melding_note_flag").value == 1; // de eerder gekozen waarde
note_zichtbaarFE = oRs("mld_melding_note_flag").value & 1; // de eerder gekozen waarde
}
// Voeg eventueel weer toe wat er voor de reload als gevolg van upload bijlage stond.