From b7500f90eec6a88f71dec7dcda54931cb1f1d244 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Wed, 15 Dec 2021 09:55:24 +0000 Subject: [PATCH] Merge 2021.1 Gold H/I patches svn path=/Website/trunk/; revision=54162 --- APPL/API2/model_res_deel.inc | 28 ++++++++++------- APPL/FAC/fac_report.asp | 5 +-- APPL/FAC/fac_report.js | 2 ++ APPL/Localscripts/iface.js | 2 +- APPL/MLD/mld.inc | 3 +- APPL/MLD/mld_double.asp | 5 ++- APPL/MLD/mld_doublecheck.asp | 5 ++- APPL/MLD/mld_edit_melding_save.asp | 6 ++-- APPL/MLD/mld_search.asp | 3 +- APPL/PDA/ins_list.asp | 2 +- APPL/RES/res_edit_rsv_ruimte.asp | 49 ++++++++++++++++-------------- APPL/SCF/scaffolding_search.inc | 4 +++ APPL/Shared/default.csx | 1 + APPL/Shared/default.inc | 2 +- APPL/Shared/header.inc | 22 ++++++-------- UTILS/PutOrders/puo_sendmail.js | 2 +- 16 files changed, 75 insertions(+), 66 deletions(-) diff --git a/APPL/API2/model_res_deel.inc b/APPL/API2/model_res_deel.inc index aa5c16b22c..38d1662d23 100644 --- a/APPL/API2/model_res_deel.inc +++ b/APPL/API2/model_res_deel.inc @@ -70,13 +70,13 @@ function model_res_deel(ins_min_level_arr, insMultiReserve) "filter": "like" }, "ruimtekey": { - "dbs": "res_v_ins_deelgegevens.tbl_res_deel_key", + "dbs": "res_v_ins_deelgegevens.alg_ruimte_key", "label": L("lcl_location"), "typ": "key", "hidden_fld": true, "foreign": { - "tbl": get_tbl(), - "key": "tbl_res_deel_key", + "tbl": get_tbl({desc: true}), + "key": "alg_ruimte_key", "desc": "alg_plaatsaanduiding", "selectorforeign": "ALG_RUIMTE", "selectorparams": {"startlevel": 2, "eindlevel": 5, "readonlylevel": 1} @@ -201,18 +201,24 @@ function model_res_deel(ins_min_level_arr, insMultiReserve) <% }; - function get_tbl(alias) + function get_tbl(params) { - var sql = "(SELECT a.alg_onroerendgoed_keys" + var params = params || {}; + + var sql = "(SELECT DISTINCT" + + " a.alg_ruimte_key" + + " , a.alg_onroerendgoed_keys" + " , a.alg_onroerendgoed_type" + " , a.alg_plaatsaanduiding" + " , a.alg_locatie_key" + " , a.alg_terreinsector_key" + " , a.alg_gebouw_key" + " , a.alg_verdieping_key" - + " , a.alg_ruimte_key" - + " , d.ins_deel_key" - + " , r.res_deel_key tbl_res_deel_key" + + ( params.desc + ? "" + : " , d.ins_deel_key" + + " , r.res_deel_key tbl_res_deel_key" + ) + " FROM res_deel r" + " , ins_deel d" + " , ins_v_alg_overzicht a" @@ -220,14 +226,14 @@ function model_res_deel(ins_min_level_arr, insMultiReserve) + " AND d.ins_alg_ruimte_key = a.alg_onroerendgoed_keys" + " AND d.ins_alg_ruimte_type = a.alg_onroerendgoed_type" + ")"; - if (alias) - sql += " " + alias; + if (params.alias) + sql += " " + params.alias; return sql; } if (inArray(1, this.ins_min_level_arr) || inArray(5, this.ins_min_level_arr)) // gekoppeld aan ins_deel { - var gparams = { GET: { tables: [get_tbl("res_v_ins_deelgegevens")] + var gparams = { GET: { tables: [get_tbl({alias: "res_v_ins_deelgegevens"})] , wheres: ["res_deel.res_deel_key = res_v_ins_deelgegevens.tbl_res_deel_key(+)"] } }; diff --git a/APPL/FAC/fac_report.asp b/APPL/FAC/fac_report.asp index 5fed2c9bde..7ebe973be6 100644 --- a/APPL/FAC/fac_report.asp +++ b/APPL/FAC/fac_report.asp @@ -57,9 +57,6 @@ var params = { transit: { "usrrap_key": usrrap_key }, search: { requires: { js: ["./fac_report.js"] }, keepfilter: "report"} }; - var fcltfilters = getQParam("fcltfilters", ""); - if (fcltfilters) - params.fcltfilters = JSON.parse(fcltfilters); if ("estimated_rows" in rapport && rapport.estimated_rows < 250) params.search.autosearch = true; @@ -260,7 +257,7 @@ function fac_usrrap_list_graph (model, scf_params) scf_graph: "on", urllink: scf_params.urllink }; - var pivot = xxx_params.filter.scf_pivot == 1 + var pivot = ("scf_pivot" in xxx_params.filter)? xxx_params.filter.scf_pivot == 1 : model.list.autoPivot&2 // Als er een url-key kolom op het eind aanwezig is dan deze kolom niet meetellen. var pivotcol; diff --git a/APPL/FAC/fac_report.js b/APPL/FAC/fac_report.js index 153b46d945..3c957f952c 100644 --- a/APPL/FAC/fac_report.js +++ b/APPL/FAC/fac_report.js @@ -90,4 +90,6 @@ $(function () .click(toggleInputSelect) ); + setTimeout(function() { $("div.multitoggle").css({"width": width, "display": "inline-block"}); }); }); + diff --git a/APPL/Localscripts/iface.js b/APPL/Localscripts/iface.js index e5cfb9c4c2..85e618988c 100644 --- a/APPL/Localscripts/iface.js +++ b/APPL/Localscripts/iface.js @@ -215,7 +215,7 @@ var iface = input.attr('multiple', 1); input.attr('size', Math.min(input.find("option").length, 8)); input.val(formObject[objName]); // gewoon - input.prev().html('«') + input.prev().html(I("fa-angle-up")); } else input.val(formObject[objName]); // gewoon diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index 0314959aa6..772bc2f0f2 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -6804,7 +6804,8 @@ mld = { sqlAB = sqlAB.replace(/UNION ALL/g, "UNION"); } // Voeg laatste tracking datum toe - sql = "SELECT * FROM (" + sqlAB + ") us" + sql = "SELECT /*+ CURSOR_SHARING_EXACT OPT_PARAM('optimizer_features_enable','11.2.0.4') */" + + " * FROM (" + sqlAB + ") us" + whereUs + " ORDER BY" // ins_discipline_omschrijving is hier al vertaald + (planb? " uitv_type_order, uitv_naam, behandelaar NULLS FIRST,mld_melding_spoed," : "") // het planbord sorteert clientside trouwens diff --git a/APPL/MLD/mld_double.asp b/APPL/MLD/mld_double.asp index bd3d80c873..0eaaf17673 100644 --- a/APPL/MLD/mld_double.asp +++ b/APPL/MLD/mld_double.asp @@ -103,8 +103,7 @@ var where_ins = ""; else if (alg_onrgoed_niveau == "L") { where_alg = "m.mld_alg_locatie_key = " + locatiekey - + " AND m.mld_alg_onroerendgoed_keys IS NULL" - + " AND org.alg_locatie_key = " + locatiekey; + + " AND m.mld_alg_onroerendgoed_keys IS NULL"; } MODAL_BLOCK_START("mldContinue", L("lcl_mld_similarcalls"), { icon: "fa-search-location" }); @@ -149,7 +148,7 @@ var where_ins = ""; + " AND sm.mld_ins_discipline_key = md.ins_discipline_key" + " AND md.ins_srtdiscipline_key = sd.ins_srtdiscipline_key" + (stdm_info.ins_srtdiscipline_alg - ? " AND (m.mld_alg_onroerendgoed_keys = org.alg_onroerendgoed_keys OR m.mld_alg_onroerendgoed_keys IS NULL) AND org.alg_locatie_key = l.alg_locatie_key" + ? " AND m.mld_alg_onroerendgoed_keys = org.alg_onroerendgoed_keys(+) AND m.mld_alg_locatie_key = l.alg_locatie_key" : "") + " AND m.mld_melding_key = mo.mld_melding_key(+)" + " AND m.prs_perslid_key = p.prs_perslid_key" diff --git a/APPL/MLD/mld_doublecheck.asp b/APPL/MLD/mld_doublecheck.asp index 8ed0a0cfab..4989edfa17 100644 --- a/APPL/MLD/mld_doublecheck.asp +++ b/APPL/MLD/mld_doublecheck.asp @@ -63,9 +63,8 @@ if (!mld_info.parent_key && (stdm_info.doublecheck == 2 || stdm_info.doublecheck // else if (stdm_info.alg_onrgoed_niveau == "L") // var where_alg = "org.alg_locatie_key = " + mld_info.loc_key; else if (stdm_info.alg_onrgoed_niveau == "L") - where_alg = "AND m.mld_alg_locatie_key = " + mld_info.loc_key - + " AND m.mld_alg_onroerendgoed_keys IS NULL" - + " AND org.alg_locatie_key = " + mld_info.loc_key; + where_alg = "m.mld_alg_locatie_key = " + mld_info.loc_key + + " AND m.mld_alg_onroerendgoed_keys IS NULL"; // alg_v_allonroerendgoed wordt toch niet gevonden. var where_obj = ""; diff --git a/APPL/MLD/mld_edit_melding_save.asp b/APPL/MLD/mld_edit_melding_save.asp index 647f37d2b8..0c5985e575 100644 --- a/APPL/MLD/mld_edit_melding_save.asp +++ b/APPL/MLD/mld_edit_melding_save.asp @@ -194,7 +194,7 @@ if (!forcesave && (fronto || frontend) && isNew) if (stdm_info.doublecheck == 1 || stdm_info.doublecheck == 3) { // In facmgt moet altijd een verplicht niveau gekozen worden. stdm_info.alg_onrgoed_niveau heeft dus een waarde (R, V, G, L). - var where_alg = "AND m.mld_alg_onroerendgoed_keys = org.alg_onroerendgoed_keys"; + var where_alg = "AND m.mld_alg_onroerendgoed_keys = org.alg_onroerendgoed_keys(+)"; if (!stdm_info.ins_srtdiscipline_alg) where_alg = ""; else if (stdm_info.alg_onrgoed_niveau == "R") @@ -207,8 +207,8 @@ if (!forcesave && (fronto || frontend) && isNew) // where_alg += " AND org.alg_locatie_key = " + locatiekey; else if (stdm_info.alg_onrgoed_niveau == "L") where_alg = "AND m.mld_alg_locatie_key = " + locatiekey - + " AND m.mld_alg_onroerendgoed_keys IS NULL" - + " AND org.alg_locatie_key = " + locatiekey; + + " AND m.mld_alg_onroerendgoed_keys IS NULL"; // alg_v_allonroerendgoed wordt toch niet gevonden. + // Als er exact 1 object is geselecteerd beschouwen // we alleen meldingen op dat object diff --git a/APPL/MLD/mld_search.asp b/APPL/MLD/mld_search.asp index b3f3210e9a..45f46870ec 100644 --- a/APPL/MLD/mld_search.asp +++ b/APPL/MLD/mld_search.asp @@ -99,9 +99,8 @@ var minfo = urole == "mi"; var frontend = (urole == "fe" || (!fronto && !backo && !minfo)); var tiny = getQParamInt("tiny", 0) == 1; - // PREFILL PARAMETERS: -var fcltfilters = getQParam("fcltfilters", null); +var fcltfilters = FCLTHeader.filters; var mld_key = getQParamInt("mld_key", -1); // Meldingnr var opdr_key = getQParamInt("opdr_key", -1); // Opdrachtnr var mldstatus_arr = getQParamIntArray("mldstatus_str", [-1]); // Meldingstatus diff --git a/APPL/PDA/ins_list.asp b/APPL/PDA/ins_list.asp index 3746431335..c462ea2db5 100644 --- a/APPL/PDA/ins_list.asp +++ b/APPL/PDA/ins_list.asp @@ -169,7 +169,7 @@ else function fncolDetail(oRs) { return safe.html((fronto ? oRs("soort").Value : oRs("ins_srtdeel_omschrijving").Value)) - + (oRs("hoeveelheid").Value != "1" ? " " + safe.html(oRs("hoeveelheid").Value) + "" : ""); + + (!fronto && oRs("hoeveelheid").Value != "1" ? " " + safe.html(oRs("hoeveelheid").Value) + "" : ""); }; function fncolsubHeader(oRs) diff --git a/APPL/RES/res_edit_rsv_ruimte.asp b/APPL/RES/res_edit_rsv_ruimte.asp index 26c60ad6eb..23d64178ef 100644 --- a/APPL/RES/res_edit_rsv_ruimte.asp +++ b/APPL/RES/res_edit_rsv_ruimte.asp @@ -315,37 +315,42 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"], { sql = "SELECT res_deel_alg_level" + " , res_discipline_key" + + " , res_ins_deel_key" + " FROM res_deel rd" + " WHERE res_deel_key = " + res_deel_key; oRs = Oracle.Execute(sql); rrr.res_deel_alg_level = oRs("res_deel_alg_level").value; rrr.res_discipline_key = oRs("res_discipline_key").value; + rrr.res_ins_deel_key = oRs("res_ins_deel_key").value; if (oRs("res_deel_alg_level").value == 5) // Hij kan alleen in eigen ruimte rrr.ab_mode = 2; // automatisch afhalen-vast oRs.close(); - // Alg_ruimte gegevens van res_deel_key ofwel ins_deel_key op zoeken. - sql = "SELECT rg.alg_locatie_key" - + " , rg.alg_gebouw_key" - + " , rg.alg_verdieping_key" - + " , rg.alg_ruimte_key" - + " , rd.res_deel_alg_level" - + " FROM res_deel rd" - + " , ins_deel d" - + " , alg_v_ruimte_gegevens_all rg" - + " , res_disc_params rdp" - + " WHERE rd.res_ins_deel_key = d.ins_deel_key" - + " AND COALESCE(d.ins_alg_ruimte_key_org, d.ins_alg_ruimte_key) = rg.alg_ruimte_key" - + " AND res_deel_key = " + res_deel_key - + " AND rdp.res_ins_discipline_key (+) = rd.res_discipline_key"; - oRs = Oracle.Execute(sql); - rrr.alg_locatie_key = oRs("alg_locatie_key").value; - rrr.alg_gebouw_key = oRs("alg_gebouw_key").value; - rrr.alg_verdieping_key = oRs("alg_verdieping_key").value; - rrr.alg_ruimte_key = oRs("alg_ruimte_key").value; - if (oRs("res_deel_alg_level").Value >= 5) - reado_alg = true; // Als de alg_level kleiner is dan 5 dan zijn er waarschijnlijk meerdere plekken te kiezen - oRs.close(); + if (rrr.res_ins_deel_key > 0) + { + // Alg_ruimte gegevens van res_deel_key ofwel ins_deel_key op zoeken. + sql = "SELECT rg.alg_locatie_key" + + " , rg.alg_gebouw_key" + + " , rg.alg_verdieping_key" + + " , rg.alg_ruimte_key" + + " , rd.res_deel_alg_level" + + " FROM res_deel rd" + + " , ins_deel d" + + " , alg_v_ruimte_gegevens_all rg" + + " , res_disc_params rdp" + + " WHERE rd.res_ins_deel_key = d.ins_deel_key" + + " AND COALESCE(d.ins_alg_ruimte_key_org, d.ins_alg_ruimte_key) = rg.alg_ruimte_key" + + " AND res_deel_key = " + res_deel_key + + " AND rdp.res_ins_discipline_key (+) = rd.res_discipline_key"; + oRs = Oracle.Execute(sql); + rrr.alg_locatie_key = oRs("alg_locatie_key").value; + rrr.alg_gebouw_key = oRs("alg_gebouw_key").value; + rrr.alg_verdieping_key = oRs("alg_verdieping_key").value; + rrr.alg_ruimte_key = oRs("alg_ruimte_key").value; + if (oRs("res_deel_alg_level").Value >= 5) + reado_alg = true; // Als de alg_level kleiner is dan 5 dan zijn er waarschijnlijk meerdere plekken te kiezen + oRs.close(); + } } // disc_key en act_key worden door RESA filter opgelost in de plaatsselector diff --git a/APPL/SCF/scaffolding_search.inc b/APPL/SCF/scaffolding_search.inc index ebf78d764a..392066e7f5 100644 --- a/APPL/SCF/scaffolding_search.inc +++ b/APPL/SCF/scaffolding_search.inc @@ -158,6 +158,10 @@ function scaffolding_search(model, scf_params) <% FCLTHeader.Generate() %> +<% + if (FCLTHeader.filters) + params.fcltfilters = JSON.parse(FCLTHeader.filters); +%>