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

FCLT#54169 Savepoint (behandelaar boven behandelgroep en enkele bugfixes)

Browse Source 
svn path=/Website/trunk/; revision=39266
This commit is contained in:
Koen Reefman
2018-10-03 13:37:23 +00:00
parent c3f61284da
commit 60d09a0373
5 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
APPL/MLD/mld_edit_melding.asp
View File

@@ -748,13 +748,14 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
if (eindlevel >= 5)
urlAdd.push({urlParam: "roomkey", field: "ruimtekey", init: mld_melding.room_key});
}
var vakg_readonly = disc > 0 || ((mld_key > 0 && !this_mld.canVakgChange) || stdm_info.is_kto_antwoord) || (frontend && (S("mld_selector_mode") == 1 || S("mld_selector_mode") == 2)) || (lBestaandeMelding && stdm_info.slabewaken && mld_melding.respijt > 0);
FCLTdisciplineselector("disc",
"sgDisc",
{ label: L("lcl_vakgroup"),
disc_key: mld_melding.disc,
module: "MLD",
perslidKey: (lBestaandeMelding ? mld_melding.melder_key : user_key),
autfunctionKey: S("mld_ins_discipline") ? -1 : authparams.autfunctionkey, // Dan mag ik alles zien (readonly, zie: func_enabled)
autfunctionKey: (S("mld_ins_discipline") && vakg_readonly ? -1 : authparams.autfunctionkey), // Dan mag ik alles zien (readonly, zie: func_enabled)
autRW: "W",
srtdisc_key: mld_melding.srtdisc,
ins_key: ins_key,
@@ -762,13 +763,11 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
onChange: ((frontend && S("mld_selector_mode") == 1)? null : "onChangeVakgroep"),
extraParamField: "eigenkp",
extracode: "K",
readonly: disc > 0 || ((mld_key > 0 && !this_mld.canVakgChange) || stdm_info.is_kto_antwoord) || (frontend && (S("mld_selector_mode") == 1 || S("mld_selector_mode") == 2) || (lBestaandeMelding && stdm_info.slabewaken && mld_melding.respijt > 0)), // of moet je dat dan in de canchange opnemen?
readonly: vakg_readonly,
dohide: (frontend && (S("mld_selector_mode") == 2)? true : false),
required: (mld_key < 0 || this_mld.canVakgChange),
filtercode: (frontend? "FE" : ((fronto && (mld_key < 0)) ? "VD" : "")),
moreinfo: !(disc > 0 || ((mld_key > 0 && !this_mld.canVakgChange) || stdm_info.is_kto_antwoord) || (frontend && (S("mld_selector_mode") == 1 || S("mld_selector_mode") == 2)) || (lBestaandeMelding && stdm_info.slabewaken && mld_melding.respijt > 0)) &&
(user.checkAutorisation("WEB_FAQUSE", true) || user.checkAutorisation("WEB_FAQFOF", true)) && // !readonly && rechten
!frontend
moreinfo: !vakg_readonly && !frontend && (user.checkAutorisation("WEB_FAQUSE", true) || user.checkAutorisation("WEB_FAQFOF", true)) // !readonly && rechten
});
urlAdd.push({urlParam: "perslidKey", field: "person", init: mld_melding.melder_key});
@@ -986,6 +985,20 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
BLOCK_START("mldInfo", (lBestaandeMelding ? L("lcl_complain") + " " + (mld_melding.prefix != null? mld_melding.prefix : "") + mld_key : L("lcl_mld_new")));
if (lBestaandeMelding)
{
var urlAdd = [{urlParam: "prs_key", field: "person", init: mld_melding.melder_key},
{urlParam: "disc_key", field: "disc", init: mld_melding.disc}];
if (mld_melding.show_alg)
urlAdd.push({urlParam: "loc_key", field: "locatiekey", init: mld_melding.loc_key});
FCLTpersoonselector("sBehandel",
"sgBehandelaar",
{ perslidKey: mld_melding.behandel_key,
label: L("lcl_mld_behandelaar"),
autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
urlAdd: urlAdd,
readonly: !this_mld.canAfhandChange,
filtercode: (mld_melding.mld_status == 0 ? "BEHF" : "BEHB")
});
if (S("mld_ins_discipline"))
{
FCLTdisciplineselector("mld_ins_discipline",
@@ -1005,35 +1018,22 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
(user.checkAutorisation("WEB_FAQUSE", true) || user.checkAutorisation("WEB_FAQFOF", true)) && // !readonly && rechten
!frontend
});
if (S("mld_behandelaar2"))
{
FCLTpersoonselector("sBehandel2",
"sgBehandelaar",
{ perslidKey: mld_melding.behandel2_key,
idadd: 2,
label: L("lcl_mld_behandelaar2"),
autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
urlAdd: urlAdd,
readonly: !this_mld.canAfhandChange,
hidden: !(mld_melding.srtgroep & 1),
filtercode: (mld_melding.mld_status == 0 ? "BH2F" : "BH2B")
});
}
}
var urlAdd = [{urlParam: "prs_key", field: "person", init: mld_melding.melder_key},
{urlParam: "disc_key", field: "disc", init: mld_melding.disc}];
if (mld_melding.show_alg)
urlAdd.push({urlParam: "loc_key", field: "locatiekey", init: mld_melding.loc_key});
FCLTpersoonselector("sBehandel",
"sgBehandelaar",
{ perslidKey: mld_melding.behandel_key,
label: L("lcl_mld_behandelaar"),
autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
urlAdd: urlAdd,
readonly: !this_mld.canAfhandChange,
filtercode: (mld_melding.mld_status == 0 ? "BEHF" : "BEHB")
});
if (S("mld_behandelaar2"))
FCLTpersoonselector("sBehandel2",
"sgBehandelaar",
{ perslidKey: mld_melding.behandel2_key,
idadd: 2,
label: L("lcl_mld_behandelaar2"),
autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
urlAdd: urlAdd,
readonly: !this_mld.canAfhandChange,
hidden: !(mld_melding.srtgroep & 1),
filtercode: (mld_melding.mld_status == 0 ? "BH2F" : "BH2B")
});
if (!mld_melding.show_start_date) { // alleen dan is de melddatum de invoerdatum; in het andere geval staat-ie elders al
ROFIELDTR("fld", L("lcl_mld_date_time"), toDateTimeString(mld_melding.melddatum));
}

4
APPL/MLD/mld_list.inc
View File

@@ -497,9 +497,6 @@ function mld_list (pautfunction, params)
} // minfo only
// apply 3D authorization to the locations and to the organisations (both ALG and PRS)
// mld_ins_discipline_key_arr
if (!frontend)
sqln = discx3d (sqln,
["md.ins_discipline_key", "m.mld_ins_discipline_key"], // rechten op vakgroep OF op behandelgroep
@@ -996,6 +993,7 @@ function mld_list (pautfunction, params)
var disc_key = oRs("ins_discipline_key").Value;
var this_mld = mld.func_enabled_mld(disc_key, "D");
var flexParams = {readman: this_mld.canMIread, readuse: this_mld.canFEread};
return flexParams;
}

55
APPL/MLD/mld_search.asp
View File

@@ -1037,6 +1037,18 @@ oRs.close();
</td>
</tr>
<%
FCLTpersoonselector("sBehandel_key",
"sgBehandelaar",
{ perslidKey: behandel_key,
label: L("lcl_mld_behandelaar"),
filtercode: "BEHS",
trclass: "primsearch noxd", /* als wel xd: _self zou leuk zijn */
multitoggle: true,
autlevel: authparams.PRSreadlevel,
autlevelALG: authparams.ALGreadlevel,
addfixedoption: { txt: L("lcl_suggestemptytxt"), desc: L("lcl_suggestemptydesc"), key: -2 },
whenEmpty: L("lcl_search_generic") // want filter
});
if (S("mld_ins_discipline"))
{
FCLTdisciplineselector("mld_ins_discipline",
@@ -1053,34 +1065,23 @@ oRs.close();
addfixedoption: { txt: L("lcl_suggestemptytxt"), desc: L("lcl_suggestemptydesc"), key: -2 },
whenEmpty: L("lcl_search_generic") // want filter
});
if (S("mld_behandelaar2"))
{
FCLTpersoonselector("sBehandel2_key",
"sgBehandelaar",
{ perslidKey: behandel2_key,
idadd: 2,
label: L("lcl_mld_behandelaar2"),
filtercode: "BH2S",
trclass: "primsearch noxd", /* als wel xd: _self zou leuk zijn */
multitoggle: true,
autlevel: authparams.PRSreadlevel,
autlevelALG: authparams.ALGreadlevel,
addfixedoption: { txt: L("lcl_suggestemptytxt"), desc: L("lcl_suggestemptydesc"), key: -2 },
whenEmpty: L("lcl_search_generic") // want filter
});
}
}
FCLTpersoonselector("sBehandel_key",
"sgBehandelaar",
{ perslidKey: behandel_key,
label: L("lcl_mld_behandelaar"),
filtercode: "BEHS",
trclass: "primsearch noxd", /* als wel xd: _self zou leuk zijn */
multitoggle: true,
autlevel: authparams.PRSreadlevel,
autlevelALG: authparams.ALGreadlevel,
addfixedoption: { txt: L("lcl_suggestemptytxt"), desc: L("lcl_suggestemptydesc"), key: -2 },
whenEmpty: L("lcl_search_generic") // want filter
});
if (S("mld_behandelaar2"))
FCLTpersoonselector("sBehandel2_key",
"sgBehandelaar",
{ perslidKey: behandel2_key,
idadd: 2,
label: L("lcl_mld_behandelaar2"),
filtercode: "BH2S",
trclass: "primsearch noxd", /* als wel xd: _self zou leuk zijn */
multitoggle: true,
autlevel: authparams.PRSreadlevel,
autlevelALG: authparams.ALGreadlevel,
addfixedoption: { txt: L("lcl_suggestemptytxt"), desc: L("lcl_suggestemptydesc"), key: -2 },
whenEmpty: L("lcl_search_generic") // want filter
});
}
if (!minfo)

5
APPL/MLD/mld_search_list.asp
View File

@@ -170,10 +170,7 @@ else
params.flr_key = (verdiepingkey != -1 ? verdiepingkey : null);
params.room_key = (ruimtekey != -1 ? ruimtekey : null);
params.mld_ins_discipline_key_arr
= (mld_ins_discipline_key_arr.length > 0 && mld_ins_discipline_key_arr != [-1] ? mld_ins_discipline_key_arr : null);
// (mld_ins_discipline_key_arr.length == 1 && mld_ins_discipline_key_arr.join(",").indexOf("-1") == -1) ? mld_ins_discipline_key_arr : null);
= (mld_ins_discipline_key_arr.length > 0 && !(mld_ins_discipline_key_arr.length == 1 && mld_ins_discipline_key_arr[0] == -1) ? mld_ins_discipline_key_arr : null);
params.behandel_key_arr = sBehandel_key_arr;
params.behandel2_key_arr = sBehandel2_key_arr;
params.srtdisc_key = (srtdisc_key != -1 ? srtdisc_key : null);

12
APPL/MLD/mld_show_melding.asp
View File

@@ -429,11 +429,7 @@ function parentButton()
BLOCK_START("mldInfo", L("lcl_complain") + " "+ (mld_melding.prefix != null? mld_melding.prefix : "") + mld_key + (0&mld_melding.mld_onderwerp ? ": <span class='mldsubject'>" + safe.html(mld_melding.mld_onderwerp) + "</span>" : ""), { ishtmlsafe: true });
if (mld_melding.mld_ins_discipline_key > 0)
{
ROFIELDTR("flddisc", L("mld_ins_discipline"), (mld_melding.mld_srtins_prefix ? mld_melding.mld_srtins_prefix + "-" : "") + mld_melding.mld_ins_discipline_omschrijving);
}
// Proces bewaker/overziener
// Eerste behandelaar
if (mld_melding.behandel_key > 0) {
FCLTpersoonselector("sBehandel",
"sgBehandelaar",
@@ -444,7 +440,11 @@ function parentButton()
readonly: true
});
}
// Bewerker
if (mld_melding.mld_ins_discipline_key > 0)
{
ROFIELDTR("flddisc", L("mld_ins_discipline"), (mld_melding.mld_srtins_prefix ? mld_melding.mld_srtins_prefix + "-" : "") + mld_melding.mld_ins_discipline_omschrijving);
}
// Tweede behandelaar
if (mld_melding.behandel2_key > 0) {
FCLTpersoonselector("sBehandel2",
"sgBehandelaar",