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

FCLT#75930 Code refactoring: meer _key postfix voor variabelen. Geen functionele wijzigingen

Browse Source 
svn path=/Website/trunk/; revision=58436
This commit is contained in:
Jos Groot Lipman
2022-12-22 10:05:13 +00:00
parent 7411898430
commit 0470401ba4
6 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/MLD/get_mld_info_ajax.asp
View File

@@ -201,18 +201,18 @@ switch (req_info)
case "calc_einddatum":
{ // Einddatum van melding bepalen.
var startdatum = getQParamDate("startdatum", new Date());
var srtdisc = getQParamInt("srtdisc");
var disc = getQParamInt("disc");
var srtdisc_key = getQParamInt("srtdisc");
var disc_key = getQParamInt("disc");
var stdm_key = getQParamInt("stdm_key");
var prio = getQParamInt("prio", 3);
var geb_key = getQParamInt("geb_key", -1);
var rui_key = getQParamInt("rui_key", -1);
var ins_key = getQParamInt("ins_key", -1);
// Wat mag ik zoal op een nieuwe melding.
if (disc < 0)
var this_mld = mld.func_enabled_mld(srtdisc, "S");
if (disc_key < 0)
var this_mld = mld.func_enabled_mld(srtdisc_key, "S");
else
var this_mld = mld.func_enabled_mld(disc, "D");
var this_mld = mld.func_enabled_mld(disc_key, "D");
// Berekenen van de einddatum.
var einddatum = mld.geteinddatum(startdatum, stdm_key, prio, geb_key, rui_key, ins_key);
result = { einddatum: einddatum.getTime(), canFOwrite: this_mld.canFOwrite, canBOwrite: this_mld.canBOwrite };

52
APPL/MLD/mld_edit_melding.asp
View File

@@ -46,8 +46,8 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery", "kenmerk"],
if (cont)
{
var cont_mld_key = -1;
var stdmelding_c = -1;
var srtdisc_c = -1;
var stdmelding_c_key = -1;
var srtdisc_c_key = -1;
if (mld_key_arr.length > 1)
{
var tobecontinued = 0;
@@ -59,14 +59,14 @@ if (cont)
{
this_mld_c = mld.func_enabled_melding(mld_key_arr[i]); // Wat heb ik zoal aan rechten op deze specifieke melding
mld_info_c = mld.mld_melding_info(mld_key_arr[i]);
lcl.set_dialect(mld_info_c.srtdisc, "MLD_SRTDISCIPLINE_KEY");
lcl.set_dialect(mld_info_c.srtdisc_key, "MLD_SRTDISCIPLINE_KEY");
if (this_mld_c.canContinue && !mld_info_c.parent_key) // Geen child melding
{
if (ingesloten.length === 0)
{
cont_mld_key = mld_key_arr[i];
stdmelding_c = mld_info_c.stdm;
srtdisc_c = mld_info_c.srtdisc;
stdmelding_c_key = mld_info_c.stdm_key;
srtdisc_c_key = mld_info_c.srtdisc_key;
}
ingesloten.push(mld_key_arr[i]);
tobecontinued++;
@@ -86,11 +86,11 @@ if (cont)
cont_mld_key = mld_key_arr[0];
var mld_info_c = mld.mld_melding_info(cont_mld_key);
stdmelding_c = mld_info_c.stdm;
srtdisc_c = mld_info_c.srtdisc;
stdmelding_c_key = mld_info_c.stdm_key;
srtdisc_c_key = mld_info_c.srtdisc_key;
}
if (getQParamInt("srtdisc") != srtdisc_c)
if (getQParamInt("srtdisc") != srtdisc_c_key)
mld_key = -1;
}
@@ -140,7 +140,7 @@ if (copy_or_cont && !multi)
}
var mld_defaultstdmelding = -1;
var disc = -1;
var disc_key = -1;
var withFutureRes = false;
if (mld_key > 0)
{
@@ -150,8 +150,8 @@ if (mld_key > 0)
}
else // Nieuwe melding
{
var srtdisc = getQParamInt("srtdisc"); // Deze is gegarandeerd
var this_mld = mld.func_enabled_mld(srtdisc, "S"); // Wat mag ik zoal op een nieuwe melding
var srtdisc_key = getQParamInt("srtdisc"); // Deze is gegarandeerd
var this_mld = mld.func_enabled_mld(srtdisc_key, "S"); // Wat mag ik zoal op een nieuwe melding
// Liefst wil ik hier urole afhankelijk zijn maar dan is straks FCLTdisciplineselector misschien wel leeg en zijn we nog verder van huis
user.auth_required_or_abort(urole == "fe"? this_mld.canFEwrite : this_mld.canFOwrite); // Dit is nog ongeacht de melding
@@ -166,11 +166,11 @@ else // Nieuwe melding
oRs = Oracle.Execute(sql);
act_oms = oRs("fac_activiteit_omschrijving").Value;
}
var mld_defaultstdmelding = getQParamInt("mld_defaultstdmelding", -1);
var mld_defaultstdmelding_key = getQParamInt("mld_defaultstdmelding", -1);
var mld_ins_discipline_key = getQParamInt("mld_ins_discipline_key", -1);
var mld_omschr = getQParam("txt" , act_oms);
var mld_onderwerp = getQParam("onderwerp" , "");
var disc = getQParamInt("disc", -1);
var disc_key = getQParamInt("disc", -1);
var loc_key = getQParamInt("loc_key", -1);
var bld_key = getQParamInt("bld_key", -1);
var flr_key = -1;
@@ -182,7 +182,7 @@ else // Nieuwe melding
+ " AND stdm.mld_stdmelding_verwijder IS NULL "
+ " AND md.ins_discipline_verwijder IS NULL "
+ " AND mld_stdmelding_thirdparty = 0 "
+ " AND md.ins_srtdiscipline_key = " + srtdisc;
+ " AND md.ins_srtdiscipline_key = " + srtdisc_key;
var oRs = Oracle.Execute(sql);
var lAllThirdparty = (oRs("cnt").Value == 0);
oRs.close();
@@ -299,7 +299,7 @@ else
melder_key: rsv_ruimte_key > 0? contact_key : null,
afdeling_key: -1,
place_key: -1,
stdm: multi || cont ? -1 : mld_defaultstdmelding,
stdm_key: multi || cont ? -1 : mld_defaultstdmelding_key,
act_key: act_key,
einddatum: einddatum,
melddatum: new Date(),
@@ -313,7 +313,7 @@ else
alg_onrgoed_niveau: "",
module: -1,
kpnverplicht: false,
disc_key: multi || cont ? -1 : disc,
disc_key: multi || cont ? -1 : disc_key,
srtdisc_key: srtdisc_key,
kostenpl_key: -1,
loc_key: loc_key,
@@ -405,8 +405,8 @@ else
+ " AND mld_stdmelding_verwijder IS NULL"
+ " AND (mld_stdmelding_vervaldatum IS NULL OR mld_stdmelding_vervaldatum > SYSDATE)"
// Als er een default stdmelding is meegegeven dan daar alleen naar kijken (JGL: Zit het dan niet al in stdm_info?)
+ (mld_defaultstdmelding > 0
? " AND sm.mld_stdmelding_key = " + mld_defaultstdmelding
+ (mld_defaultstdmelding_key > 0
? " AND sm.mld_stdmelding_key = " + mld_defaultstdmelding_key
: "");
oRs = Oracle.Execute(sql);
mld_melding.kpnverplicht = (oRs("kpnverplicht").Value == 1); // Voor alle vakgroepen verplicht
@@ -581,7 +581,7 @@ lcl.set_dialect(mld_melding.srtdisc_key, "MLD_SRTDISCIPLINE_KEY");
var mld_def_loc = <%=(mld_key > 0 || copy_or_cont && !multi || getQParamInt("loc_key", -1) > -1 || getQParamInt("rsv_ruimte_key", -1) > -1 || ins_has_loc) ? 1 : 0%>;
var mld_status = <%=mld_melding.mld_status%>;
var mprio = <%=mld_melding.mprio%>;
var srtdisc = <%=mld_melding.srtdisc_key%>;
var srtdisc_key = <%=mld_melding.srtdisc_key%>;
var perslidkey = <%=perslidkey%>;
var def_kenmerk_link_key = <%=def_kenmerk_link_key%>;
var user_kpkey = <%=user.afdeling().prs_kostenplaats_key() || -1%>;
@@ -611,7 +611,7 @@ lcl.set_dialect(mld_melding.srtdisc_key, "MLD_SRTDISCIPLINE_KEY");
var alg_level = <%=mld_melding.alg_level%>;
var mld_kk = <%= mld_melding.mld_kk? 1 : 0 %> == 1;
var copy = <%= mld_copy_key > 0 ? 1 : 0 %>; // (copy_or_cont && !multi)
var cont_stdm = "<%=stdmelding_c || "-1"%>";
var cont_stdm = "<%=stdmelding_c_key || "-1"%>";
var mld_copy_key = <%=mld_copy_key%>;
// Voor bestaande meldingen
@@ -981,7 +981,7 @@ SUBFRAME_START();
}
if (!frontend) // Deze velden nooit voor frontend laten zien
if (lBestaandeMelding || mld_defaultstdmelding > -1 || lAllThirdparty)
if (lBestaandeMelding || mld_defaultstdmelding_key > -1 || lAllThirdparty)
{
if (stdm_info.canholdthirdparty == 1 || lAllThirdparty)
{
@@ -1028,7 +1028,7 @@ SUBFRAME_START();
// 0 = (=default) vakgroep en melding (beide eerst te kiezen)
// 1 = vakgroep readonly
// 2 = alleen melding
var vakg_readonly = !cont && (disc > 0 ||
var vakg_readonly = !cont && (disc_key > 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));
@@ -1066,7 +1066,7 @@ SUBFRAME_START();
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"});
var stdm_readonly = ((mld_defaultstdmelding > 0 && !cont) || (mld_key > 0 && !this_mld.canStdmChange) || (lBestaandeMelding && stdm_info.slabewaken && mld_melding.respijt != 0));
var stdm_readonly = ((mld_defaultstdmelding_key > 0 && !cont) || (mld_key > 0 && !this_mld.canStdmChange) || (lBestaandeMelding && stdm_info.slabewaken && mld_melding.respijt != 0));
var res =
FCLTstdmeldingselector("stdm",
"sgStdm",
@@ -1163,8 +1163,8 @@ SUBFRAME_START();
+ " OR sm.mld_stdmelding_t_uitvtijd_pr4.tijdsduur IS NOT NULL)"
+ " AND md.ins_srtdiscipline_key = " + mld_melding.srtdisc_key
// Als er een default stdmelding is meegegeven dan daar alleen naar kijken
+ (mld_defaultstdmelding > 0
? " AND sm.mld_stdmelding_key = " + mld_defaultstdmelding
+ (mld_defaultstdmelding_key > 0
? " AND sm.mld_stdmelding_key = " + mld_defaultstdmelding_key
: "")
+ " AND md.ins_discipline_key IN (SELECT ins_discipline_key"
+ " FROM fac_v_webgebruiker"
@@ -1225,7 +1225,7 @@ SUBFRAME_START();
</script>
<%
if (!lBestaandeMelding && mld_defaultstdmelding == -1 && !lAllThirdparty)
if (!lBestaandeMelding && mld_defaultstdmelding_key == -1 && !lAllThirdparty)
{
RWFIELDTR("naam_ext", "fld", L("lcl_mld_naam_ext"), mld_melding.naam_ext, {maxlength: 60});
RWFIELDTR("email_ext", "fld", L("lcl_mld_email_ext"), mld_melding.email_ext, {maxlength: 100});

12
APPL/MLD/mld_edit_melding.js
View File

@@ -523,7 +523,7 @@ function onChangeAlg(level)
// Pas addUrl parameters aan voor objectSelector
setSuggestUrlAdd();
var stdm = $("#stdm").val();
var stdm_key = $("#stdm").val();
var ins_disc = $("#disc").val();
if ((level == 2 && loc && loc > 0) ||
@@ -535,7 +535,7 @@ function onChangeAlg(level)
alg_key_arr: alg.join(","),
changed: level,
ins_disc_key: (ins_disc || -1),
stdm_key: stdm || -1 },
stdm_key: stdm_key || -1 },
callback_faq_info);
}
else
@@ -1534,7 +1534,7 @@ function mld_melding_object()
var url = "../mld/mld_object.asp?mld_key=" + mld_key;
url += "&stdm_key=" + $("#stdm").val();
url += "&srtdisc=" + srtdisc;
url += "&srtdisc=" + srtdisc_key;
url += "&person=" + prs_key;
url += "&alg_key=" + alg_key;
url += "&alg_niveau=" + obj_alg_lvl;
@@ -1654,7 +1654,7 @@ function recalcEinddatum(recalc_always)
}
// srtdisc: De srtdiscipline is gegarandeerd een vaste waarde.
var disc = $("#disc").val();
var disc_key = $("#disc").val();
var stdm_key = $("#stdm").val();
var prio = $("#prio :selected").val() || 3;
var geb_key = $('#gebouwkey').val();
@@ -1682,8 +1682,8 @@ function recalcEinddatum(recalc_always)
// daarmee kan ik de database de einddatum laten bepalen
var params = { req_info: "calc_einddatum",
startdatum: startdatum,
srtdisc: srtdisc,
disc: disc,
srtdisc: srtdisc_key,
disc: disc_key,
stdm_key: stdm_key,
prio: prio,
geb_key: geb_key,

32
APPL/MLD/mld_edit_meldracht.asp
View File

@@ -42,22 +42,22 @@ if (mld_defaultstdmelding_key > 0) {
+ " AND sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
+ " AND mld_stdmelding_key = " + mld_defaultstdmelding_key;
var oRs = Oracle.Execute(sql);
var srtdisckey = oRs("ins_srtdiscipline_key").value;
var disckey = oRs("ins_discipline_key").value;
var srtdisc_key = oRs("ins_srtdiscipline_key").value;
var disc_key = oRs("ins_discipline_key").value;
var srtdiscbes = oRs("ins_srtdiscipline_bes").value;
oRs.close();
} else {
var srtdisckey = getQParamInt("srtdisc", -1); // die heeft mld_melding wel zeker bepaald
var srtdisc_key = getQParamInt("srtdisc", -1); // die heeft mld_melding wel zeker bepaald
var sql = "SELECT sd.ins_srtdiscipline_bes"
+ " FROM ins_srtdiscipline sd"
+ " WHERE sd.ins_srtdiscipline_key = " + srtdisckey;
+ " WHERE sd.ins_srtdiscipline_key = " + srtdisc_key;
var oRs = Oracle.Execute(sql);
var srtdiscbes = oRs("ins_srtdiscipline_bes").value;
oRs.close();
// weet ik alleen disckey en mld_defaultstdmelding_key nog niet; die mag de user die kiezen
var disckey = -1;
// weet ik alleen disc_key en mld_defaultstdmelding_key nog niet; die mag de user die kiezen
var disc_key = -1;
}
var this_mld = mld.func_enabled_mld(srtdisckey, "S"); // wat mag ik zoal op een nieuwe melding
var this_mld = mld.func_enabled_mld(srtdisc_key, "S"); // wat mag ik zoal op een nieuwe melding
// typeopdr is VERPLICHT
var opdr_type = getQParamInt("typeopdr");
@@ -68,7 +68,7 @@ if (opdr_type == -1) {
+ " FROM mld_typeopdr t"
+ " , mld_typeopdr_srtdiscipline ts"
+ " WHERE t.mld_typeopdr_key = ts.mld_typeopdr_key"
+ " AND ins_discipline_key = " + disckey
+ " AND ins_discipline_key = " + disc_key
+ " ORDER BY 2 DESC";
var oRs = Oracle.Execute(sql_typeopdr);
if (!oRs.eof)
@@ -95,7 +95,7 @@ var mld_ordernr = "";
// Die (gedeelde) js heeft deze nodig, zegt-ie
var mld_key = -1;
var mprio = 3;
var srtdisc = <%=srtdisckey%>;
var srtdisc_key = <%=srtdisc_key%>;
var perslidkey = <%=user_key%>;
var mld_stdmelding_startdatum = 0; // Bij een melding de startdatum tonen {0=no | 1=yes} TODO
var frontend = true;
@@ -146,12 +146,12 @@ var mld_ordernr = "";
FCLTdisciplineselector("disc",
"sgDisc",
{ label: L("lcl_vakgroup"),
disc_key: disckey,
disc_key: disc_key,
module: "MLDP",
perslidKey: user_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "W",
srtdisc_key: srtdisckey,
srtdisc_key: srtdisc_key,
onChange: "onChangeVakgroep",
required: true
});
@@ -161,7 +161,7 @@ var mld_ordernr = "";
{ label: L("lcl_complain"),
stdmelding_key: mld_defaultstdmelding_key,
autfunctionKey: authparams.autfunctionkey,
srtdisc_key: srtdisckey,
srtdisc_key: srtdisc_key,
perslidKey: user_key,
urlAdd: [{urlParam: "disc_key", field: "disc"}],
onChange: "onChangeStdMelding",
@@ -197,7 +197,7 @@ var mld_ordernr = "";
// TODO:
// Als deze gegeven is, dan blind toepassen
// Zo niet, dan de defaults mogelijke bepalen
// Dat is gebaseerd op de bekende srtdisckey, maar kan
// Dat is gebaseerd op de bekende srtdisc_key, maar kan
// verbijzonderd worden door de keuze van disc/defaultstdmelding, als
// die niet mee werd gegeven..
if (false) {
@@ -207,8 +207,8 @@ var mld_ordernr = "";
+ " FROM mld_typeopdr t"
+ ", mld_typeopdr_srtdiscipline ts"
+ " WHERE t.mld_typeopdr_key = ts.mld_typeopdr_key"
+ " AND (ins_discipline_key = " + disckey /* en dan doet de srtdiscipline er echt niet meer toe */
+ " OR (ts.ins_srtdiscipline_key = " + srtdisckey + " AND ins_discipline_key IS NULL))"
+ " AND (ins_discipline_key = " + disc_key /* en dan doet de srtdiscipline er echt niet meer toe */
+ " OR (ts.ins_srtdiscipline_key = " + srtdisc_key + " AND ins_discipline_key IS NULL))"
+ " ORDER BY 2";
FCLTselector("t_opdr",
@@ -268,7 +268,7 @@ var mld_ordernr = "";
locatiekey: loc_key,
onrgoedkey: onrgoed_key,
gebouwkey: bld_key,
disciplinekey: disckey,
disciplinekey: disc_key,
lutype: srtdiscbes? "L" : "U", // leverancier of uitvoerende
// cnt_key param is TODO
urlAdd: [{urlParam: "dienst", field: "dienst"},{urlParam: "contract", xxx: cnt_key}],

56
APPL/MLD/mld_melding.asp
View File

@@ -118,23 +118,23 @@ if (mld_key == -1 || copy)
// strdisc MOET ik kunnen achterhalen om toe te kunnen voegen
// Daarvoor gebruik ik de meest gedetailleerde van de meegegeven waarde(n)
var mld_defaultstdmelding = getQParamInt("mld_defaultstdmelding", -1);
var mld_defaultstdmelding_key = getQParamInt("mld_defaultstdmelding", -1);
if (copy)
{
// Bij copy is de key mld_key bekend, dus stdmelding is op te vragen.
mld_defaultstdmelding = mld_info.stdm_key;
mld_defaultstdmelding_key = mld_info.stdm_key;
}
if (mld_defaultstdmelding != -1)
if (mld_defaultstdmelding_key > 0)
{
sql = "SELECT ins_srtdiscipline_key, ins_discipline_key, COALESCE(mld_stdmelding_image,ins_discipline_image) icon,"
+ lcl.xsqla('mld_stdmelding_omschrijving', 'mld_stdmelding_key')
+ " FROM mld_discipline, mld_stdmelding"
+ " WHERE mld_ins_discipline_key = ins_discipline_key"
+ " AND mld_stdmelding_key IN (" + mld_defaultstdmelding + ")"
+ " AND mld_stdmelding_key IN (" + mld_defaultstdmelding_key + ")"
+ " AND mld_stdmelding_verwijder IS NULL";
oRs = Oracle.Execute(sql);
var srtdisc = oRs("ins_srtdiscipline_key").value;
var disc = oRs("ins_discipline_key").value;
var srtdisc_key = oRs("ins_srtdiscipline_key").value;
var disc_key = oRs("ins_discipline_key").value;
pageTitle = oRs("mld_stdmelding_omschrijving").value; // is specifieker dan lcl_mld_new
stdm_info.image = oRs("icon").value;
@@ -142,31 +142,31 @@ if (mld_key == -1 || copy)
}
else // misschien is disc meegegeven
{
var disc = getQParamInt("disc", -1);
if (disc == -1) disc = getQParamInt("dis_key", -1); // from fac_menu this could have been dis_key
if (disc != -1)
var disc_key = getQParamInt("disc", -1);
if (disc_key == -1) disc = getQParamInt("dis_key", -1); // from fac_menu this could have been dis_key
if (disc_key != -1)
{
sql = "SELECT ins_srtdiscipline_key, ins_discipline_image icon,"
+ lcl.xsqla('ins_discipline_omschrijving', 'ins_discipline_key')
+ " FROM mld_discipline "
+ " WHERE ins_discipline_key = " + disc
+ " WHERE ins_discipline_key = " + disc_key
+ " AND ins_discipline_verwijder IS NULL";
oRs = Oracle.Execute(sql);
srtdisc = oRs("ins_srtdiscipline_key").value;
srtdisc_key = oRs("ins_srtdiscipline_key").value;
pageTitle = oRs("ins_discipline_omschrijving").value; // is specifieker dan lcl_mld_new
stdm_info.image = oRs("icon").value;
}
else
{
if (kto_key > 0)
var srtdisc = S("kto_srtdiscipline_key");
var srtdisc_key = S("kto_srtdiscipline_key");
else
{
var srtdisc = getQParamInt("srtdisc", -1);
var srtdisc_key = getQParamInt("srtdisc", -1);
sql = "SELECT ins_srtdiscipline_key, ins_srtdiscipline_image icon,"
+ lcl.xsqla('ins_srtdiscipline_omschrijving', 'ins_srtdiscipline_key')
+ " FROM ins_srtdiscipline "
+ " WHERE ins_srtdiscipline_key = " + srtdisc
+ " WHERE ins_srtdiscipline_key = " + srtdisc_key
+ " AND ins_srtdiscipline_verwijder IS NULL";
oRs = Oracle.Execute(sql);
if (!oRs.eof)
@@ -182,14 +182,14 @@ if (mld_key == -1 || copy)
}
}
}
if (mld_defaultstdmelding > 0)
transitParam += "&mld_defaultstdmelding=" + mld_defaultstdmelding;
if (disc > 0)
transitParam += "&disc=" + disc;
if (mld_defaultstdmelding_key > 0)
transitParam += "&mld_defaultstdmelding=" + mld_defaultstdmelding_key;
if (disc_key > 0)
transitParam += "&disc=" + disc_key;
if (urole == "xx")
{
var authparamsMLDFOF = user.checkAutorisation("WEB_MLDFOF", true, disc);
var authparamsMLDFOF = user.checkAutorisation("WEB_MLDFOF", true, disc_key);
if (mld_key < 0)
{
var mldfof_write = authparamsMLDFOF && (authparamsMLDFOF.PRSwritelevel < 9 && authparamsMLDFOF.ALGwritelevel < 9);
@@ -284,8 +284,8 @@ if (mld_key == -1 || copy)
var mld_wide = false;
if (mld_key == -1 || copy)
{
if (srtdisc > 0)
transitParam += "&srtdisc=" + srtdisc;
if (srtdisc_key > 0)
transitParam += "&srtdisc=" + srtdisc_key;
else
{
//Dan maar vragen
@@ -296,14 +296,14 @@ if (mld_key == -1 || copy)
var authorized_srtdisc;
while (!oRs.eof)
{
srtdisc = oRs("ins_srtdiscipline_key").value;
var this_mld = mld.func_enabled_mld(srtdisc, "S"); // wat mag ik zoal op een nieuwe melding
srtdisc_key = oRs("ins_srtdiscipline_key").value;
var this_mld = mld.func_enabled_mld(srtdisc_key, "S"); // wat mag ik zoal op een nieuwe melding
if (urole=='fe'?this_mld.canFEwrite:this_mld.canFOwrite) // check authorization on discipline
{
authorized_srtdisc = srtdisc;
authorized_srtdisc = srtdisc_key;
buttons.push({ title: oRs("ins_srtdiscipline_omschrijving").value,
icon: "fa-angle-right",
action: "srtdisc=" + srtdisc + ";$('div#dmodal').dialog('close').remove();"
action: "srtdisc=" + srtdisc_key + ";$('div#dmodal').dialog('close').remove();"
});
}
oRs.MoveNext();
@@ -323,13 +323,13 @@ if (mld_key == -1 || copy)
var page="../shared/empty.html"; //achtergrondpagina
%> <script>
srtdisc = -1;
srtdisc_key = -1;
function dialogClose()
{
if (srtdisc== -1)
if (srtdisc_key == -1)
FcltMgr.closeDetail(window, { cancel: true } );
else
$("#mldframe")[0].src = "<%=tpage%>?urole=<%=urole%>&mld_key=<%=(cont ? mld_key_arr.join(",") : mld_key)%><%=transitParam%>&srtdisc="+srtdisc;
$("#mldframe")[0].src = "<%=tpage%>?urole=<%=urole%>&mld_key=<%=(cont ? mld_key_arr.join(",") : mld_key)%><%=transitParam%>&srtdisc="+srtdisc_key;
}
$(function()

10
APPL/MLD/opdr_uren_search.asp
View File

@@ -35,10 +35,10 @@ var mld_key = getQParamInt("mld_key", -1);
var opdrnr = getQParam("opdrnr", "");
var date_to = getQParamDate("date_to", new Date);
var handler_key = getQParamInt("handler_key", urole == "fe"? user_key : -1); // Uitvoerende
var srtdisc = getQParamInt("srtdisc", -1); // optioneel. Dan krijgt BO er een vakgroep(team)selector bij
var srtdisc_key = getQParamInt("srtdisc", -1); // optioneel. Dan krijgt BO er een vakgroep(team)selector bij
/***** End get webform parameters *****/
lcl.set_dialect(srtdisc, "MLD_SRTDISCIPLINE_KEY");
lcl.set_dialect(srtdisc_key, "MLD_SRTDISCIPLINE_KEY");
// So what authorization must we check?
var autfunction = { fe: "WEB_UURUSE", fo: "WEB_UURFOF", bo: "WEB_UURBOF"} [urole];
@@ -68,7 +68,7 @@ authparams = user.checkAutorisation(autfunction);
<form action="opdr_uren_search_list.asp?urole=<%=urole%>" method="post" name="u2" target="workFrame">
<% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
SEARCH_BLOCK_START();
if (srtdisc > 0 && urole != "fe") // 'team' selector
if (srtdisc_key > 0 && urole != "fe") // 'team' selector
{
FCLTdisciplineselector("disc_key",
"sgDisc",
@@ -76,7 +76,7 @@ authparams = user.checkAutorisation(autfunction);
module: "MLDP",
perslidKey: user_key,
autfunctionKey: -1,
srtdisc_key: srtdisc
srtdisc_key: srtdisc_key
});
}
// <!-- Uitvoerende -->
@@ -133,4 +133,4 @@ SEARCH_PAGE_END(); %>
</body>
</html>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>