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

ARAI#38923 _key's gemaakt waar nodig

Browse Source 
svn path=/Website/trunk/; revision=32768
This commit is contained in:
Koen Reefman
2017-02-09 10:02:37 +00:00
parent 91362a2dfd
commit 5b30731d29
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/MJB/mjb_search.asp
View File

@@ -37,7 +37,7 @@ var flr_key = getQParamInt("verdieping_key", -1); // Verdieping
var room_key = getQParamInt("ruimte_key", -1); // Ruimte
var disc = getQParamInt("disc", -1); // Discipline initialisatie
var srtgroep = getQParamInt("srtgroep", -1); // Groep
var categorie = getQParamInt("categorie", -1); // Categorie
var categorie_key = getQParamInt("categorie_key", -1); // Categorie
var srtdeel = getQParamInt("srtdeel", -1); // Objectsoort
var groep = getQParam("groep", ""); // Groep
var srtcontrole = getQParamInt("srtcontrole", -1); // Taak
@@ -180,9 +180,9 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
+ " AND ins_discipline_verwijder IS NULL"
+ " ORDER BY ins_discipline_omschrijving";
FCLTselector("categorie",
FCLTselector("categorie_key",
sql,
{ initKey: categorie,
{ initKey: categorie_key,
label: L("ctr_discipline"),
emptyOption: L("lcl_all"),
trclass: "primsearch noxd"

10
APPL/MJB/mjb_search_list.asp
View File

@@ -60,7 +60,7 @@ var toyear = getQParamInt("toyear");
var deel = getQParam("deel", ""); // Identieficatie
var groep = getQParam("groep", ""); // Groep
if (groep == -1) groep = "";
var categorie = getQParamInt("categorie", -1); // Categorie
var categorie_key = getQParamInt("categorie_key", -1); // Categorie
//var reg_key = getQParamInt("regiokey", -1); // Regio
var dist_key = getQParamInt("districtkey", -1);
var loc_key = getQParamInt("locatiekey", -1); // Locatie
@@ -80,7 +80,7 @@ if (ctrdisc_key > 0)
var params = { deel: (deel != ""? deel : null),
groep: (groep != ""? groep : null),
categorie: categorie,
categorie_key: categorie_key,
dist_key: dist_key,
loc_key: loc_key,
bld_key: bld_key,
@@ -94,7 +94,7 @@ var params = { deel: (deel != ""? deel : null),
mjbfreq: frequentie.join(","),
mjbincbtw: incbtw
};
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie", "frequentie", "incbtw", "toyear", "alg_startlevel", "alg_endlevel", "deel", "groep", "categorie"]);
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie", "frequentie", "incbtw", "toyear", "alg_startlevel", "alg_endlevel", "deel", "groep", "categorie_key"]);
%>
<html>
<head>
@@ -342,8 +342,8 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ (groep
? " AND UPPER(ins_srtcontrole_groep) LIKE " + safe.quoted_sql_wild("%" + groep + "%")
: "")
+ (categorie > 0
? " AND el.ctr_discipline_key = " + categorie
+ (categorie_key > 0
? " AND el.ctr_discipline_key = " + categorie_key
: "")
+ (srtcontrole.length > 0
? " AND el.ins_srtcontrole_key IN (" + srtcontrole.join(",") + ")"