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

ARAI#38923 filterveld Taakcategorie toegevoegd

Browse Source 
svn path=/Website/trunk/; revision=32746
This commit is contained in:
Koen Reefman
2017-02-08 13:32:33 +00:00
parent 9f5d12a82d
commit 85dd452647
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/MJB/mjb_search.asp
View File

@@ -37,6 +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 srtdeel = getQParamInt("srtdeel", -1); // Objectsoort
var groep = getQParam("groep", ""); // Groep
var srtcontrole = getQParamInt("srtcontrole", -1); // Taak
@@ -169,6 +170,24 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
whenEmpty: L("lcl_search_generic") // want dit is een filter
});
// <!-- Taakcategorie -->
var sql = "SELECT i.ins_discipline_key,"
+ " i.ins_discipline_omschrijving"
+ " FROM ins_tab_discipline i, ctr_disc_params c"
+ " WHERE i.ins_discipline_key = c.ctr_ins_discipline_key(+)"
+ " AND c.ctr_disc_params_ismjob = 1"
+ " AND i.ins_discipline_module = 'CTR'"
+ " AND ins_discipline_verwijder IS NULL"
+ " ORDER BY ins_discipline_omschrijving";
FCLTselector("categorie",
sql,
{ initKey: categorie,
label: L("ctr_discipline"),
emptyOption: L("lcl_all"),
trclass: "primsearch noxd"
});
// <!-- Groep-->
var sql = "SELECT DISTINCT COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"

9
APPL/MJB/mjb_search_list.asp
View File

@@ -58,8 +58,9 @@ var fromyear = getQParamInt("fromyear", new Date().getFullYear());
var toyear = getQParamInt("toyear");
var deel = getQParam("deel", ""); // Identieficatie
var groep = getQParam("groep", ""); // Categorie/Groep
var groep = getQParam("groep", ""); // Groep
if (groep == -1) groep = "";
var categorie = getQParamInt("categorie", -1); // Categorie
//var reg_key = getQParamInt("regiokey", -1); // Regio
var dist_key = getQParamInt("districtkey", -1);
var loc_key = getQParamInt("locatiekey", -1); // Locatie
@@ -79,6 +80,7 @@ if (ctrdisc_key > 0)
var params = { deel: (deel != ""? deel : null),
groep: (groep != ""? groep : null),
categorie: categorie,
dist_key: dist_key,
loc_key: loc_key,
bld_key: bld_key,
@@ -92,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"]);
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie", "frequentie", "incbtw", "toyear", "alg_startlevel", "alg_endlevel", "deel", "groep", "categorie"]);
%>
<html>
<head>
@@ -340,6 +342,9 @@ 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
: "")
+ (srtcontrole.length > 0
? " AND el.ins_srtcontrole_key IN (" + srtcontrole.join(",") + ")"
: "")