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

svn path=/Website/trunk/; revision=39706
This commit is contained in:
Maykel Geerdink
2018-11-07 14:49:25 +00:00
parent 21616e1488
commit 962674660e
3 changed files with 6 additions and 6 deletions

View File

@@ -3302,8 +3302,8 @@ ins = {checkAutLevel:
+ (srtdeel_key > 0
? " AND el.ins_srtdeel_key = " + srtdeel_key
: "")
+ (groep
? " AND UPPER(ins_srtcontrole_groep) LIKE " + safe.quoted_sql_wild("%" + groep + "%")
+ (groep.length > 0
? " AND UPPER(ins_srtcontrole_groep) IN (" + safe.quoted_sql_join(groep, true) + ")"
: "")
+ (categorie_key > 0
? " AND el.ctr_discipline_key = " + categorie_key

View File

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

View File

@@ -61,8 +61,7 @@ var fromyear = getQParamInt("fromyear", new Date().getFullYear());
var toyear = getQParamInt("toyear");
var deel = getQParam("deel", ""); // Identieficatie
var groep = getQParam("groep", ""); // Groep
if (groep == -1) groep = "";
var groep = getQParamArray("groep", []); // Groep
var categorie_key = getQParamInt("categorie_key", -1); // Categorie
//var reg_key_arr = getQParamIntArray("regiokey", []); // Regio
var dist_key_arr = getQParamIntArray("districtkey", []); // District
@@ -102,7 +101,7 @@ if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
var filterParams = { deel: (deel != ""? deel : null),
groep: (groep != ""? groep : null),
groep: groep.join(","),
categorie_key: categorie_key,
dist_key_arr: dist_key_arr,
loc_key_arr: loc_key_arr,
@@ -148,7 +147,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
var disc_key = <%=disc_key%>;
var srtgroep_key = <%=srtgroep_key%>;
var srtdeel_key = <%=srtdeel_key%>;
var groep = "<%=safe.jsstring(groep)%>";
var groep = "<%=safe.jsstring(groep.join(","))%>";
var categorie_key = <%=categorie_key%>;
var srtcontrole = "<%=srtcontrole.join(",")%>";
var frequentie = "<%=frequentie.join(",")%>";