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

ARAI#55192: Taakgroep in MJOB console multi-select maken.

Browse Source 
svn path=/Website/trunk/; revision=39727
This commit is contained in:
Maykel Geerdink
2018-11-08 14:22:50 +00:00
parent 940b62233f
commit 67724429e1
3 changed files with 151 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MJB/mjb_search.asp
View File

@@ -460,7 +460,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ initKey: groep,
label: L("ins_srtcontrole_groep"),
multi: true,
emptyOption: L("lcl_all"),
emptyOption: "",
trclass: "primsearch"
});

40
APPL/MJB/mjb_search_list.asp
View File

@@ -62,7 +62,14 @@ var toyear = getQParamInt("toyear");
var deel = getQParam("deel", ""); // Identieficatie
var groep = getQParamArray("groep", []); // Groep
if (groep == "-1") groep = [];
for (var i = 0; i < groep.length; i++)
{ // De lege "-1" waarde er tussen uit halen, anders wordt deze op de printbon weergegeven.
if (groep[i] == "-1")
{
groep.splice(i, 1);
break;
}
}
var categorie_key = getQParamInt("categorie_key", -1); // Categorie
//var reg_key_arr = getQParamIntArray("regiokey", []); // Regio
var dist_key_arr = getQParamIntArray("districtkey", []); // District
@@ -72,7 +79,23 @@ var disc_key = getQParamInt("disc", -1);
var srtgroep_key = getQParamInt("srtgroep", -1);
var srtdeel_key = getQParamInt("srtdeel", -1);
var srtcontrole = getQParamIntArray("srtcontrole", []); // Taak
for (var i = 0; i < srtcontrole.length; i++)
{
if (srtcontrole[i] == "-1")
{ // De lege "-1" waarde er tussen uit halen, anders wordt deze op de printbon weergegeven.
srtcontrole.splice(i, 1);
break;
}
}
var frequentie = getQParamIntArray("frequentie", []); // Array met frequenties.
for (var i = 0; i < frequentie.length; i++)
{ // De lege "-1" waarde er tussen uit halen, anders wordt deze op de printbon weergegeven.
if (frequentie[i] == "-1")
{
frequentie.splice(i, 1);
break;
}
}
var kp_key = getQParamInt("account", -1); // Kostenplaats.
var incbtw = getQParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven.
var inflatiepct = S("mjb_inflation");
@@ -102,7 +125,6 @@ if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
var filterParams = { deel: (deel != ""? deel : null),
groep: groep.join(","),
categorie_key: categorie_key,
dist_key_arr: dist_key_arr,
loc_key_arr: loc_key_arr,
@@ -113,13 +135,25 @@ var filterParams = { deel: (deel != ""? deel : null),
kp_key: kp_key,
mjbgroup: groupby,
mjbtoyear: toyear,
mjbscgroep: groep.join(", "),
mjbsrtcontr: srtcontrole.join(","),
mjbinfl_pct: inflatiepct,
mjbfreq: frequentie.join(","),
mjbincbtw: incbtw,
mjbscenario: scenario,
mjbactsit: actsit,
mjbshowempty: mjbshowempty
mjbshowempty: mjbshowempty,
mjbMoved: mjbMoved,
mjbFreezed: mjbFreezed,
mjbXcped: mjbXcped,
mjbs1_from: fitness_score1_from > 0? fitness_score1_from : null,
mjbs1_to: fitness_score1_through,
mjbs1_fromneg: fitness_score1_from_neg,
mjbs1_toneg: fitness_score1_through_neg,
mjbs1_frompos: fitness_score1_from_pos,
mjbs1_topos: fitness_score1_through_pos,
mjbs2_from: priority_score2_from,
mjbs2_to: priority_score2_through
};
var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "districtkey", "locatiekey", "gebouwkey",
"disc", "srtgroep", "srtdeel", "srtcontrole",

113
APPL/Shared/resultset_filter_table.inc
View File

@@ -756,6 +756,31 @@ function getRSFilterSumOverBelow(lparams)
return lfilterSumOverBelow;
}
function getRSFilterShownMjb(lparams)
{
var lshownmjb = "";
var first = true;
var lSep = ", ";
if (lparams.mjbMoved)
{
lshownmjb = L("lcl_mjb_moved");
first = false;
}
if (lparams.mjbFreezed)
{
lshownmjb += (!first? lSep : "") + L("lcl_mjb_started");
first = false;
}
if (lparams.mjbXcped)
{
lshownmjb += (!first? lSep : "") + L("lcl_mjb_overruled_xcp");
first = false;
}
return lshownmjb;
}
function getRSFilterShownMld(lparams)
{
var lshownmld = "";
@@ -888,6 +913,53 @@ function getRSFilterSrtdisDiscStdmld(lparams)
return lfilterSrtdisDiscStdmld;
}
function getRSFilterConditionScores(lparams)
{
var lfilterDates = {content: "", count: 0};
if (lparams.mjbs1_from > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs1_from, "<nobr>" + L("lcl_mjb_fitness_score") + " " + L("lcl_mjb_from") + "</nobr>", true);
lfilterDates.count++;
}
if (lparams.mjbs1_to > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs1_to, "<nobr>" + L("lcl_mjb_fitness_score") + " " + L("lcl_mjb_through") + "</nobr>", true);
lfilterDates.count++;
}
if (lparams.mjbs1_fromneg > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs1_fromneg, "<nobr>" + L("lcl_mjb_fitness_score")+ " " + L("lcl_mbj_negative_dev") + " " + L("lcl_mjb_from") + "</nobr>");
lfilterDates.count++;
}
if (lparams.mjbs1_toneg > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs1_toneg, "<nobr>" + L("lcl_mjb_fitness_score")+ " " + L("lcl_mbj_negative_dev") + " " + L("lcl_mjb_through") + "</nobr>");
lfilterDates.count++;
}
if (lparams.mjbs1_frompos > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs1_frompos, "<nobr>" + L("lcl_mjb_fitness_score")+ " " + L("lcl_mjb_positive_dev") + " " + L("lcl_mjb_from") + "</nobr>");
lfilterDates.count++;
}
if (lparams.mjbs1_topos > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs1_topos, "<nobr>" + L("lcl_mjb_fitness_score")+ " " + L("lcl_mjb_positive_dev") + " " + L("lcl_mjb_through") + "</nobr>");
lfilterDates.count++;
}
if (lparams.mjbs2_from > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs2_from, "<nobr>" + L("lcl_mjb_priority_score") + " " + L("lcl_mjb_from") + "</nobr>", true);
lfilterDates.count++;
}
if (lparams.mjbs2_to > 0)
{
lfilterDates.content += getRSFilterValueByValue(lparams.mjbs2_to, "<nobr>" + L("lcl_mjb_priority_score") + " " + L("lcl_mjb_through") + "</nobr>", true);
lfilterDates.count++;
}
return lfilterDates;
}
function getRSFilterDates(lparams)
{
var lfilterDates = {content: "", count: 0};
@@ -1368,6 +1440,7 @@ function getRSFilterColumns(lparams)
var askFilterBesStatus = true;
var askFilterKsgrpKs = true;
var askFilterCntStatus = true;
var askFilterConditionScores = true;
var askFilterDates = true;
var askFilterDisGroupItem = true;
var askFilterDisGroupObjsrt = true;
@@ -1377,11 +1450,13 @@ function getRSFilterColumns(lparams)
var askFilterPlace = true;
var askFilterResType = true;
var askFilterShownFac = true;
var askFilterShownMjb = true;
var askFilterShownMld = true;
var askFilterShownRes = true;
var askFilterSrtdisDiscStdmld = true;
var askFilterSumOverBelow = true;
var lfilterBesGroup = {content: "", count: 0};
var lfilterConditionScores = {content: "", count: 0};
var lfilterDates = {content: "", count: 0};
var lfilterReportDates = {content: "", count: 0};
var lfilterColumnRight = {content: "", count: 0}
@@ -1756,6 +1831,9 @@ function getRSFilterColumns(lparams)
case "mjbtoyear": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_mjb_uptoyear"));
break;
}
case "mjbscgroep": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("ins_srtcontrole_groep"));
break;
}
case "mjbsrtcontr": { lfilterValue = getRSFilterValueByKey("INS_SRTCONTROLE", lparams[lparam], L("lcl_ins_controle_srt"));
break;
}
@@ -1778,6 +1856,41 @@ function getRSFilterColumns(lparams)
lfilterValue = getRSFilterValueByValue(L("lcl_Yes"), L("lcl_mjb_empty_lines_too"));
break;
}
case "mjbMoved":
case "mjbFreezed":
case "mjbXcped": { if (askFilterShownMjb)
{
lfilterValue = getRSFilterValueByValue(getRSFilterShownMjb(lparams), "<nobr>" + L("lcl_mjb_status_mjob") + "</nobr>");
askFilterShownMjb = false;
}
else
{
lfilterValue = "";
lcount = 0;
}
break;
}
case "mjbs1_from":
case "mjbs1_to":
case "mjbs1_fromneg":
case "mjbs1_toneg":
case "mjbs1_frompos":
case "mjbs1_topos":
case "mjbs2_from":
case "mjbs2_to": { if (askFilterConditionScores)
{
lfilterConditionScores = getRSFilterConditionScores(lparams); // Alle datum gegevens ophalen en onder elkaar weergeven
lfilterValue = lfilterConditionScores.content;
lcount = lfilterConditionScores.count;
askFilterConditionScores = false;
}
else
{
lfilterValue = "";
lcount = 0;
}
break;
}
// MLD gegevens
case "srtdisc_key": // Discipline, Groep en Objectsoort
case "disc_key_arr":