From d7a2fb5494066deda2238711858c061570902a6e Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Thu, 4 Dec 2025 12:57:50 +0000 Subject: [PATCH] YAXX#91339 in de grouped fiatteringslijst door kunnen klikken naar de gescopede zoekpagina svn path=/Website/trunk/; revision=71148 --- APPL/FAC/fac_fiattering_list.asp | 53 +++++++++++++++++++++++++++++--- APPL/FAC/fac_fiattering_list.inc | 5 +-- 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/APPL/FAC/fac_fiattering_list.asp b/APPL/FAC/fac_fiattering_list.asp index cadc69067d..fc81161f14 100644 --- a/APPL/FAC/fac_fiattering_list.asp +++ b/APPL/FAC/fac_fiattering_list.asp @@ -183,6 +183,43 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] }); "json"); } + function fac_grouped_by_betreft(row) + { + var rowData = JSON.parse(row.getAttribute("ROWDATA")); + var module = rowData.module; + var betreft = ""; + switch (module) + { + case "BES": + case "CNT": + case "FIN": + case "RES": + case "MLDIN": + { + betreft = module; + break; + } + case "MLD": + case "GOED": + { + betreft = "MLDOP"; + break; + } + case "OFFERTE": + { + betreft = "MLDOF"; + break; + } + case "FIN2": + { + betreft = "FIN"; + break; + } + default: INTERNAL_ERROR; + } + FcltMgr.openDetail("appl/fac/fac_fiattering_search.asp?betreft=" + betreft, L("lcl_menu_fac_fiattering")); + } + function fac_edit(row) { var facData = JSON.parse(row.getAttribute("ROWDATA")); @@ -582,9 +619,13 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] }); function fnrowData(oRs) { - var data = { module: oRs("module").Value, - prefix: oRs("prefix").Value, - aanvraagnummer: oRs("aanvraagnummer").Value }; + if (groupbymodule) { + var data = { module: oRs("module_code").Value }; + } else { + var data = { module: oRs("module").Value, + prefix: oRs("prefix").Value, + aanvraagnummer: oRs("aanvraagnummer").Value }; + } return JSON.stringify(data); } @@ -654,10 +695,10 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] }); } var sql = fiattering_sql(params); - var rst = new ResultsetTable({keyColumn: groupbymodule ? null : "request_key", + var rst = new ResultsetTable({keyColumn: groupbymodule ? "module_code" : "request_key", ID: "rfoTable", sql: sql, - rowData: groupbymodule ? null : fnrowData, + rowData: fnrowData, rowActionEnabler: groupbymodule ? null : fnrowActionEnabler, outputmode: outputmode, filterParams: params, @@ -667,6 +708,8 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] }); if (groupbymodule) { rst.addColumn(new Column({ caption: L("lcl_fac_module"), content: "module" })); rst.addColumn(new Column({ caption: L("lcl_count"), content: "aantal" })); + + rst.addAction({action: "fac_grouped_by_betreft", caption: L("lcl_details"), isDefault: true}); } else { rst.addColumn(new Column({caption: "dummy", content: allowFiat, hidden: true})); rst.addColumn(new Column({caption: "dummy", content: "module", hidden: true})); diff --git a/APPL/FAC/fac_fiattering_list.inc b/APPL/FAC/fac_fiattering_list.inc index 96fea9a2ec..4a05e675f2 100644 --- a/APPL/FAC/fac_fiattering_list.inc +++ b/APPL/FAC/fac_fiattering_list.inc @@ -1385,7 +1385,7 @@ function getSqlInstemMld(fiatstatus, prsKeys, params) + " , alg_locatie l" + (fiatstatus == "open" ? " , prs_v_perslid_fullnames_all pf2" - : "" + : "" ) + " WHERE m.prs_perslid_key_voor = pf.prs_perslid_key" + " AND m.mld_alg_onroerendgoed_keys = v.alg_onroerendgoed_keys(+)" @@ -1635,7 +1635,8 @@ function fiattering_sql(params) sql = "SELECT '1' aanvraagnummer, '2' sortdate FROM DUAL WHERE 1=0 ORDER BY sortdate, aanvraagnummer ASC"; // Geen resultaat. else if (params.groupbymodule) { for (var i = 0; i < sqls.length; i++) { - sqls[i] = "SELECT DECODE(module" + sqls[i] = "SELECT module module_code" + + " , DECODE(module" + ", 'BES', " + safe.quoted_sql(L("lcl_fin_bestellingen")) + ", 'CNT', " + safe.quoted_sql(L("lcl_fin_contracten")) + ", 'MLD', " + safe.quoted_sql(L("lcl_fin_opdrachten"))