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

AADS#41227: Meldingen in dienstniveau bij doorsturen.

Browse Source 
svn path=/Website/trunk/; revision=36339
This commit is contained in:
Maykel Geerdink
2017-12-12 10:50:59 +00:00
parent 709fbe3a98
commit ae6edf1570
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/MLD/mld_edit_melding.asp
View File

@@ -746,19 +746,9 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
!frontend
});
var urlAdd = [{urlParam: "perslidKey", field: "person", init: mld_melding.melder_key}];
urlAdd.push({urlParam: "perslidKey", field: "person", init: mld_melding.melder_key});
if (!frontend || (S("mld_selector_mode") != 2)) // Als frontend en setting mld_selector_mode twee is, dan is de discipline niet zichtbaar en moet de stdmelding er niet van afhankelijk zijn.
urlAdd.push({urlParam: "disc_key", field: "disc"});
if ((S("mld_edit_layout") == 1)) // Plaats gegevens worden voor de discipline/stdmelding gegevens getoond. Stdmelding afhankelijk van dienstlocatie maken. Daarom locatie en gebouw meegeven.
{
urlAdd.push({urlParam: "lockey", field: "locatiekey", init: mld_melding.loc_key});
if (eindlevel >= 3)
urlAdd.push({urlParam: "bldkey", field: "gebouwkey", init: mld_melding.bld_key});
if (eindlevel >= 4)
urlAdd.push({urlParam: "flrkey", field: "verdiepingkey", init: mld_melding.flr_key});
if (eindlevel >= 5)
urlAdd.push({urlParam: "roomkey", field: "ruimtekey", init: mld_melding.room_key});
}
var res =
FCLTstdmeldingselector("stdm",

19
APPL/MLD/mld_forward.asp
View File

@@ -208,6 +208,19 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
<% BLOCK_START("mldForward", this_mld.canForward?L("lcl_forward"):L("lcl_fixmelding") + " " + mld_melding.prefix + mld_key, {tableid: "tblforward"})
var eindlevel = (mld_melding.alg_level ? mld_melding.alg_level : 2);
var urlAdd;
if ((S("mld_edit_layout") == 1)) // Plaats gegevens worden voor de discipline/stdmelding gegevens getoond. Stdmelding afhankelijk van dienstlocatie maken. Daarom locatie en gebouw meegeven.
{
urlAdd = [{urlParam: "lockey", field: "locatiekey", init: mld_melding.loc_key}]
if (eindlevel >= 3)
urlAdd.push({urlParam: "bldkey", field: "gebouwkey", init: mld_melding.bld_key});
if (eindlevel >= 4)
urlAdd.push({urlParam: "flrkey", field: "verdiepingkey", init: mld_melding.flr_key});
if (eindlevel >= 5)
urlAdd.push({urlParam: "roomkey", field: "ruimtekey", init: mld_melding.room_key});
}
// Vakgroep
FCLTdisciplineselector("disc",
"sgDisc",
@@ -217,10 +230,14 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
perslidKey: user_key,
autfunctionKey: -1, // alles is toegestaan! authparams.autfunctionkey,
srtdisc_key: S("mld_forward_all") == 1? null : mld_melding.srtdisc,
urlAdd: urlAdd,
filtercode: this_mld.canForwardKeten? "VDK" : "VD",
onChange: "onChangeVakgroep",
required: true
});
urlAdd.push({urlParam: "disc_key", field: "disc"});
// Discipline
FCLTstdmeldingselector("stdm",
"sgStdm",
@@ -229,7 +246,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
stdmelding_key: S("mld_forward_auto_fill") ? mld_melding.stdm : null,
autfunctionKey: -1, // alles is toegestaan! authparams.autfunctionkey,
srtdisc_key: S("mld_forward_all") == 1? null : mld_melding.srtdisc,
urlAdd: [{urlParam: "disc_key", field: "disc"}],
urlAdd: urlAdd,
filtercode: this_mld.canForwardKeten? "VDK" : null,
onChange: "onChangeStdMelding",
required: true