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

SUTF#26060: Afdelings-catalogus-budget.

Browse Source 
svn path=/Website/trunk/; revision=17680
This commit is contained in:
Maykel Geerdink
2013-04-18 11:35:57 +00:00
parent 95ccf2f48f
commit 86eaf2d78a
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/PRS/kpn_edit_kpncat.asp
View File

@@ -118,7 +118,7 @@ if (kpndisc_key > -1)
, "sgDisc"
, { label: L("lcl_bes_discipline")
, disc_key: kpn_disc
, module: "BES,MLD" // Alleen de disciplines van BES en MLD tonen
, module: "BES" // Alleen de disciplines van BES en MLD tonen
, perslidKey: user_key
, autfunctionKey: -1 // alles is toegestaan! authparams.autfunctionkey,
, srtdisc_key: null // alles mag

7
APPL/Shared/Suggest/disciplineFilter.inc
View File

@@ -17,12 +17,7 @@ function getFiltClauseDiscipline(pfiltcode, params)
var lfiltClause = {from: "", where: ""};
if (params.module == "BES")
{
lfiltClause.from = ", bes_srtgroep sg"
+ ", bes_srtdeel bsd";
lfiltClause.where = " AND td.ins_discipline_key = sg.ins_discipline_key"
+ " AND sg.bes_srtgroep_key = bsd.bes_srtgroep_key"
+ " AND td.ins_discipline_module = 'BES'"
+ " AND bsd.bes_srtdeel_verwijder IS NULL";
lfiltClause.where = " AND td.ins_discipline_module = 'BES'";
}
else if (params.module == "INS")
{

18
APPL/Shared/disciplineselector.inc
View File

@@ -35,7 +35,23 @@ function FCLTdisciplineselector(fieldName, objectName, params)
// Is er een initiele waarde meegegeven? Zoek dan de omschrijving erbij!
// Is er geen initiele waarde meegegeven? Controleer dan of er misschien maar <20><>n waarde is die geselecteerd moet worden.
var ldiscName = params.readonly ? "" : (params.module == "MLD"? L("lcl_select_vakgroep") : L("lcl_select_discipline"));
var ldiscName = "";
if (!params.readonly)
{
switch(params.module)
{
// Plaatsgegevens
case "MLD": { ldiscName = L("lcl_select_vakgroep");
break;
}
case "BES": { ldiscName = L("lcl_select_catalogus");
break;
}
default: { ldiscName = L("lcl_select_discipline");
break;
}
}
}
var lextraInit = "";
var filtClause = getFiltClauseDiscipline(params.filtercode, params);
var extraInf = getExtraInfDiscipline(params.extracode);