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

GRKL#54907 Je kan nu in een multisuggest op <<Leeg>> én waarde(s) tegelijkertijd zoeken bij behandelgroep en (actieve) behandelaar

Browse Source 
svn path=/Website/trunk/; revision=40030
This commit is contained in:
Koen Reefman
2018-11-29 13:06:37 +00:00
parent 47d903e0c9
commit b56cbe5d40
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/MLD/mld.inc
View File

@@ -1653,11 +1653,12 @@ mld = {setmeldingstatus:
sqln += " AND m.mld_workflowstep_key IS NULL" ; // workflowvervolgmeldingen wel gewoon
}
if (mld_ins_discipline_key_arr && mld_ins_discipline_key_arr.length)
{
if (mld_ins_discipline_key_arr.length == 1 && mld_ins_discipline_key_arr[0] == -2)
sqln += " AND m.mld_ins_discipline_key IS NULL";
else if (inArray(-2, mld_ins_discipline_key_arr))
sqln += " AND (m.mld_ins_discipline_key IS NULL OR m.mld_ins_discipline_key IN (" + mld_ins_discipline_key_arr.join(", ") + "))";
else
sqln += " AND m.mld_ins_discipline_key IN (" + mld_ins_discipline_key_arr.join(", ") + ")";
}
@@ -1666,6 +1667,8 @@ mld = {setmeldingstatus:
{
if (behandel_key_arr.length == 1 && behandel_key_arr[0] == -2)
sqln += " AND m.mld_melding_behandelaar_key IS NULL";
else if (inArray(-2, behandel_key_arr))
sqln += " AND (m.mld_melding_behandelaar_key IS NULL OR m.mld_melding_behandelaar_key IN (" + behandel_key_arr.join(", ") + "))";
else
sqln += " AND m.mld_melding_behandelaar_key IN (" + behandel_key_arr.join(", ") + ")";
}
@@ -1678,6 +1681,8 @@ mld = {setmeldingstatus:
{
if (behandel2_key_arr.length == 1 && behandel2_key_arr[0] == -2)
sqln += " AND m.mld_melding_behandelaar2_key IS NULL";
else if (inArray(-2, behandel2_key_arr))
sqln += " AND (m.mld_melding_behandelaar2_key IS NULL OR m.mld_melding_behandelaar2_key IN (" + behandel2_key_arr.join(", ") + "))";
else
sqln += " AND m.mld_melding_behandelaar2_key IN (" + behandel2_key_arr.join(", ") + ")";
}

12
APPL/MLD/mld_list.inc
View File

@@ -171,6 +171,14 @@ function mld_list (pautfunction, params)
var mld_ins_discipline_key_arr = params.mld_ins_discipline_key_arr;
var behandel_key_arr = params.behandel_key_arr;
var behandel2_key_arr = params.behandel2_key_arr;
// Remove -1 from Array's
var index = sharedIndexOf(-1, behandel_key_arr);
if (index > -1) behandel_key_arr.splice(index, 1);
index = sharedIndexOf(-1, behandel2_key_arr);
if (index > -1) behandel2_key_arr.splice(index, 1);
var disc_key_arr = params.disc_key_arr;
var offertes = params.offertes;
@@ -1224,13 +1232,13 @@ function mld_list (pautfunction, params)
{
// als je er op filtert weet je het wel, maar op de print vind ik wel leuk
// als de frontend bij de statusinfo niet mag zien Wie het doet, mag die hier ook niet de behandelaar zien
if ((!(behandel_key_arr && behandel_key_arr.length) || print) && !(frontend && S("mld_fe_show_statusnames") == 0))
if ((!(behandel_key_arr && behandel_key_arr.length == 1) || print) && !(frontend && S("mld_fe_show_statusnames") == 0))
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar"), content: fncolBehandelaar }));
if (S("mld_processing_group"))
{
rst.addColumn(new Column({caption: L("mld_processing_group"), content: "behandelgroep"}));
if ((!(behandel2_key_arr && behandel2_key_arr.length) || print) && !(frontend && S("mld_fe_show_statusnames") == 0))
if ((!(behandel2_key_arr && behandel2_key_arr.length == 1) || print) && !(frontend && S("mld_fe_show_statusnames") == 0))
rst.addColumn(new Column({caption: L("lcl_mld_processor"), content: fncolBehandelaar2, combine: true }));
}
rst.addColumn(new Column({caption: L("lcl_end_date_plan"), content: fncolEindDatum, nowrap: true}));

8
APPL/Shared/Suggest/suggest.js
View File

@@ -18,7 +18,7 @@
params.noJustOne,
params.JSONP
params.multitoggle (true|false voor alle, of [0-6] voor plaatsselector, t/m alg_level #multitoggle
params.addemptyoption voegt een 'Leeg' toe met key=-2
params.addfixedoption Voegt een vaste optie toe, meegegeven als {key, txt, desc}
params.embedded Kijk nooit naar het parent document (embedded)
Context:
Note: Pas op met gebruiken functies uit andere modules. Dit bestand
@@ -414,6 +414,12 @@ function Suggest(inParams)
$sel.append($("<option>").attr("disabled", true)
.attr("title", L("lcl_shared_suggest_toomany"))
.text(L("lcl_shared_suggest_toomany")));
if (params.addfixedoption && "key" in params.addfixedoption && "desc" in params.addfixedoption && "txt" in params.addfixedoption)
$sel.append($("<option>").attr("value", params.addfixedoption.key)
.attr("title", params.addfixedoption.desc)
.text(params.addfixedoption.txt));
var $option;
var keys_arr = storeKeyField.value.split(",");
for (var i=0; i < data.result.length; i++)