diff --git a/APPL/ALG/alg_verdieping_list.inc b/APPL/ALG/alg_verdieping_list.inc index 1942a50f5f..2ef61b5ab6 100644 --- a/APPL/ALG/alg_verdieping_list.inc +++ b/APPL/ALG/alg_verdieping_list.inc @@ -87,11 +87,11 @@ function verdiepingen_list(pautfunction, params) var noref = params.noref; - var reg_key = params.reg_key; - var dis_key = params.dis_key; - var loc_key = params.loc_key; - var bld_key = params.bld_key; - var lvl_key = params.lvl_key; + var reg_key_arr = params.reg_key_arr; + var dis_key_arr = params.dis_key_arr; + var loc_key_arr = params.loc_key_arr; + var bld_key_arr = params.bld_key_arr; + var lvl_key_arr = params.lvl_key_arr; var chkgeb = params.chkgeb; function fnrowActionEnabler(oRs) @@ -146,24 +146,24 @@ function verdiepingen_list(pautfunction, params) sqln += getKenmerkSql("ALG", "v.alg_verdieping_key"); - if (lvl_key) + if (lvl_key_arr.length) { - sqln += " AND v.alg_verdieping_key = " + lvl_key; + sqln += " AND v.alg_verdieping_key IN (" + lvl_key_arr.join(",") + ")"; } - else if (bld_key) + else if (bld_key_arr.length) { - sqln += " AND g.alg_gebouw_key = " + bld_key; + sqln += " AND g.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")"; } - else if (loc_key) + else if (loc_key_arr.length) { - sqln += " AND g.alg_locatie_key = " + loc_key; + sqln += " AND g.alg_locatie_key IN (" + loc_key_arr.join(",") + ")"; } - else if (dis_key) - sqln += " AND l.alg_district_key = " + dis_key; - else if (reg_key) - sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")"; + else if (dis_key_arr.length) + sqln += " AND l.alg_district_key IN (" + dis_key_arr.join(",") + ")"; + else if (reg_key_arr.length) + sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key IN (" + reg_key_arr.join(",") +"))"; if (!chkgeb) sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) "; @@ -173,7 +173,7 @@ function verdiepingen_list(pautfunction, params) + " v.alg_verdieping_volgnr ASC "; var addurl = "appl/alg/alg_verdieping.asp"; -// addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params) // TODO: welke allemaal? +// addurl += buildTransitParam(["loc_key_arr", "bld_key_arr", "flo_key", "room_key"], params) // TODO: welke allemaal? if (canAdd) { diff --git a/APPL/ALG/alg_verdieping_search.asp b/APPL/ALG/alg_verdieping_search.asp index 7a1bed13ee..6ea3ceaecd 100644 --- a/APPL/ALG/alg_verdieping_search.asp +++ b/APPL/ALG/alg_verdieping_search.asp @@ -63,6 +63,7 @@ var authparams = alg.checkAutorisation(); locatiekey: locatie_key, gebouwkey: gebouw_key, verdiepingkey: verdieping_key, + multitoggle: 4, startlevel: 2, // locatie eindlevel: 4, // verdieping whenEmpty: L("lcl_search_generic") // want filter diff --git a/APPL/ALG/alg_verdieping_search_list.asp b/APPL/ALG/alg_verdieping_search_list.asp index ad6870fa93..fd2c3c2a50 100644 --- a/APPL/ALG/alg_verdieping_search_list.asp +++ b/APPL/ALG/alg_verdieping_search_list.asp @@ -22,24 +22,24 @@ var outputmode = getQParamInt("outputmode", 0) // 0 = screen, 1 = print, 2 = excel etc var showall = getQParamInt("showall", 0) == 1; var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijzingen) -var reg_key = getQParamInt("regiokey", -1); // Regio -var dis_key = getQParamInt("districtkey", -1); // District -var loc_key = getQParamInt("locatiekey", -1); // Locatie -var bld_key = getQParamInt("gebouwkey", -1); // Gebouw -var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping +var reg_key_arr = getQParamKeyArray("regiokey", []); // Regio +var dis_key_arr = getQParamKeyArray("districtkey", []); // District +var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie +var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw +var lvl_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping var chkgeb = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw geb_key niet) verdiepingen_list ( "*", { outputmode: outputmode, showall: showall, - reg_key: (reg_key != -1? reg_key : null), - dis_key: (dis_key != -1? dis_key : null), - loc_key: (loc_key != -1? loc_key : null), - bld_key: (bld_key != -1? bld_key : null), - lvl_key: (lvl_key != -1? lvl_key : null), + reg_key_arr: reg_key_arr, + dis_key_arr: dis_key_arr, + loc_key_arr: loc_key_arr, + bld_key_arr: bld_key_arr, + lvl_key_arr: lvl_key_arr, noref: (noref != -1? noref : null), chkgeb: chkgeb } ); -%><% ASPPAGE_END(); %> +%><% ASPPAGE_END(); %> diff --git a/APPL/ALG/alg_werkplek_list.inc b/APPL/ALG/alg_werkplek_list.inc index 1a1c22243f..baab7326c6 100644 --- a/APPL/ALG/alg_werkplek_list.inc +++ b/APPL/ALG/alg_werkplek_list.inc @@ -101,9 +101,9 @@ function werkplek_list(pautfunction, params) var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. var showall = params.showall; - var loc_key = params.loc_key; - var bld_key = params.bld_key; - var lvl_key = params.lvl_key; + var loc_key_arr = params.loc_key_arr; + var bld_key_arr = params.bld_key_arr; + var lvl_key_arr = params.lvl_key_arr; var room_key = params.room_key; var wp_descr = params.wp_descr; var tiny = params.tiny; @@ -184,19 +184,19 @@ function werkplek_list(pautfunction, params) sqln += " AND p.alg_ruimte_key = " + room_key; } - else if (lvl_key) + else if (lvl_key_arr.length) { - sqln += " AND p.alg_verdieping_key = " + lvl_key; + sqln += " AND p.alg_verdieping_key IN (" + lvl_key_arr.join(",") + ")"; } - else if (bld_key) + else if (bld_key_arr.length) { - sqln += " AND p.alg_gebouw_key = " + bld_key; + sqln += " AND p.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")"; } - else if (loc_key) + else if (loc_key_arr.length) { - sqln += " AND p.alg_locatie_key = " + loc_key; + sqln += " AND p.alg_locatie_key IN (" + loc_key_arr.join(",") + ")"; } if (wp_descr) @@ -213,7 +213,7 @@ function werkplek_list(pautfunction, params) // -// addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params) // TODO: welke allemaal? +// addurl += buildTransitParam(["loc_key_arr", "bld_key_arr", "lvl_key_arr", "room_key"], params) // TODO: welke allemaal? if (canAdd) { diff --git a/APPL/ALG/alg_werkplek_search.asp b/APPL/ALG/alg_werkplek_search.asp index f1760fc731..d71d2b8d99 100644 --- a/APPL/ALG/alg_werkplek_search.asp +++ b/APPL/ALG/alg_werkplek_search.asp @@ -39,12 +39,13 @@ var authparams = alg.checkAutorisation();
- <% SEARCH_PAGE_START({ header: L("lcl_filterblok") }); + <% SEARCH_PAGE_START({ header: L("lcl_filterblok") }); SEARCH_BLOCK_START(); FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: locatie_key, gebouwkey: gebouw_key, ruimtekey: ruimte_key, + multitoggle: 4, startlevel: 2, // locatie eindlevel: 5, // ruimte whenEmpty: L("lcl_search_generic") // want filter @@ -73,4 +74,4 @@ var authparams = alg.checkAutorisation(); -<% ASPPAGE_END(); %> +<% ASPPAGE_END(); %> diff --git a/APPL/ALG/alg_werkplek_search_list.asp b/APPL/ALG/alg_werkplek_search_list.asp index 711e4a8303..3126f3ebda 100644 --- a/APPL/ALG/alg_werkplek_search_list.asp +++ b/APPL/ALG/alg_werkplek_search_list.asp @@ -3,10 +3,10 @@ $Revision$ $Id$ - File: - Description: - Parameters: - Context: + File: + Description: + Parameters: + Context: Note: */ %> @@ -22,9 +22,9 @@ var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = excel etc var showall = getQParamInt("showall", 0) == 1; -var loc_key = getQParamInt("locatiekey", -1); // Locatie -var bld_key = getQParamInt("gebouwkey", -1); // Gebouw -var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping +var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie +var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw +var lvl_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping var room_key = getQParamInt("ruimtekey", -1); // ruimte var wp_descr = getQParam("descr", null); var tiny = getQParamInt("tiny", 0) == 1; @@ -32,12 +32,12 @@ var tiny = getQParamInt("tiny", 0) == 1; werkplek_list ( "*", { outputmode: outputmode, showall: showall, - loc_key: (loc_key != -1? loc_key : null), - bld_key: (bld_key != -1? bld_key : null), - lvl_key: (lvl_key != -1? lvl_key : null), + loc_key: loc_key_arr, + bld_key: bld_key_arr, + lvl_key: lvl_key_arr, room_key: (room_key != -1? room_key : -1), tiny: tiny, wp_descr: (wp_descr != ""? wp_descr : null) } ); -%><% ASPPAGE_END(); %> +%><% ASPPAGE_END(); %> diff --git a/APPL/BEZ/bez_afspraak_bo_new.asp b/APPL/BEZ/bez_afspraak_bo_new.asp index 08e499faaf..c3af82d4b1 100644 --- a/APPL/BEZ/bez_afspraak_bo_new.asp +++ b/APPL/BEZ/bez_afspraak_bo_new.asp @@ -21,9 +21,9 @@ FCLTHeader.Requires({ plugins: [], js: ["jquery-ui.js", "../bez/bez.js"] }) -var loc_key = getQParamInt("loc_key", -1); -if (loc_key < 0) - loc_key = user.alg_locatie_key() +var loc_key_arr = getQParamKeyArray("loc_key", []); +if (!loc_key_arr.length) + loc_key_arr = [user.alg_locatie_key()]; autfunction = "WEB_BEZBOF"; // Daar is dit scherm voor bedoeld var authparams = user.checkAutorisation(autfunction); %> @@ -53,7 +53,7 @@ var authparams = user.checkAutorisation(autfunction); - <% MODAL_START(); + <% MODAL_START(); MODAL_BLOCK_START("resSelectpool", L("lcl_select_respool"), { icon: "fa-clock", nopadding: true }); // Alle pool-reserveringen op de huidige locatie @@ -77,7 +77,7 @@ var authparams = user.checkAutorisation(autfunction); + " AND ALG_R.alg_ruimte_key = RES_RA.alg_ruimte_key" + " AND ALG_R.alg_verdieping_key = ALG_V.alg_verdieping_key" + " AND ALG_V.alg_gebouw_key = ALG_G.alg_gebouw_key" - + " AND ALG_G.alg_locatie_key = " + loc_key + + " AND ALG_G.alg_locatie_key IN (" + loc_key_arr.join(",") + ")" + " AND res_rsv_ruimte_van BETWEEN TRUNC(SYSDATE) AND SYSDATE + " + S("res_pool_early")/60/24 + " AND res_rsv_ruimte_tot BETWEEN SYSDATE - " + S("res_pool_late")/60/24 + " AND TRUNC(SYSDATE+1)" + " GROUP BY rrr.res_reservering_key" @@ -117,4 +117,4 @@ var authparams = user.checkAutorisation(autfunction); <% MODAL_END(); %> -<% ASPPAGE_END(); %> +<% ASPPAGE_END(); %> diff --git a/APPL/BEZ/bez_list.inc b/APPL/BEZ/bez_list.inc index fff076fb5c..77c55bd8d7 100644 --- a/APPL/BEZ/bez_list.inc +++ b/APPL/BEZ/bez_list.inc @@ -13,11 +13,11 @@ searchtext search for visitors with the given text in various descriptions datetimefrom search for visitors at the selected date-month-year-time datetimeto search for visitors at the selected date-month-year-time - regio_key search for visitors with the given regio key - dist_key search for visitors with the given district key - loc_key search for visitors with the given location key - bld_key search for visitors with the given building key - flr_key search for visitors with the given floor key + regio_key_arr search for visitors with the given regio keys + dist_key_arr search for visitors with the given district keys + loc_key_arr search for visitors with the given location keys + bld_key_arr search for visitors with the given building keys + flr_key_arr search for visitors with the given floor key requestor_key search for visitors with the given requestor key host_key search for visitors with the given host key dep_key search for visitors with the given department key @@ -112,11 +112,11 @@ function bez_list(pautfunction, params) var searchtext = params.searchtext; var datetimefrom = params.datetimefrom; var datetimeto = params.datetimeto; - var regio_key = params.regio_key; - var dist_key = params.dist_key; - var loc_key = params.loc_key; - var bld_key = params.bld_key; - var flr_key = params.flr_key; + var regio_key_arr = params.regio_key_arr; + var dist_key_arr = params.dist_key_arr; + var loc_key_arr = params.loc_key_arr; + var bld_key_arr = params.bld_key_arr; + var flr_key_arr = params.flr_key_arr; var requestor_key = params.requestor_key; var host_key = params.host_key; var dep_key = params.dep_key; @@ -710,17 +710,17 @@ function bez_list(pautfunction, params) } } - if (!afspr_key && regio_key && !dist_key) + if (!afspr_key && regio_key_arr.length && !dist_key_arr.length) { - sql += " AND d.alg_regio_key = " + regio_key + " "; + sql += " AND d.alg_regio_key IN (" + regio_key_arr.join(",") + ") "; } - else if (!afspr_key && dist_key && !loc_key) + else if (!afspr_key && dist_key_arr.length && !loc_key_arr.length) { - sql += " AND d.alg_district_key = " + dist_key + " "; + sql += " AND d.alg_district_key IN (" + dist_key_arr.join(",") + ") "; } else { - if (authparams.ALGreadlevel > -1 && loc_key) + if (authparams.ALGreadlevel > -1 && loc_key_arr.length) sql += " AND EXISTS (" + " SELECT 'x'" + " FROM fac_v_my_districts lr" @@ -729,8 +729,8 @@ function bez_list(pautfunction, params) + " AND lr.niveau = " + authparams.ALGreadlevel + ")"; } - if (!afspr_key && loc_key) - sql += " AND a.alg_locatie_key = " + loc_key; + if (!afspr_key && loc_key_arr.length) + sql += " AND a.alg_locatie_key IN (" + loc_key_arr.join(",") + ")"; else { if (authparams.ALGreadlevel > -1) @@ -744,11 +744,11 @@ function bez_list(pautfunction, params) if ((S("vis_afspraak_onrgoed_uses_keys") == 1) || groupbez) { - if (!afspr_key && bld_key) + if (!afspr_key && bld_key_arr.length) { - sql += " AND og.alg_gebouw_key = " + bld_key; - if (flr_key) - sql += " AND og.alg_verdieping_key = " + flr_key; + sql += " AND og.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")"; + if (flr_key_arr.length) + sql += " AND og.alg_verdieping_key IN (" + flr_key_arr.join(",") + ")"; } else if (authparams.ALGreadlevel >= 3) // Anno feb-2016 blijkt geen enkele klant niveau 3 ingesteld te hebben @@ -1172,7 +1172,7 @@ function bez_list(pautfunction, params) var oRs = Oracle.Execute(sql2); if (!oRs.Eof) { - var addurl = "bez_afspraak_bo_new.asp?loc_key=" + (loc_key||-1); + var addurl = "bez_afspraak_bo_new.asp" + (loc_key_arr.length ? "?loc_key=" + loc_key_arr.join(",") : ""); if (params.contactonly) addurl += "&contactonly=1"; var action = "FcltMgr.openModalDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "', { callback: bezPoolCallback })"; diff --git a/APPL/BEZ/bez_search.asp b/APPL/BEZ/bez_search.asp index 986a8af90b..86a85b9172 100644 --- a/APPL/BEZ/bez_search.asp +++ b/APPL/BEZ/bez_search.asp @@ -244,6 +244,7 @@ SEARCH_BLOCK_START(); locatiekey: locatie_key, gebouwkey: gebouw_key, // indien eindlevel 2 is, dan wordt deze parameter niet gebruikt verdiepingkey: verdieping_key, // indien eindlevel 2 is, dan wordt deze parameter niet gebruikt + multitoggle: 4, startlevel: alg_startlevel >= 0? alg_startlevel : startlevel, eindlevel: endlevel, filtercode: "BEZ", diff --git a/APPL/BEZ/bez_search_list.asp b/APPL/BEZ/bez_search_list.asp index e81f59d091..87ef1c99c8 100644 --- a/APPL/BEZ/bez_search_list.asp +++ b/APPL/BEZ/bez_search_list.asp @@ -33,11 +33,11 @@ var datetimeto = getQParamDate("date_to", null); // Perdiode tot // Voor velden die de user in kan typen valideren we zodanig dat we er tegen kunnen var afspr_key = getQParamInt("afspr_key", null, true); // Afspraak nummer, relaxed var searchtext = getQParam("searchtext", null); // Zoektekst -var regio_key = getQParamInt("regiokey", -1); // Regio -var dist_key = getQParamInt("districtkey", -1); // District -var loc_key = getQParamInt("locatiekey", -1); // Locatie -var bld_key = getQParamInt("gebouwkey", -1); // Gebouw -var flr_key = getQParamInt("verdiepingkey", -1); // Verdieping +var regio_key_arr = getQParamKeyArray("regiokey", []); // Regio +var dist_key_arr = getQParamKeyArray("districtkey", []); // District +var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie +var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw +var flr_key_arr = getQParamInt("verdiepingkey", []); // Verdieping var requestor_key = getQParamInt("sName_key", -1); // Aanvrager var host_key = getQParamInt("sHost_key", -1); // Bezoek voor (gastheer) var dep_key = getQParamInt("sDept_key", -1); // Afdeling (organisatie) @@ -82,11 +82,11 @@ bez_list ( autfunction, searchtext: (searchtext != ""? searchtext : null), datetimefrom: datetimefrom, datetimeto: datetimeto, - regio_key: (regio_key != -1? regio_key : null), - dist_key: (dist_key != -1? dist_key : null), - loc_key: (loc_key != -1? loc_key : null), - bld_key: (bld_key != -1? bld_key : null), - flr_key: (flr_key != -1? flr_key : null), + regio_key_arr: regio_key_arr, + dist_key_arr: dist_key_arr, + loc_key_arr: loc_key_arr, + bld_key_arr: bld_key_arr, + flr_key_arr: flr_key_arr, requestor_key: (requestor_key != -1? requestor_key : null), host_key: (host_key != -1? host_key : null), dep_key: (dep_key != -1? dep_key : null), diff --git a/APPL/CAD/rap_ins.asp b/APPL/CAD/rap_ins.asp index 0315f78f23..606e0c75ae 100644 --- a/APPL/CAD/rap_ins.asp +++ b/APPL/CAD/rap_ins.asp @@ -34,11 +34,11 @@ if (floorKey != -1) disc_key_arr:disc_key_arr, ins_key_arr: obj>0?[obj]:null, wpl_key: wp_key>0?wp_key:null, - flr_key: floorKey, - room_key_arr: highlight_arr.length > 0 && highlight_arr.join(",").indexOf("-1") == -1? highlight_arr : null, + flr_key_arr: [floorKey], + room_key_arr: highlight_arr.length > 0 && highlight_arr.join(",").indexOf("-1") == -1? highlight_arr : [], // TODO nagaan of we dit nu wel of niet wensen: disc_key: discs, outputmode: outputmode, showAll: showall }); } -%><% ASPPAGE_END(); %> +%><% ASPPAGE_END(); %> diff --git a/APPL/CAD/rap_ins2.asp b/APPL/CAD/rap_ins2.asp index 0cbd3774cc..bf15b1f33b 100644 --- a/APPL/CAD/rap_ins2.asp +++ b/APPL/CAD/rap_ins2.asp @@ -31,10 +31,10 @@ if (locKey > 0) embedded: 1, fgraph: 1, disc_key_arr:disc_key_arr, - loc_key: locKey, - room_key_arr: highlight_arr.length > 0 && highlight_arr.join(",").indexOf("-1") == -1? highlight_arr : null, + loc_key_arr: [locKey], + room_key_arr: highlight_arr.length > 0 && highlight_arr.join(",").indexOf("-1") == -1? highlight_arr : [], outputmode: outputmode, showAll: showall }); } -%><% ASPPAGE_END(); %> +%><% ASPPAGE_END(); %> diff --git a/APPL/CNT/cnt.inc b/APPL/CNT/cnt.inc index a0c7f5205a..9231172d53 100644 --- a/APPL/CNT/cnt.inc +++ b/APPL/CNT/cnt.inc @@ -223,12 +223,12 @@ cnt = { setcontractstatus: var eigenaar_key = params.eigenaar_key; var manager_key = params.manager_key; var beheerder_key = params.beheerder_key; - var reg_key = params.reg_key; - var dist_key = params.dist_key; - var loc_key = params.loc_key; - var bld_key = params.bld_key; - var flr_key = params.flr_key; - var room_key = params.room_key; + var reg_key_arr = params.reg_key_arr || []; + var dist_key_arr = params.dist_key_arr || []; + var loc_key_arr = params.loc_key_arr || []; + var bld_key_arr = params.bld_key_arr || []; + var flr_key_arr = params.flr_key_arr || []; + var room_key_arr = params.room_key_arr || []; var objectsrt_key = params.objectsrt_key; var mantel_key = params.mantel_key; var descript = params.descript; @@ -444,41 +444,45 @@ cnt = { setcontractstatus: // De intentie is dat als je filtert op een niveau je ook de contracten daaronder meeneemt, dus de locatiecontracten // zijn ook de contracten op de gebouwen enz binnen de locatie enz. // Soms geeft men meer parameters mee, daarom werken we van onder naar boven. - if (room_key) { + if (room_key_arr.length) { sql += " AND c.cnt_contract_key IN" + " (SELECT cnt_contract_key FROM cnt_v_aanwezigcontract_plaats" - + " WHERE (cnt_alg_plaats_code = 'R' AND cnt_alg_plaats_key IN (" + room_key + ")))"; + + " WHERE (cnt_alg_plaats_code = 'R' AND cnt_alg_plaats_key IN (" + room_key_arr.join(",") + ")))"; // TODO de contracten op objecten in deze ruimte } - else if (flr_key) { + else if (flr_key_arr.length) { sql += " AND c.cnt_contract_key IN" + " (SELECT cnt_contract_key FROM cnt_v_aanwezigcontract_plaats" - + " WHERE (cnt_alg_plaats_code = 'V' AND cnt_alg_plaats_key IN (" + flr_key + "))" + + " WHERE (cnt_alg_plaats_code = 'V' AND cnt_alg_plaats_key IN (" + flr_key_arr.join(",") + "))" + " OR (cnt_alg_plaats_code = 'R' AND cnt_alg_plaats_key IN " - + "(SELECT alg_ruimte_key FROM alg_v_aanwezigruimte WHERE alg_verdieping_key IN (" + flr_key + "))))"; + + "(SELECT alg_ruimte_key FROM alg_v_aanwezigruimte WHERE alg_verdieping_key IN (" + flr_key_arr.join(",") + "))))"; // TODO de contracten op objecten op deze verdieping } - else if (bld_key) { + else if (bld_key_arr.length) { sql += " AND c.cnt_contract_key IN" + " (SELECT cnt_contract_key FROM cnt_v_aanwezigcontract_plaats" - + " WHERE (cnt_alg_plaats_code = 'G' AND cnt_alg_plaats_key IN (" + bld_key + "))" - + " OR (cnt_alg_plaats_code = 'T' AND cnt_alg_plaats_key IN (" + bld_key + "))" + + " WHERE (cnt_alg_plaats_code = 'G' AND cnt_alg_plaats_key IN (" + bld_key_arr.join(",") + "))" + + " OR (cnt_alg_plaats_code = 'T' AND cnt_alg_plaats_key IN (" + bld_key_arr.join(",") + "))" + " OR (cnt_alg_plaats_code = 'V' AND cnt_alg_plaats_key IN " - + "(SELECT alg_verdieping_key FROM alg_v_aanwezigverdieping WHERE alg_gebouw_key IN (" + bld_key + ")))" + + "(SELECT alg_verdieping_key FROM alg_v_aanwezigverdieping WHERE alg_gebouw_key IN (" + bld_key_arr.join(",") + ")))" + " OR (cnt_alg_plaats_code = 'R' AND cnt_alg_plaats_key IN " + "(SELECT alg_ruimte_key FROM alg_v_aanwezigruimte r, alg_verdieping v" - + " WHERE r.alg_verdieping_key=v.alg_verdieping_key AND v.alg_gebouw_key IN (" + bld_key + "))))"; + + " WHERE r.alg_verdieping_key=v.alg_verdieping_key AND v.alg_gebouw_key IN (" + bld_key_arr.join(",") + "))))"; // TODO de contracten op objecten in dit gebouw } - else if (reg_key || dist_key || loc_key) { + else if (reg_key_arr.length || dist_key_arr.length || loc_key_arr.length) { // Merk op dat we hier niet kunnen verwijzen naar cloc binnen sql omdat die MIN(alg_locatie_key) en MIN(alg_gebouw_key) bevat. // We hebben geen contracten op regio of districtsniveau, het begint vanaf locatie - if (loc_key) - sql_loc = loc_key; - else if (dist_key) - sql_loc = "SELECT alg_locatie_key FROM alg_locatie WHERE alg_district_key = " + dist_key; - else if (reg_key) - sql_loc = "SELECT alg_locatie_key FROM alg_locatie l, alg_district d WHERE l.alg_district_key = d.alg_district_key AND d.alg_regio_key = " + reg_key; + if (loc_key_arr.length) + sql_loc = loc_key_arr.join(","); + else if (dist_key_arr.length) + sql_loc = "SELECT alg_locatie_key" + + " FROM alg_locatie" + + " WHERE alg_district_key IN (" + dist_key_arr.join(",") + ")"; + else if (reg_key_arr.length) + sql_loc = "SELECT alg_locatie_key" + + " FROM alg_locatie l, alg_district d" + + " WHERE l.alg_district_key = d.alg_district_key AND d.alg_regio_key IN (" + reg_key_arr.join(",") + ")"; sql += " AND c.cnt_contract_key IN" + " (SELECT cnt_contract_key FROM cnt_v_aanwezigcontract_plaats" diff --git a/APPL/CNT/cnt_list.inc b/APPL/CNT/cnt_list.inc index 7c2387b64e..8234071390 100644 --- a/APPL/CNT/cnt_list.inc +++ b/APPL/CNT/cnt_list.inc @@ -15,10 +15,12 @@ cnt_persoon_key search for contracts with the given cnt_persoon_key (persoon contractpartij) eigenaar_key search for contracts for the selected owner (department) beheerder_key search for contracts with the given beheerder key - reg_key search for contracts with the given regio key - dist_key search for contracts with the given district key - loc_key search for contracts with the given location key - bld_key search for contracts with the given building key + reg_key_arr search for contracts with the given regio keys + dist_key_arr search for contracts with the given district keys + loc_key_arr search for contracts with the given location keys + bld_key_arr search for contracts with the given building keys + flr_key_arr search for contracts with the given floor keys + room_key_arr search for contracts with the given room keys objectsrt_key search for contracts with the given objectsoort key (srtdeel key) ins_key search for contracts with the given object key kp_key search for contracts with the given kostenplaats key @@ -99,7 +101,7 @@ function cnt_list (pautfunction, params) var tiny = params.tiny; var showall = params.showall; - var room_key = params.room_key; + var room_key_arr = params.room_key_arr; %> @@ -216,11 +218,11 @@ function cnt_list (pautfunction, params) } var deleted_room = false; - if (room_key > 0) + if (room_key_arr.length) { var sqlr = "SELECT alg_ruimte_verwijder" + " FROM alg_ruimte" - + " WHERE alg_ruimte_key = " + room_key; + + " WHERE alg_ruimte_key IN (" + room_key_arr.join(",") + ")"; var oRsr = Oracle.Execute(sqlr); deleted_room = oRsr("alg_ruimte_verwijder").Value != null; oRsr.Close(); diff --git a/APPL/CNT/cnt_search.asp b/APPL/CNT/cnt_search.asp index f732afb55d..31064495a2 100644 --- a/APPL/CNT/cnt_search.asp +++ b/APPL/CNT/cnt_search.asp @@ -268,6 +268,7 @@ var authparams = user.checkAutorisation(autfunction, true) || {}; verdiepingkey: flr_key, ruimtekey: room_key, terrein: true, + multitoggle: 5, startlevel: alg_startlevel, eindlevel: 5, // Ruimte secsearch: 3, // Location is primary diff --git a/APPL/CNT/cnt_search_list.asp b/APPL/CNT/cnt_search_list.asp index 41cc935df9..060d41de4f 100644 --- a/APPL/CNT/cnt_search_list.asp +++ b/APPL/CNT/cnt_search_list.asp @@ -15,27 +15,27 @@ <% - // Vanuit subframes zoals bij ins_show_deel komen ze deze via QParam - var urole = getQParamSafe("urole", ""); - var ins_key = getQParamInt("ins_key", -1); - var uitvoerder_key = getQParamInt("uitv_key", -1); - var versions_of_cnt_key = getQParamInt("versions_of_cnt_key", -1); +// Vanuit subframes zoals bij ins_show_deel komen ze deze via QParam +var urole = getQParamSafe("urole", ""); +var ins_key = getQParamInt("ins_key", -1); +var uitvoerder_key = getQParamInt("uitv_key", -1); +var versions_of_cnt_key = getQParamInt("versions_of_cnt_key", -1); - var bld_key = getQParamInt("bld_key", -1); - var loc_key = getQParamInt("loc_key", -1); - var flr_key = getQParamInt("flr_key", -1); - var room_key = getQParamInt("room_key", -1); - var cntFFutu = getQParamInt("ffutu", 0); // Fase Toekomstig binnen status actief - var cntFAct = getQParamInt("fact", 0); // Fase Actueel binnen status actief - var cntFRap = getQParamInt("frap", 0); // Fase Rappel binnen status actief - var cntFOpz = getQParamInt("fopz", 0); // Fase In opzegtermijn binnen status actief - var cntAct = getQParamInt("sact", 0); - var cntInact = getQParamInt("sinact", 0); +var loc_key_arr = getQParamKeyArray("loc_key", []); +var bld_key_arr = getQParamKeyArray("bld_key", []); +var flr_key_arr = getQParamKeyArray("flr_key", []); +var room_key_arr = getQParamKeyArray("room_key", []); +var cntFFutu = getQParamInt("ffutu", 0); // Fase Toekomstig binnen status actief +var cntFAct = getQParamInt("fact", 0); // Fase Actueel binnen status actief +var cntFRap = getQParamInt("frap", 0); // Fase Rappel binnen status actief +var cntFOpz = getQParamInt("fopz", 0); // Fase In opzegtermijn binnen status actief +var cntAct = getQParamInt("sact", 0); +var cntInact = getQParamInt("sinact", 0); - var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = excel etc - var showall = getQParamInt("showall", 0); - var tiny = getQParamInt("tiny", 0) == 1; // voor framed lijsten bij objecten etc. - var notclosed = getQParamInt("cnt_full", ((ins_key>-1 || bld_key>-1 || loc_key>-1 || flr_key>-1 || room_key>-1) ? 1 : 0)) == 1; // alle niet-gesloten contracten tonen. +var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = excel etc +var showall = getQParamInt("showall", 0); +var tiny = getQParamInt("tiny", 0) == 1; // voor framed lijsten bij objecten etc. +var notclosed = getQParamInt("cnt_full", ((ins_key>-1 || bld_key_arr.length || loc_key_arr.length || flr_key_arr.length || room_key_arr.length) ? 1 : 0)) == 1; // alle niet-gesloten contracten tonen. var urole = getFParamSafe("urole", urole); // Indien niet meegegeven, veronderstel dan frontend gebruik var fronto = (urole == "fo"); @@ -86,12 +86,12 @@ else var eigenaar_key = getFParamInt("sDept_key", -1); // Eigenaar (Afdeling) var manager_key = getFParamInt("sCnt_owner_key", -1); // Verantwoordelijk manager var beheerder_key = getFParamInt("sBeh_key", -1); // Beheerder - var reg_key = getFParamInt("regiokey", -1); // Regio - var dist_key = getFParamInt("districtkey", -1); - var loc_key = getFParamInt("locatiekey", loc_key); // Locatie - var bld_key = getFParamInt("gebouwkey", bld_key); // Gebouw - var flr_key = getFParamInt("verdiepingkey", flr_key); - var room_key = getFParamInt("ruimtekey", room_key); + var reg_key_arr = getFParamKeyArray("regiokey", []); // Regio + var dist_key_arr = getFParamKeyArray("districtkey", []); + var loc_key_arr = getFParamKeyArray("locatiekey", loc_key_arr); // Locatie + var bld_key_arr = getFParamKeyArray("gebouwkey", bld_key_arr); // Gebouw + var flr_key_arr = getFParamKeyArray("verdiepingkey", flr_key_arr); + var room_key_arr = getFParamKeyArray("ruimtekey", room_key_arr); var objectsrt_key = getFParamInt("srtdeel", -1); // Objectsoort var cntsrt_key_arr = getFParamIntArray("disc", []); // Contractsoort / discipline var mantel_key = getFParamInt("mantel", -1); // Mantel @@ -127,12 +127,12 @@ if (!cntAct && !cntInact && !cntNew && !cntTgoe) params.eigenaar_key = (eigenaar_key != -1? eigenaar_key : null); params.manager_key = (manager_key != -1? manager_key : null); params.beheerder_key = (beheerder_key != -1? beheerder_key : null); - params.reg_key = (reg_key != -1 ? reg_key : null); - params.dist_key = (dist_key != -1 ? dist_key : null); - params.loc_key = (loc_key != -1 ? loc_key : null); - params.bld_key = (bld_key != -1 ? bld_key : null); - params.flr_key = (flr_key != -1 ? flr_key : null); - params.room_key = (room_key != -1 ? room_key : null); + params.reg_key_arr = reg_key_arr; + params.dist_key_arr = dist_key_arr; + params.loc_key_arr = loc_key_arr; + params.bld_key_arr = bld_key_arr; + params.flr_key_arr = flr_key_arr; + params.room_key_arr = room_key_arr; params.objectsrt_key = (objectsrt_key != -1? objectsrt_key : null); params.ins_key = (ins_key != -1 ? ins_key : null); params.kp_key = (kp_key != -1 ? kp_key : null); diff --git a/APPL/INS/ins.inc b/APPL/INS/ins.inc index 445bacbe83..adc8fb1208 100644 --- a/APPL/INS/ins.inc +++ b/APPL/INS/ins.inc @@ -1678,13 +1678,13 @@ ins = {checkAutLevel: var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; - var reg_key = params.reg_key; - var dist_key = params.dist_key; - var loc_key = params.loc_key; - var bld_key = params.bld_key; - var terr_key = params.terr_key; // FGII parameters - var flr_key = params.flr_key; - var room_key = params.room_key; + var reg_key_arr = params.reg_key_arr || []; + var dist_key_arr = params.dist_key_arr || []; + var loc_key_arr = params.loc_key_arr || []; + var bld_key_arr = params.bld_key_arr || []; + var terr_key_arr = params.terr_key_arr || []; // FGII parameters + var flr_key_arr = params.flr_key_arr || []; + var room_key_arr = params.room_key_arr || []; // FGII parameters var wpl_key = params.wpl_key; var deel = params.deel; var deel_opm = params.deel_opm; @@ -1708,7 +1708,6 @@ ins = {checkAutLevel: var ins_key_arr = params.ins_key_arr; // FGII parameters var parent_key = params.parent_key; var koppel_key = params.koppel_key; - var room_key_arr = params.room_key_arr; // FGII parameters var comp_key = params.comp_key; // FGII parameters var insObjIncl = params.insObjIncl; var expObjIncl = params.expObjIncl; @@ -1768,7 +1767,7 @@ ins = {checkAutLevel: } else { - if (reg_key || dist_key || loc_key || bld_key || terr_key || flr_key || wpl_key || room_key || room_key_arr) + if (reg_key_arr.length || dist_key_arr.length || loc_key_arr.length || bld_key_arr.length || terr_key_arr.length || flr_key_arr.length || room_key_arr.length || wpl_key) { hasPosition = true; } @@ -2300,12 +2299,12 @@ ins = {checkAutLevel: ? " AND i.ins_alg_ruimte_key_org IS NULL" : ""); - if (loc_key || bld_key) + if (loc_key_arr.length || bld_key_arr.length) { sqlOwner_from += ", (SELECT alg_ruimte_key" + " FROM alg_v_allonroerendgoed" - + " WHERE " + (bld_key ? "alg_gebouw_key" : "alg_locatie_key") - + " = " + (bld_key ? bld_key : loc_key) + + " WHERE " + (bld_key_arr.length ? "alg_gebouw_key" : "alg_locatie_key") + + " IN (" + (bld_key_arr.length ? bld_key_arr.join(",") : loc_key_arr.join(",")) + ")" + " ) a"; sqlOwner_where += " AND i.ins_alg_ruimte_key_org = a.alg_ruimte_key"; } @@ -2468,7 +2467,7 @@ ins = {checkAutLevel: // S("ins_auth_obj_lendout") == 1 && fronto && insLentOut => Orginele plaats/eigenaar (ins_alg_ruimte_key_org) is de eigenaar van het object (auth_org). // Deze orginele plaats/eigenaar (ins_alg_ruimte_key_org) kan nu de ingevulde persoon zijn. sqlPosition = "SELECT DISTINCT" - + (terr_key + + (terr_key_arr.length ? " o.alg_terreinsector_omschrijving" : " o.alg_plaatsaanduiding" + " || DECODE(o.alg_plaatsomschrijving, '','' ,' (' || o.alg_plaatsomschrijving || ')')" @@ -2640,31 +2639,26 @@ ins = {checkAutLevel: { if (wpl_key) sqlPosition += " AND o.prs_werkplek_key =" + wpl_key; - else if (room_key_arr) - //sqlPosition += " AND i.ins_alg_ruimte_key IN (" + room_key_arr.join(",") + ")"; + else if (room_key_arr.length) sqlPosition += " AND ((i.ins_alg_ruimte_key IN (" + room_key_arr.join(",") + ") AND i.ins_alg_ruimte_type='R')" + " OR (i.ins_alg_ruimte_key IN (SELECT prs_werkplek_key FROM prs_werkplek WHERE prs_alg_ruimte_key IN (" + room_key_arr.join(",") + ")) AND i.ins_alg_ruimte_type='W'))"; - else if (room_key) - sqlPosition += " AND ((i.ins_alg_ruimte_key = " + room_key + " AND i.ins_alg_ruimte_type='R') " - + " OR (i.ins_alg_ruimte_key IN (SELECT prs_werkplek_key FROM prs_werkplek WHERE prs_alg_ruimte_key=" + room_key + ") AND i.ins_alg_ruimte_type='W'))"; - else if (flr_key) - sqlPosition += " AND o.alg_verdieping_key = " + flr_key; - else if (terr_key) - sqlPosition += " AND i.ins_alg_ruimte_key IN (" + terr_key + ")"; - else if (bld_key) - sqlPosition += " AND o.alg_gebouw_key = " + bld_key; - else if (loc_key) - sqlPosition += " AND i.ins_alg_locatie_key" - + " = " + loc_key; - else if (dist_key) - sqlPosition += " AND di.alg_district_key = " + dist_key; - else if (reg_key) - sqlPosition += " AND di.alg_regio_key = " + reg_key; - else if (!terr_key && fgraph) + else if (flr_key_arr.length) + sqlPosition += " AND o.alg_verdieping_key IN (" + flr_key_arr.length + ")"; + else if (terr_key_arr.length) + sqlPosition += " AND i.ins_alg_ruimte_key IN (" + terr_key_arr.join(",") + ")"; + else if (bld_key_arr.length) + sqlPosition += " AND o.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")"; + else if (loc_key_arr.length) + sqlPosition += " AND i.ins_alg_locatie_key IN (" + loc_key_arr.join(",") + ")"; + else if (dist_key_arr.length) + sqlPosition += " AND di.alg_district_key IN (" + dist_key_arr.join(",") + ")"; + else if (reg_key_arr.length) + sqlPosition += " AND di.alg_regio_key IN (" + reg_key_arr.join(",") + ")"; + else if (!terr_key_arr.length && fgraph) sqlPosition += " AND i.ins_alg_ruimte_key = -1"; // geen terreinen bij fgraph => geen objecten om te laten zien } - if (backo2 && !terr_key && inspect) + if (backo2 && !terr_key_arr.length && inspect) { // Als backo2 dan wel de juiste plaatsen waar het bedrijf de scope op heeft. // 1) Scope op gebouwen. @@ -2735,7 +2729,7 @@ ins = {checkAutLevel: ? " AND i.ins_deel_actief = 1" : "" ) - + (terr_key + + (terr_key_arr.length ? " AND i.ins_alg_ruimte_type = o.alg_onroerendgoed_type" + " AND i.ins_alg_ruimte_type = 'T'" // Object is NIET uitgeleend, anders was het type "C" of "P". + " AND o.alg_locatie_key = l.alg_locatie_key" @@ -3388,21 +3382,18 @@ ins = {checkAutLevel: + " AND dl.prs_dienst_key = x.prs_dienst_key" + " AND og.alg_ruimte_key = x.alg_ruimte_key" + " AND dl.prs_bedrijf_key = " + cnt_bedrijf_key - if (bld_key > 0) - sql_bdl += " AND (dl.alg_gebouw_key = " + bld_key - + " OR dl.alg_locatie_key = (SELECT alg_locatie_key" - + " FROM alg_gebouw" - + " WHERE alg_gebouw_key = " + bld_key + "))"; - else if (loc_key > 0) - sql_bdl += " AND (dl.alg_locatie_key = " + loc_key - + " OR dl.alg_gebouw_key IN (SELECT alg_gebouw_key" - + " FROM alg_gebouw" - + " WHERE alg_locatie_key = " + loc_key + "))"; + if (bld_key_arr.length) + sql_bdl += " AND ( dl.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")" + + " OR dl.alg_locatie_key IN (SELECT alg_locatie_key" + + " FROM alg_gebouw" + + " WHERE alg_gebouw_key IN (" + bld_key_arr.join(",") + ")))"; + else if (loc_key_arr.length) + sql_bdl += " AND ( dl.alg_locatie_key IN (" + loc_key_arr.join(",") + ")" + + " OR dl.alg_gebouw_key IN (SELECT alg_gebouw_key" + + " FROM alg_gebouw" + + " WHERE alg_locatie_key IN (" + loc_key_arr.join(",") + ")))"; sql_bdl += " )"; - - - - } + } if (S("ins_inspect_service_depend") >= 1) { // Voorwaarde voor de contractscope. diff --git a/APPL/INS/ins_list.asp b/APPL/INS/ins_list.asp index 759717b3ae..47c705c8c4 100644 --- a/APPL/INS/ins_list.asp +++ b/APPL/INS/ins_list.asp @@ -20,12 +20,12 @@ var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = e var showall = getQParamInt("showall", 0) == 1; // Voor velden die de user in kan typen valideren we zodanig dat we er tegen kunnen -var loc_key = getQParamInt("locatiekey", -1); // Locatie -var bld_key = getQParamInt("gebouwkey", -1); // Gebouw +var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie +var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw var bttype = getQParam("bttype", ""); // Type van gebouw/terrein ("B", "T"). Bepaald of bld_key een gebouw of terreinsector key bevat. -var terr_key = -1; // Terrein -var flr_key = getQParamInt("verdiepingkey", -1); // Verdieping -var room_key = getQParamInt("ruimtekey", -1); // Ruimte +var terr_key_arr = []; // Terrein +var flr_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping +var room_keys = getQParamKeyArray("ruimtekey", []); // Ruimte var wpl_key = getQParamInt("werkplekkey", -1); // Werkplek var deel = getQParam("deel", ""); // Identieficatie var disc_key = getQParamInt("disc", -1); // Discipline @@ -56,10 +56,12 @@ var ins_key_arr = getQParamIntArray("ins_key", []); // Was obj_key var parent_key = getQParamInt("parent_key", -1); var koppel_key = getQParamInt("koppel_key", -1); var terr_key = getQParamInt("terr", -1); // Terrein -var room_key_arr = getQParamIntArray("rooms", []); // Ruimten +var rooms_keys = getQParamKeyArray("rooms", []); // Ruimten var comp_key = getQParamInt("company", -1); var embedded = getQParamInt("embedded", -1); var tiny = getQParamInt("tiny", -1); + +var room_key_arr = room_keys.concat(rooms_keys); // Voeg de twee ruimte key arrays samen. /***** End get webform parameters *****/ if (parent_key > 0) @@ -77,9 +79,9 @@ if (koppel_key > 0) } if (!fgraph && bttype == "T") -{ // bld_key is een terrein key - terr_key = bld_key; - bld_key = -1; +{ // bld_key_arr is een terrein key + terr_key_arr = bld_key_arr; + bld_key_arr = []; } var autfunction = ""; @@ -97,11 +99,11 @@ ins_list ( autfunction, { urole : urole, outputmode: outputmode, showall: showall, - loc_key: (loc_key != -1 ? loc_key : null), - bld_key: (bld_key != -1 ? bld_key : null), - terr_key: (terr_key != -1 ? terr_key : null), - flr_key: (flr_key != -1 ? flr_key : null), - room_key: (room_key != -1 ? room_key : null), + loc_key_arr: loc_key_arr, + bld_key_arr: bld_key_arr, + terr_key_arr: terr_key_arr, + flr_key_arr: flr_key_arr, + room_key_arr: room_key_arr, wpl_key: (wpl_key != -1 ? wpl_key : null), deel: (deel != ""? deel : null), disc_key_arr: (disc_key != -1 ? [disc_key] : []), diff --git a/APPL/INS/ins_list.inc b/APPL/INS/ins_list.inc index 5a5b98dec4..8a2b2e6085 100644 --- a/APPL/INS/ins_list.inc +++ b/APPL/INS/ins_list.inc @@ -24,12 +24,12 @@ inspsoonto search for objects with inspections between inspsoonfrom and inspsoonto donedatefrom search for objects with inspections between donedatefrom and donedateto donedateto search for objects with inspections between donedatefrom and donedateto - reg_key search for objects with the given regio key - dist_key search for objects with the given district key - loc_key search for objects with the given location key - bld_key search for objects with the given building key - flr_key search for objects with the given floor key - room_key search for objects with the given room key + reg_key_arr search for objects with the given regio keys + dist_key_ar search for objects with the given district keys + loc_key_arr search for objects with the given location keys + bld_key_arr search for objects with the given building keys + flr_key_arr search for objects with the given floor keys + room_key_arr search for objects with the given room keys wpl_key search for objects with the given workplace key deel search for objects with the given identification disc_key_arr search for objects with the given discipline keys @@ -49,7 +49,6 @@ parent_key search for subobjects of the given ins parent_key koppel_key search for related objects of the given koppel_key terr_key search for objects with the given terrein key - room_key_arr search for objects with the given room keys (room key array) comp_key search for objects with the given companie key checkout Call during check-out of visitor insObjIncl search also for objects wich is a part from another object @@ -101,9 +100,10 @@ function ins_list (pautfunction, params) var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; - var reg_key = params.reg_key; - var dist_key = params.dist_key; - var loc_key = params.loc_key; + var reg_key_arr = params.reg_key_arr; + var dist_key_arr = params.dist_key_arr; + var loc_key_arr = params.loc_key_arr; + var room_key_arr = params.room_key_arr; var disc_key_arr = params.disc_key_arr || []; var insgroup_key_arr = params.insgroup_key_arr || []; var objsrt_key_arr = params.objsrt_key_arr || []; @@ -115,7 +115,6 @@ function ins_list (pautfunction, params) var fgraph = params.fgraph; var parent_key = params.parent_key; var koppel_key = params.koppel_key; - var room_key = params.room_key; var embedded = params.embedded; var tiny = params.tiny || parent_key || koppel_key; var groepering = params.groepering || -1; @@ -169,23 +168,23 @@ function ins_list (pautfunction, params) <% /* filter velden voor frontend. Nodig voor reload na oplaan nieuw waarden. */ %> - + "> "> <% var sql_loc = ""; var sql_obj_sort = ""; - if (loc_key) + if (loc_key_arr.length) { - sql_loc = " AND l.alg_locatie_key = " + loc_key; + sql_loc = " AND l.alg_locatie_key IN (" + loc_key_arr.join(",") + ")"; } - else if (dist_key) + else if (dist_key_arr.length) { - sql_loc = " AND l.alg_district_key = " + dist_key; + sql_loc = " AND l.alg_district_key IN (" + dist_key_arr.join(",") + ")"; } - else if (reg_key) + else if (reg_key_arr.length) { - sql_loc = " AND di.alg_regio_key = " + reg_key; + sql_loc = " AND di.alg_regio_key IN (" + reg_key_arr.join(",") + ")"; } else { @@ -963,11 +962,11 @@ function ins_list (pautfunction, params) } var deleted_room = false; - if (room_key > 0) + if (room_key_arr.length) { var sqlr = "SELECT alg_ruimte_verwijder" + " FROM alg_ruimte" - + " WHERE alg_ruimte_key = " + room_key; + + " WHERE alg_ruimte_key IN (" + room_key_arr.join(",") + ")"; var oRsr = Oracle.Execute(sqlr); deleted_room = oRsr("alg_ruimte_verwijder").Value != null; oRsr.Close(); diff --git a/APPL/INS/ins_search.asp b/APPL/INS/ins_search.asp index 263a8a208d..91f97fd987 100644 --- a/APPL/INS/ins_search.asp +++ b/APPL/INS/ins_search.asp @@ -612,6 +612,7 @@ var authparams = user.checkAutorisation(autfunction); ruimtekey: room_key, werkplekkey: wpl_key, // indien eindlevel 5 is, dan wordt deze parameter niet gebruikt terrein: true, + multitoggle: 5, onRegChange: alg_startlevel==0? "UnSelectOwner()" : null, onDisChange: alg_startlevel==1? "UnSelectOwner()" : null, onLocChange: alg_startlevel==2? "UnSelectOwner()" : null, diff --git a/APPL/INS/ins_search_list.asp b/APPL/INS/ins_search_list.asp index c2a3d158e5..3b1b2e5a42 100644 --- a/APPL/INS/ins_search_list.asp +++ b/APPL/INS/ins_search_list.asp @@ -35,14 +35,14 @@ var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = e var showall = getQParamInt("showall", 0) == 1; // Voor velden die de user in kan typen valideren we zodanig dat we er tegen kunnen -var reg_key = getQParamInt("regiokey", -1); // Regio -var dist_key = getQParamInt("districtkey", -1); -var loc_key = getQParamInt("locatiekey", -1); // Locatie -var bld_key = getQParamInt("gebouwkey", -1); // Gebouw +var reg_key_arr = getQParamKeyArray("regiokey", []); // Regio +var dist_key_arr = getQParamKeyArray("districtkey", []); // District +var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie +var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw var bttype = getQParam("bttype", ""); // Type van gebouw/terrein ("B", "T"). Bepaald of bld_key een gebouw of terreinsector key bevat. -var terr_key = -1; // Terrein -var flr_key = getQParamInt("verdiepingkey", -1); // Verdieping -var room_key = getQParamInt("ruimtekey", -1); // Ruimte +var terr_key_arr = getQParamKeyArray("terr", []); // Terrein +var flr_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping +var room_keys = getQParamKeyArray("ruimtekey", []); // Ruimte var wpl_key = getQParamInt("werkplekkey", -1); // Werkplek var deel = getQParam("deel", ""); // Identificatie var deel_opm = getQParam("deel_opm", ""); // Omschrijving @@ -87,10 +87,11 @@ var inspSoon = !inspDone && getQParamInt("insInspSoon", 0) == 1; // FGII parameters var fgraph = getQParamInt("fgraph", 0) == 1; var ins_key_arr = getQParamIntArray("ins_key", []); // Was obj_key -var terr_key = getQParamInt("terr", -1); // Terrein -var room_key_arr = getQParamIntArray("rooms", []); // Ruimten +// terr_key // Terrein, wordt hierboven al opgehaald +var rooms_keys = getQParamKeyArray("rooms", []); // Ruimten var comp_key = getQParamInt("company", -1); +var room_key_arr = room_keys.concat(rooms_keys); // Voeg de twee ruimte key arrays samen. var mjob = getQParamInt("mjob", 0) == 1; // mjob mode // FORM score velden. @@ -108,9 +109,9 @@ if (disc_key_arr.length == 1) lcl.set_dialect(disc_key_arr[0], "INS_DISCIPLINE_KEY"); if (!fgraph && bttype == "T") -{ // bld_key is een terrein key - terr_key = bld_key; - bld_key = -1; +{ // bld_key_arr is een terrein key + terr_key_arr = bld_key_arr; + bld_key_arr = []; } var autfunction = ""; @@ -131,13 +132,13 @@ ins_list ( autfunction, showall: showall, tiny: tiny, groepering: groepering, - reg_key: (reg_key != -1 ? reg_key : null), - dist_key: (dist_key != -1 ? dist_key : null), - loc_key: (loc_key != -1 ? loc_key : null), - bld_key: (bld_key != -1 ? bld_key : null), - terr_key: (terr_key != -1 ? terr_key : null), - flr_key: (flr_key != -1 ? flr_key : null), - room_key: (room_key != -1 ? room_key : null), + reg_key_arr: reg_key_arr, + dist_key_arr: dist_key_arr, + loc_key_arr: loc_key_arr, + bld_key_arr: bld_key_arr, + terr_key_arr: terr_key_arr, + flr_key_arr: flr_key_arr, + room_key_arr: room_key_arr, wpl_key: (wpl_key != -1 ? wpl_key : null), deel: (deel != ""? deel : null), deel_opm: deel_opm, @@ -162,7 +163,6 @@ ins_list ( autfunction, inspBusy: inspBusy, inspSoon: inspSoon, ins_key_arr: (ins_key_arr.length > 0? ins_key_arr : null), - room_key_arr: (room_key_arr.length > 0 && room_key_arr.join(",").indexOf("-1") == -1? room_key_arr : null), comp_key: (comp_key != -1 ? comp_key : null), inspsoonfrom: inspsoonfrom, inspsoonto: inspsoonto, diff --git a/APPL/INS/ins_verbruik_list.inc b/APPL/INS/ins_verbruik_list.inc index 6725c6ebb5..a360d3bc26 100644 --- a/APPL/INS/ins_verbruik_list.inc +++ b/APPL/INS/ins_verbruik_list.inc @@ -79,7 +79,7 @@ function verbruik_list(pautfunction, params) var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. var showall = params.showall; - var loc_key = params.loc_key; + var loc_key_arr = params.loc_key_arr; var srtdeel_key = params.srtdeel_key; var count = 1; @@ -106,10 +106,10 @@ function verbruik_list(pautfunction, params) <% FCLTHeader.Generate({outputmode:outputmode}) %> - -<% if (loc_key) + " method="post" name="u2"> +<% if (loc_key_arr.length) { - sql_loc = " AND d.ins_alg_locatie_key = " + loc_key; + sql_loc = " AND d.ins_alg_locatie_key IN (" + loc_key_arr.join(",") + ")"; } else { // Note: we do not support alg-scope per discipline (yet) diff --git a/APPL/INS/ins_verbruik_search.asp b/APPL/INS/ins_verbruik_search.asp index 2588228d1d..a9b49eae4a 100644 --- a/APPL/INS/ins_verbruik_search.asp +++ b/APPL/INS/ins_verbruik_search.asp @@ -29,6 +29,7 @@ var authparams = user.checkAutorisation(autfunction); FCLTplaatsselector(authparams.ALGreadlevel, { startlevel: 2, // locatie eindlevel: 2, // Locatie + multitoggle: 2, whenEmpty: L("lcl_search_generic"), // want filter filtercode: "EXP" }); @@ -57,14 +58,14 @@ var authparams = user.checkAutorisation(autfunction); emptyOption: "" }); %> - + <% SEARCH_BLOCK_END(); var buttons = [ {title: L("lcl_overview_list"), action: "document.forms.u2.submit();", id: "bSearch", icon: "fa-clipboard-list" }]; SIMPLE_BLOCK_START(); CreateButtons(buttons, { entersubmit: true, showIcons: true }); SIMPLE_BLOCK_END(); - + %><% SEARCH_PAGE_END(); %>
@@ -77,4 +78,4 @@ var authparams = user.checkAutorisation(autfunction);
-<% ASPPAGE_END(); %> +<% ASPPAGE_END(); %> diff --git a/APPL/INS/ins_verbruik_search_list.asp b/APPL/INS/ins_verbruik_search_list.asp index bbb6559b12..d03fad0fcb 100644 --- a/APPL/INS/ins_verbruik_search_list.asp +++ b/APPL/INS/ins_verbruik_search_list.asp @@ -30,7 +30,7 @@ else var showall = getQParamInt("showall", 0) == 1; } -var loc_key = getQParamInt("locatiekey", -1); // Locatie +var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie var srtdeel_key = getQParamInt("srtdeel_key" , -1) // Object soort (ins_srtdeel_key) var submitting = getFParamInt("do_submit", 0) == 1; @@ -103,7 +103,7 @@ if (submitting) verbruik_list ("*", { outputmode: outputmode, showall: showall, - loc_key: (loc_key != -1? loc_key : null), + loc_key_arr: loc_key_arr, srtdeel_key: (srtdeel_key != -1? srtdeel_key : null) } ); diff --git a/APPL/MLD/opdr_list.asp b/APPL/MLD/opdr_list.asp index f29e620161..08734f3b7e 100644 --- a/APPL/MLD/opdr_list.asp +++ b/APPL/MLD/opdr_list.asp @@ -30,8 +30,8 @@ var externuit = getQParamInt("opdrEUit", (has_opdrXUit ? 0 : 1)) == 1; // Extern var has_opdrPlan = getQParamInt("has_opdrPlan", 0) == 1; // Wordt er gefilterd? var opdrplanned = getQParamInt("opdrPlanned", (has_opdrPlan ? 0 : 1)) == 1; // Geplande opdrachten var opdrunplanned = getQParamInt("opdrUnplanned", (has_opdrPlan ? 0 : 1)) == 1; // Ongeplande opdrachten -var loc_key = getQParamInt("loc_key", -1); -var bld_key = getQParamInt("bld_key", -1); +var loc_key_arr = getQParamKeyArray("loc_key", []); +var bld_key_arr = getQParamKeyArray("bld_key", []); // let op: geen parameter moet equivalent zijn met een null parameter (NIET -1 oid)! var theparams = { urole: urole, @@ -52,8 +52,8 @@ var theparams = { urole: urole, behandel_key_arr: (behandel_key != -1 ? [behandel_key] : []), srtdisc_key_arr : (srtdisc_key != -1 ? [srtdisc_key] : []), search: getQParam("search", null), - loc_key_arr: (loc_key != -1 ? [loc_key] : []), - bld_key_arr: (bld_key != -1 ? [bld_key] : []), + loc_key_arr: loc_key_arr, + bld_key_arr: bld_key_arr, prs_key: getQParamInt("prs_key", null), org_key: getQParamInt("dep_key", null), dienst_key: getQParamInt("dienst_key", null), diff --git a/APPL/MLD/opdr_search.asp b/APPL/MLD/opdr_search.asp index 07c910b0cc..9e5537118a 100644 --- a/APPL/MLD/opdr_search.asp +++ b/APPL/MLD/opdr_search.asp @@ -748,6 +748,7 @@ SEARCH_BLOCK_START(); } FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: locatie_key, gebouwkey: gebouw_key, + multitoggle: 3, startlevel: alg_startlevel, eindlevel: alg_eindlevel, trclass: "noxd", diff --git a/APPL/MLD/opdr_search_list.asp b/APPL/MLD/opdr_search_list.asp index 64bea87b70..0716519935 100644 --- a/APPL/MLD/opdr_search_list.asp +++ b/APPL/MLD/opdr_search_list.asp @@ -58,12 +58,12 @@ if (hasQParam("has_actiecodeATT") && getQParam("actiecodeATT", "off") == "on") opdr_actiecode_bitor |= 128; var bld = getQParamInt("bld", -1); var sName_key = getQParamInt("sName_key", -1); -var regiokey = getQParamInt("regiokey", -1); // Regio -var districtkey = getQParamInt("districtkey", -1); // District -var locatiekey = getQParamInt("locatiekey", -1); -var gebouwkey = getQParamInt("gebouwkey", -1); -var verdiepingkey = getQParamInt("verdiepingkey", -1); -var ruimtekey = getQParamInt("ruimtekey", -1); +var reg_key_arr = getQParamKeyArray("regiokey", []); // Regio +var dist_key_arr = getQParamKeyArray("districtkey", []); // District +var loc_key_arr = getQParamKeyArray("locatiekey", []); +var bld_key_arr = getQParamKeyArray("gebouwkey", []); +var flr_key_arr = getQParamKeyArray("verdiepingkey", []); +var room_key_arr = getQParamKeyArray("ruimtekey", []); var adr_key = getQParamInt("adr_key", -1); // Afleveradres var behandel_key_arr = getQParamInt("behandel_key", []); // Behandelaar @@ -130,12 +130,12 @@ var params = { urole : urole, outputmode: outputmode, showall: showall, caller_key: (sName_key != -1 ? sName_key : null), - reg_key_arr: (regiokey != -1 ? [regiokey] : []), - dist_key_arr: (districtkey != -1 ? [districtkey] : []), - loc_key_arr: (locatiekey != -1 ? [locatiekey] : []), - bld_key_arr: (gebouwkey != -1 ? [gebouwkey] : []), - flr_key_arr: (verdiepingkey != -1 ? [verdiepingkey] : []), - room_key_arr: (ruimtekey != -1 ? [ruimtekey] : []), + reg_key_arr: reg_key_arr, + dist_key_arr: dist_key_arr, + loc_key_arr: loc_key_arr, + bld_key_arr: bld_key_arr, + flr_key_arr: flr_key_arr, + room_key_arr: room_key_arr, adr_key: (adr_key != -1 ? adr_key : null), verantw_key: (verantw_key != -1 ? verantw_key : null), behandel_key_arr: behandel_key_arr, diff --git a/APPL/PDA/cnt_list.asp b/APPL/PDA/cnt_list.asp index a1aa18d0e2..db51b9bc76 100644 --- a/APPL/PDA/cnt_list.asp +++ b/APPL/PDA/cnt_list.asp @@ -106,13 +106,13 @@ var autfunction = (urole == "fe" ? "WEB_CNTUSE" : "WEB_CNTMAN"); if (mantel_key > 0) params.mantel_key = mantel_key; if (loc_key > 0) - params.loc_key = loc_key; + params.loc_key_arr = [loc_key]; if (geb_key > 0) - params.bld_key = geb_key; + params.bld_key_arr = [geb_key]; if (ver_key > 0) - params.flr_key = ver_key; + params.flr_key_arr = [ver_key]; if (rui_key > 0) - params.room_key = rui_key; + params.room_key_arr = [rui_key]; var bewaarParams = params; params = params.cntnum != "" ? {urole: urole, grp_sel: "", cntnum: getQParam("cntnum", ""), mobile: 1} : params;