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

PLAT#41507 Lege regels in MJB overzicht kunnen onderdrukken via fnrowFilter

Browse Source 
svn path=/Website/trunk/; revision=34922
This commit is contained in:
Jos Groot Lipman
2017-08-14 07:47:26 +00:00
parent 62f407636c
commit 45016d5078
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
APPL/MJB/mjb_search.asp
View File

@@ -61,6 +61,7 @@ var toyear = getQParamInt("toyear", new Date().getFullYear() + S("mjb_show_years
var incbtw = getQParamInt("incbtw", 0) == 1; var incbtw = getQParamInt("incbtw", 0) == 1;
var scen_key = getQParamInt("scenario", 1); // Scenario var scen_key = getQParamInt("scenario", 1); // Scenario
var actsit = getQParamInt("actsit", 0) == 1; var actsit = getQParamInt("actsit", 0) == 1;
var mjbempty = getQParamInt("mjbempty", 1) == 1;
var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
var mjbMoved = (getQParamInt("mjbMoved", 0) == 1); var mjbMoved = (getQParamInt("mjbMoved", 0) == 1);
@@ -174,7 +175,6 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
startlevel: alg_startlevel, startlevel: alg_startlevel,
eindlevel: alg_endlevel, // ruimte/werkplek eindlevel: alg_endlevel, // ruimte/werkplek
filtercode: "INCVR", filtercode: "INCVR",
trclass: "noxd",
whenEmpty: L("lcl_search_generic") // want filter whenEmpty: L("lcl_search_generic") // want filter
}); });
// Discipline // Discipline
@@ -188,7 +188,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
autfunctionKey: authparamsINSUSE.autfunctionkey, autfunctionKey: authparamsINSUSE.autfunctionkey,
autRW: "R", autRW: "R",
onChange: "onChangeDiscipline", // disgroepChanged onChange: "onChangeDiscipline", // disgroepChanged
trclass: "primsearch noxd", trclass: "primsearch",
whenEmpty: L("lcl_search_generic") whenEmpty: L("lcl_search_generic")
}); });
// Soort groep // Soort groep
@@ -199,7 +199,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
autfunction: autfunctionINSUSE, autfunction: autfunctionINSUSE,
onChange: "onChangeSrtgroep", onChange: "onChangeSrtgroep",
urlAdd: [{urlParam: "disc_key", field: "disc"}], urlAdd: [{urlParam: "disc_key", field: "disc"}],
trclass: "primsearch noxd", trclass: "primsearch",
whenEmpty: L("lcl_search_generic") whenEmpty: L("lcl_search_generic")
}); });
@@ -213,7 +213,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
onChange: "onChangeSrtdeel", onChange: "onChangeSrtdeel",
urlAdd: [{urlParam: "srtgroep_key", field: "srtgroep"}, urlAdd: [{urlParam: "srtgroep_key", field: "srtgroep"},
{urlParam: "disc_key", field: "disc"}], {urlParam: "disc_key", field: "disc"}],
trclass: "primsearch noxd", trclass: "primsearch",
whenEmpty: L("lcl_search_generic") // want dit is een filter whenEmpty: L("lcl_search_generic") // want dit is een filter
}); });
@@ -233,12 +233,13 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ label: L("lcl_mjb_scenario"), { label: L("lcl_mjb_scenario"),
initKey: scen_key, initKey: scen_key,
//multi: true, // Voor nu niet multi //multi: true, // Voor nu niet multi
trclass:"primsearch noxd", trclass:"primsearch",
emptyKey: 1, emptyKey: 1,
emptyOption: "", emptyOption: "",
onChange: "onChangeScenario()" onChange: "onChangeScenario()"
}); });
RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_also_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch noxd tractsit'}); RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_also_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch tractsit'});
RWCHECKBOXTR("mjbshowempty", "fldmjbempty", L("lcl_mjb_empty_lines_too"), mjbempty, { html: " value='1' ", trclass: 'primsearch'});
} }
oRs.Close(); oRs.Close();
} }
@@ -266,7 +267,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ initKey: categorie_key, { initKey: categorie_key,
label: L("ctr_discipline"), label: L("ctr_discipline"),
emptyOption: L("lcl_all"), emptyOption: L("lcl_all"),
trclass: "primsearch noxd" trclass: "primsearch"
}); });
// <!-- Groep--> // <!-- Groep-->
@@ -283,7 +284,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ initKey: groep, { initKey: groep,
label: L("ins_srtcontrole_groep"), label: L("ins_srtcontrole_groep"),
emptyOption: L("lcl_all"), emptyOption: L("lcl_all"),
trclass: "primsearch noxd" trclass: "primsearch"
}); });
sql = "SELECT ins_srtcontrole_key" sql = "SELECT ins_srtcontrole_key"
@@ -304,7 +305,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ initKey: srtcontrole, { initKey: srtcontrole,
label: L("lcl_ins_controle_srt"), label: L("lcl_ins_controle_srt"),
multi: true, multi: true,
trclass:"primsearch noxd", trclass:"primsearch",
emptyOption: "" emptyOption: ""
}); });
sql = "SELECT DISTINCT COALESCE(xcp.ins_srtcontroledl_xcp_periode, isc.ins_srtcontrole_periode) periode_key" sql = "SELECT DISTINCT COALESCE(xcp.ins_srtcontroledl_xcp_periode, isc.ins_srtcontrole_periode) periode_key"
@@ -320,11 +321,11 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ initKey: frequentie, { initKey: frequentie,
label: L("lcl_mjb_frequency"), label: L("lcl_mjb_frequency"),
multi: true, multi: true,
trclass:"primsearch noxd", trclass:"primsearch",
emptyOption: "" emptyOption: ""
}); });
RWCHECKBOXTR("incbtw", "fldincbtw", L("lcl_mjb_inclbtw"), incbtw, { html: " value='1' ", trclass: 'noxd'}); RWCHECKBOXTR("incbtw", "fldincbtw", L("lcl_mjb_inclbtw"), incbtw, { html: " value='1' "});
sql = "SELECT 1, " + safe.qL("lcl_district") + ", 1 FROM DUAL" sql = "SELECT 1, " + safe.qL("lcl_district") + ", 1 FROM DUAL"
+ " UNION SELECT 2, " + safe.qL("lcl_building") + ", 2 FROM DUAL" + " UNION SELECT 2, " + safe.qL("lcl_building") + ", 2 FROM DUAL"
+ " UNION SELECT 3, " + safe.qL("lcl_discipline") + ", 3 FROM DUAL" + " UNION SELECT 3, " + safe.qL("lcl_discipline") + ", 3 FROM DUAL"

17
APPL/MJB/mjb_search_list.asp
View File

@@ -78,6 +78,7 @@ var incbtw = getQParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven.
var scenario = getQParamInt("scenario", 1); // Scenario var scenario = getQParamInt("scenario", 1); // Scenario
var actsit = getQParamInt("actsit", 0) == 1; // Ook actuele situatie. var actsit = getQParamInt("actsit", 0) == 1; // Ook actuele situatie.
var mjbshowempty = getQParamInt("mjbshowempty", 0) == 1; // Ook lege regels.
// FORM status checkboxes // FORM status checkboxes
var mjbMoved = getQParamInt("mjbMoved", 0) == 1; // Verschoven. var mjbMoved = getQParamInt("mjbMoved", 0) == 1; // Verschoven.
@@ -950,6 +951,21 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
return lclass; return lclass;
} }
// true als er *ergens* een bedrag is ingevuld
function fnrowFilter(oRs)
{
if (mjbshowempty)
return true;
for (var j = 0; j < jaren.length; j++)
{
if (oRs(String(jaren[j])).Value)
return true;
}
return false;
}
function fnrowActionEnabler(oRs) function fnrowActionEnabler(oRs)
{ {
@@ -1158,6 +1174,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
ID: "mjobtable", ID: "mjobtable",
rowData: fnrowData, rowData: fnrowData,
rowClass: fnrowClass, rowClass: fnrowClass,
rowFilter: fnrowFilter,
//suppressKeyRepeat: "alg_locatie_omschrijving", //suppressKeyRepeat: "alg_locatie_omschrijving",
rowActionEnabler: fnrowActionEnabler, rowActionEnabler: fnrowActionEnabler,
totalShow: totalShow, totalShow: totalShow,

4
APPL/Shared/resultset_table_v2.inc
View File

@@ -208,6 +208,7 @@ ResultsetTable.prototype.addColumn = __rsAddColumn;
ResultsetTable.prototype.startPrint = __rsStartPrint; ResultsetTable.prototype.startPrint = __rsStartPrint;
ResultsetTable.prototype.endPrint = __rsEndPrint; ResultsetTable.prototype.endPrint = __rsEndPrint;
ResultsetTable.prototype.addAction = __rsAddAction; ResultsetTable.prototype.addAction = __rsAddAction;
ResultsetTable.prototype.rowFilter = function (oRs) { return true };
function __rsAddAction(params) function __rsAddAction(params)
{ {
@@ -845,7 +846,8 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al
lastHadFlex = !noFlexResult; lastHadFlex = !noFlexResult;
// Een row van ResultsetTable // Een row van ResultsetTable
html += makeTableRow(oRs, oRsFlexData, cnt, anyMultiActions, noFlexResult); if (rowFilter(oRs))
html += makeTableRow(oRs, oRsFlexData, cnt, anyMultiActions, noFlexResult);
if (this.buildHistogram) if (this.buildHistogram)
this.countHistogram(oRs); this.countHistogram(oRs);