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

FCLT#54169 Label, setting-naam en notificatie-naam aanpassingen (mld.inc komt nog)

Browse Source 
svn path=/Website/trunk/; revision=39432
This commit is contained in:
Koen Reefman
2018-10-17 12:30:47 +00:00
parent 827e41758c
commit fe1b7423d5
12 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_mld_disc_params.inc
View File

@@ -53,7 +53,7 @@ model_mld_disc_params =
"LOV": L("mld_discipline_srtgroepLOV"),
"defaultvalue": "3",
"emptyoption": null,
"hidden_fld": !S("mld_ins_discipline"),
"hidden_fld": !S("mld_processing_group"),
"multiedit": true
},
"orderlimit1": {

4
APPL/API2/model_mld_stdmelding.inc
View File

@@ -80,11 +80,11 @@ function model_mld_stdmelding()
"default_mld_ins_disc": {
"dbs": "mld_stdmelding_default_disc",
"typ": "key",
"label": L("mld_stdmelding_def_mld_ins"),
"label": L("lcl_default_processing_group"),
"foreign": "mld_discipline",
"module" : "MLDB",
"emptyoption": "",
"hidden_fld": !S("mld_ins_discipline"),
"hidden_fld": !S("mld_processing_group"),
"multiedit": true
},
"notfrontend": {

12
APPL/MLD/mld_edit_melding.asp
View File

@@ -760,7 +760,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
disc_key: mld_melding.disc,
module: "MLD",
perslidKey: (lBestaandeMelding ? mld_melding.melder_key : user_key),
autfunctionKey: (S("mld_ins_discipline") && vakg_readonly ? -1 : authparams.autfunctionkey), // Dan mag ik alles zien (readonly, zie: func_enabled)
autfunctionKey: (S("mld_processing_group") && 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,
@@ -784,7 +784,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
"sgStdm",
{ label: L("lcl_complain"),
stdmelding_key: mld_melding.stdm,
autfunctionKey: S("mld_ins_discipline") ? -1 : authparams.autfunctionkey, // Dan mag ik alles zien (readonly, zie: func_enabled)
autfunctionKey: S("mld_processing_group") ? -1 : authparams.autfunctionkey, // Dan mag ik alles zien (readonly, zie: func_enabled)
srtdisc_key: mld_melding.srtdisc,
ins_key: ins_key,
readonly: (mld_defaultstdmelding > 0 || (mld_key > 0 && !this_mld.canStdmChange) || (lBestaandeMelding && stdm_info.slabewaken && mld_melding.respijt > 0)),
@@ -1091,7 +1091,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
BLOCK_END();
}
if (S("mld_ins_discipline"))
if (S("mld_processing_group"))
{
var hideSelectors = !lBestaandeMelding || !this_mld.canBOwrite;
var initHideProcessingBlock = hideSelectors || !(mld_melding.srtgroep & 1);
@@ -1099,13 +1099,13 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
FCLTdisciplineselector("mld_ins_discipline",
"sgDisc",
{ idadd: 2,
label: L("mld_ins_discipline"),
label: L("mld_processing_group"),
disc_key: mld_melding.mld_ins_discipline_key,
module: "MLDB",
perslidKey: (lBestaandeMelding ? mld_melding.melder_key : user_key),
autfunctionKey: -1, // alles is toegestaan! authparams.autfunctionkey,
autRW: "W",
srtdisc_key: S("mld_ins_discipline_all") ? null : mld_melding.srtdisc,
srtdisc_key: S("mld_processing_group_all") ? null : mld_melding.srtdisc,
onChange: "onChangeBehandelgroep",
hidden: hideSelectors,
required: false,
@@ -1124,7 +1124,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
"sgBehandelaar",
{ perslidKey: mld_melding.behandel2_key,
idadd: 2,
label: L("lcl_mld_behandelaar2"),
label: L("lcl_mld_processor"),
autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
urlAdd: urlAdd,
hidden: hideSelectors,

2
APPL/MLD/mld_edit_melding_save.asp
View File

@@ -293,7 +293,7 @@ if (savemode)
{ dbs: "mld_alg_locatie_key", typ: "key", val: locatiekey,
savewhen: "locatiekey", track: true /* afzonderlijke tracking, wel oldjsval */ },
{ dbs: "mld_adres_key", typ: "key", frm: "del_address", track: L("lcl_delivery_address"), foreign: "mld_v_afleveradres" },
{ dbs: "mld_ins_discipline_key", typ: "key", frm: "mld_ins_discipline", track: L("mld_ins_discipline"), foreign: "mld_discipline" },
{ dbs: "mld_ins_discipline_key", typ: "key", frm: "mld_ins_discipline", track: L("mld_processing_group"), foreign: "mld_discipline" },
{ dbs: "mld_melding_behandelaar_key", typ: "key", frm: "sBehandel", track: true /* afzonderlijke tracking, wel oldjsval */ },
{ dbs: "mld_melding_behandelaar2_key", typ: "key", frm: "sBehandel2", track: true /* afzonderlijke tracking, wel oldjsval */ },
{ dbs: "mld_melding_externnr", typ: "varchar", frm: "externnr", track: L("lcl_mld_externr") },

7
APPL/MLD/mld_edit_note.inc
View File

@@ -133,8 +133,11 @@ function note_save(mld_key, note, params)
if (mld_info.nobnotify)
{
var behandelaar = -1;
if (S("mld_behandelaar2") && mld_info.behandel2_key > 0 && mld_info.behandel2_key != user_key)
behandelaar = mld_info.behandel2_key;
if (mld_info.behandel2_key > 0)
{
if (mld_info.behandel2_key != user_key)
behandelaar = mld_info.behandel2_key;
}
else if (mld_info.behandel_key > 0 && mld_info.behandel_key != user_key)
behandelaar = mld_info.behandel_key;

8
APPL/MLD/mld_list.inc
View File

@@ -1194,8 +1194,8 @@ function mld_list (pautfunction, params)
{
rst.addColumn(new Column({caption: L("lcl_behandelgegevens"), content: "mld_melding_opmerking"}));
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar"), content: fncolBehandelaar, combine: true}));
if (S("mld_behandelaar2"))
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar2"), content: fncolBehandelaar2, combine: true}));
if (S("mld_processing_group"))
rst.addColumn(new Column({caption: L("lcl_mld_processor"), content: fncolBehandelaar2, combine: true}));
}
// Meldernaam werd niet getoond bij FE, nieuw, en handig met collegas
rst.addColumn(new Column({caption: L("lcl_caller"), content: "melder"}));
@@ -1211,8 +1211,8 @@ function mld_list (pautfunction, params)
if (showBeh)
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar"), content: fncolBehandelaar }));
if (S("mld_behandelaar2") && (!(behandel2_key_arr && behandel2_key_arr.length) || print) && !(frontend && S("mld_fe_show_statusnames") == 0))
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar2"), content: fncolBehandelaar2, combine: showBeh }));
if (S("mld_processing_group") && (!(behandel2_key_arr && behandel2_key_arr.length) || print) && !(frontend && S("mld_fe_show_statusnames") == 0))
rst.addColumn(new Column({caption: L("lcl_mld_processor"), content: fncolBehandelaar2, combine: showBeh }));
rst.addColumn(new Column({caption: L("lcl_end_date_plan"), content: fncolEindDatum, nowrap: true}));
rst.addColumn(new Column({caption: L("lcl_time"), content: fncolEindTijd, nowrap: true, combine: true }));

39
APPL/MLD/mld_search.asp
View File

@@ -502,7 +502,7 @@ oRs.close();
+ " AND fac_functie_code = " + safe.quoted_sql(autfunction)
+ " AND prs_perslid_key = " + user_key + ")";
if (!S("mld_ins_discipline"))
if (!S("mld_processing_group"))
sql += aut_scope_sql;
var sqlcnt = "SELECT COUNT (1) nrsrtdisc"
@@ -520,7 +520,7 @@ oRs.close();
if (srtdisc == -1)
{
if (S("mld_ins_discipline")) // Scoping alsnog toevoegen
if (S("mld_processing_group")) // Scoping alsnog toevoegen
sql += aut_scope_sql;
sql += " ORDER BY 2";
@@ -762,7 +762,7 @@ oRs.close();
+ " UNION ALL SELECT 'MLDACP', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldacp")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDBHG', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldbhg")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDBEH', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldbeh")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDBH2', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldbh2")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDABH', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldabh")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDREJ', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldrej")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDAFM', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldafm")) + " FROM DUAL"
+ " UNION ALL SELECT 'MLDVER', " + safe.quoted_sql(L("lcl_mld_trackprefixmld")+L("lcl_mld_is_mldver")) + " FROM DUAL"
@@ -1049,12 +1049,12 @@ oRs.close();
addfixedoption: { txt: L("lcl_suggestemptytxt"), desc: L("lcl_suggestemptydesc"), key: -2 },
whenEmpty: L("lcl_search_generic") // want filter
});
if (S("mld_ins_discipline"))
if (S("mld_processing_group"))
{
FCLTdisciplineselector("mld_ins_discipline",
"sgDisc",
{ idadd: 2,
label: L("mld_ins_discipline"),
label: L("mld_processing_group"),
disc_key: mld_ins_discipline_key,
noJustOne: true,
module: "MLD",
@@ -1065,22 +1065,19 @@ 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("sBehandel2_key",
"sgBehandelaar",
{ perslidKey: behandel2_key,
idadd: 2,
label: L("lcl_mld_processor"),
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
});
}
}

4
APPL/MLD/mld_show_melding.asp
View File

@@ -540,14 +540,14 @@ function parentButton()
BLOCK_START("mldProcessing", L("lcl_mld_processing_details"));
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);
ROFIELDTR("flddisc", L("mld_processing_group"), (mld_melding.mld_srtins_prefix ? mld_melding.mld_srtins_prefix + "-" : "") + mld_melding.mld_ins_discipline_omschrijving);
}
// Actieve behandelaar
if (mld_melding.behandel2_key > 0) {
FCLTpersoonselector("sBehandel2",
"sgBehandelaar",
{ perslidKey: mld_melding.behandel2_key,
label: L("lcl_mld_behandelaar2"),
label: L("lcl_mld_processor"),
fieldId: "fldbehandel2",
moreinfo: (this_mld.canFOread || this_mld.canBOread),
readonly: true

4
APPL/PDA/melding.asp
View File

@@ -849,12 +849,12 @@ if (action != "forward")
}
if (mld_info.mld_ins_discipline_key > 0)
{
ROFIELD("fld", L("mld_ins_discipline"), (mld_info.mld_srtins_prefix ? mld_info.mld_srtins_prefix + "-" : "") + mld_info.mld_ins_discipline_omschrijving);
ROFIELD("fld", L("mld_processing_group"), (mld_info.mld_srtins_prefix ? mld_info.mld_srtins_prefix + "-" : "") + mld_info.mld_ins_discipline_omschrijving);
}
if (mld_info.behandel2_key > 0)
{
var prs_behandelaar2 = new Perslid(mld_info.behandel2_key);
ROFIELD((mld_info.behandel2_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar2"), prs_behandelaar2.naam(), { suppressEmpty: true });
ROFIELD((mld_info.behandel2_key != user_key ?"attention":"fld"), L("lcl_mld_processor"), prs_behandelaar2.naam(), { suppressEmpty: true });
}
}
else // Nieuwe

4
APPL/Shared/disciplineselector.inc
View File

@@ -50,10 +50,10 @@ function FCLTdisciplineselector(fieldName, objectName, params)
switch(params.module)
{
// Plaatsgegevens
case "MLD": { lwhenEmpty = idadd == 2 ? L("lcl_select_mld_disc") : L("lcl_select_vakgroep");
case "MLD": { lwhenEmpty = idadd == 2 ? L("lcl_select_mld_process_grp") : L("lcl_select_vakgroep");
break;
}
case "MLDB": { lwhenEmpty = L("lcl_select_mld_disc");
case "MLDB": { lwhenEmpty = L("lcl_select_mld_process_grp");
break;
}
case "BES": { lwhenEmpty = L("lcl_select_catalogus");

4
APPL/Shared/resultset_filter_table.inc
View File

@@ -1918,10 +1918,10 @@ function getRSFilterColumns(lparams)
case "behandel_key_arr":{ lfilterValue = getRSFilterValueByKey("PRS_PERSLID", lparams[lparam].join(","), L("lcl_mld_behandelaar"));
break;
}
case "behandel2_key": { lfilterValue = getRSFilterValueByKey("PRS_PERSLID", lparams[lparam], L("lcl_mld_behandelaar2"));
case "behandel2_key": { lfilterValue = getRSFilterValueByKey("PRS_PERSLID", lparams[lparam], L("lcl_mld_processor"));
break;
}
case "behandel2_key_arr":{lfilterValue = getRSFilterValueByKey("PRS_PERSLID", lparams[lparam].join(","), L("lcl_mld_behandelaar2"));
case "behandel2_key_arr":{lfilterValue = getRSFilterValueByKey("PRS_PERSLID", lparams[lparam].join(","), L("lcl_mld_processor"));
break;
}
case "caller_key": { lfilterValue = getRSFilterValueByKey("PRS_PERSLID", lparams[lparam], L("lcl_caller"));

2
APPL/Shared/status.inc
View File

@@ -129,7 +129,7 @@ var status = {
case "MLDACP" : tekst = L("lcl_mld_is_mldacp") ; break;
case "MLDBHG" : tekst = L("lcl_mld_is_mldbhg") ; break;
case "MLDBEH" : tekst = L("lcl_mld_is_mldbeh") ; break;
case "MLDBH2" : tekst = L("lcl_mld_is_mldbh2") ; break;
case "MLDABH" : tekst = L("lcl_mld_is_mldabh") ; break;
case "MLDREJ" : tekst = L("lcl_mld_is_mldrej") ; break;
case "MLDAFM" : tekst = L("lcl_mld_is_mldafm") ; break;
case "MLDAFR" : tekst = L("lcl_mld_is_mldafr") ; break;