From a4046a88a49dbc599c3227fe4a851e5adfddb78b Mon Sep 17 00:00:00 2001 From: Rik Hassing Date: Thu, 11 Jul 2024 12:57:41 +0000 Subject: [PATCH] BAMG#80956 Locaties - overzicht vervallen contracten & locaties svn path=/Website/trunk/; revision=65545 --- APPL/ALG/alg_gebouw_list.inc | 34 ++++++++++++----------------- APPL/ALG/alg_gebouw_search_list.asp | 4 ++-- APPL/ALG/alg_locatie.asp | 6 ++++- APPL/CNT/cnt_list.inc | 17 ++++++++++++++- APPL/CNT/cnt_search_list.asp | 5 ++++- APPL/Shared/default.css | 2 +- APPL/Shared/iface.inc | 26 +++++++++++++++++++++- APPL/Shared/resultset_table_v2.inc | 11 ++++++++-- 8 files changed, 76 insertions(+), 29 deletions(-) diff --git a/APPL/ALG/alg_gebouw_list.inc b/APPL/ALG/alg_gebouw_list.inc index 06244dcc8f..b38a1da281 100644 --- a/APPL/ALG/alg_gebouw_list.inc +++ b/APPL/ALG/alg_gebouw_list.inc @@ -129,10 +129,21 @@ function gebouw_list(pautfunction, params) var srtgebouw_key = params.srtgebouw_key; var verantw_key = params.verantw_key; var expalgincl = params.expalgincl; - var show_checkbox_expired = params.show_checkbox_expired; var fitness_score1_from = params.fitness_score1_from; var fitness_score1_through = params.fitness_score1_through; + var transitParam = buildTransitParam(["locatiekey", "urole", "bld_key", "flo_key", "room_key"]); + var rstFilters = params.rstFilters; + var checkBoxes = [ + { + lcl: L("lcl_alg_gebouw_vervallen_incl"), + param: 'expAlgIncl', + checked: expalgincl, + transitParams: transitParam + } + ]; + + var rstCheckBoxes = rstFilters ? checkBoxes : []; var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true); var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true); var readuse = autparamsINSUSE && autparamsINSUSE.PRSreadlevel < 9 && autparamsINSUSE.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens. @@ -239,9 +250,6 @@ function gebouw_list(pautfunction, params) addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }] } -// addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params) // TODO: welke allemaal? - var transitParam = buildTransitParam(["locatiekey", "urole"]); - /********************************** * Callback functies ResultsetTable *********************************/ @@ -342,7 +350,8 @@ function gebouw_list(pautfunction, params) flexParams: fnrowFlexParams, filterParams: params, outputmode: outputmode, - buttons: addButton + buttons: addButton, + rstCheckBoxes: rstCheckBoxes }); rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"})); @@ -384,21 +393,6 @@ function gebouw_list(pautfunction, params) rst.addAction({ action: "toObjMan", caption: L("lcl_ins_object_management"), enabler: "eObjMan"}); var cnt = rst.processResultset(); %> - <% if(show_checkbox_expired) { %> - - <% } %> <% diff --git a/APPL/ALG/alg_gebouw_search_list.asp b/APPL/ALG/alg_gebouw_search_list.asp index 7de3c38240..4a6b12ef4b 100644 --- a/APPL/ALG/alg_gebouw_search_list.asp +++ b/APPL/ALG/alg_gebouw_search_list.asp @@ -32,7 +32,7 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2 var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen -var show_checkbox_expired = getQParamInt("show_checkbox_expired", 0) ;// button vervallen gebouwen +var rstFilters = getQParamInt("rst_filters", 0) ;// button vervallen gebouwen var cnt_full = getQParamInt("cnt_full", 1); var fitness_score1_from = getQParamFloat("fitness_score1_from", -1); // Conditie score van. var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m. @@ -58,7 +58,7 @@ gebouw_list ( "*", bld_groep : bld_groep, noref: (noref != -1? noref : null), expalgincl: expalgincl, - show_checkbox_expired: (show_checkbox_expired == true ? 1 : 0) + rstFilters: (rstFilters == true ? 1 : 0) } ); %><% ASPPAGE_END(); %> diff --git a/APPL/ALG/alg_locatie.asp b/APPL/ALG/alg_locatie.asp index 90d08489c7..9b78b45763 100644 --- a/APPL/ALG/alg_locatie.asp +++ b/APPL/ALG/alg_locatie.asp @@ -84,7 +84,10 @@ else if (loc_key > -1) { var urole = "bo"; - var page0 = "../alg/alg_gebouw_search_list.asp?urole=" + urole +"&locatiekey="+loc_key + "&show_checkbox_expired=1"; + var page0 = "../alg/alg_gebouw_search_list.asp?urole=" + + urole +"&locatiekey="+loc_key + + "&rst_filters=1"; + IFRAMER("alggebouwframe", page0, { icon: "fa-list"} ); var page1 = "../alg/alg_terreinsector_search_list.asp?urole=" + urole +"&locatiekey="+loc_key; IFRAMER("algterreinframe", page1, { icon: "fa-list"} ); @@ -100,6 +103,7 @@ else { var page2 = "../cnt/cnt_search_list.asp?embedded=1&tiny=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key + + "&rst_filters=1" + "&cnt_full="+cnt_full; IFRAMER("cntlistframe", page2, { icon: "fa-list" } ); } diff --git a/APPL/CNT/cnt_list.inc b/APPL/CNT/cnt_list.inc index 7c92fe8875..07bc236759 100644 --- a/APPL/CNT/cnt_list.inc +++ b/APPL/CNT/cnt_list.inc @@ -103,6 +103,20 @@ function cnt_list (pautfunction, params) var showall = params.showall; var room_key_arr = params.room_key_arr || []; + + var rstFilters = params.rst_filters; + + params.cntNotclosed = cntInact ? 0 : 1; + var transitParam = buildTransitParam(["loc_key", "urole", "tiny", "ffutu", "fact", "frap", "fopz", "sact", "cnt_full=0"]); + var checkBoxes = [ + { + lcl: L("lcl_cnt_inactive"), + param: 'sinact', + checked: cntInact, + transitParams: transitParam + } + ]; + var rstCheckBoxes = rstFilters ? checkBoxes : []; %> @@ -304,7 +318,8 @@ function cnt_list (pautfunction, params) outputmode: outputmode, title: L("lcl_cnt_contracts"), showAll: showall, - buttons: buttons + buttons: buttons, + rstCheckBoxes: rstCheckBoxes }); rst.addColumn(new Column({caption: L("lcl_cnt_intern_nr"), content: fncolContractnr, colName: "fncolContractnr"})); diff --git a/APPL/CNT/cnt_search_list.asp b/APPL/CNT/cnt_search_list.asp index d19c6ebcc4..eeaafcac51 100644 --- a/APPL/CNT/cnt_search_list.asp +++ b/APPL/CNT/cnt_search_list.asp @@ -32,6 +32,8 @@ var cntFOpz = getQParamInt("fopz", 0); // Fase In opzegtermijn binnen status act var cntAct = getQParamInt("sact", 0); var cntInact = getQParamInt("sinact", 0); +var rstFilters = getQParamInt("rst_filters", 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. @@ -106,13 +108,13 @@ else var cntInact = getFParamInt("cntInact", cntInact) == 1; // Status Inactief(1) var cntNew = getFParamInt("cntNew", 0) == 1; // Status Nieuw(2) var cntTgoe = getFParamInt("cntTgoe", 0) == 1; // Status Ter goedkeuring(3) + var rstFilters = getFParamInt("rst_filters", rstFilters); var cntFFutu = getFParamInt("cntFFutu", cntFFutu) == 1; // Fase Toekomstig binnen status actief var cntFAct = getFParamInt("cntFAct", cntFAct) == 1; // Fase Actueel binnen status actief var cntFRap = getFParamInt("cntFRap", cntFRap) == 1; // Fase Rappel binnen status actief var cntFOpz = getFParamInt("cntFOpz", cntFOpz) == 1; // Fase In opzegtermijn binnen status actief var cntFVerl = getFParamInt("cntFVerl", 0) == 1; // Fase Verlopen binnen status actief - var cntOldVers = getFParamInt("cntOldVers", 0) == 1; // Ook oudere versies tonen als status "Gesloten" is geselecteerd. if (!cntAct && !cntInact && !cntNew && !cntTgoe) @@ -157,6 +159,7 @@ if (!cntAct && !cntInact && !cntNew && !cntTgoe) params.cntFOpz = cntFOpz params.cntFVerl = cntFVerl; params.cntOldVers = cntOldVers; + params.rst_filters = rstFilters; } /***** End get webform parameters *****/ diff --git a/APPL/Shared/default.css b/APPL/Shared/default.css index 1e8fc646d7..fab1be4362 100644 --- a/APPL/Shared/default.css +++ b/APPL/Shared/default.css @@ -1477,7 +1477,7 @@ div.fcltframe { } .fcltframeheader .iframer-title, .fcltframeheader #iframerextratitle, -.iframe-chb-toggle-expired, +.iframe-chb-toggle, .fcltframeheader #autofilter, span.hints { position: relative; diff --git a/APPL/Shared/iface.inc b/APPL/Shared/iface.inc index 207f164f65..f1cfeba21c 100644 --- a/APPL/Shared/iface.inc +++ b/APPL/Shared/iface.inc @@ -554,7 +554,7 @@ function SIMPLE_BLOCK_END() Response.Write(SIMPLE_BLOCK_END_HTML()); } -function IFRAMER_HEADER(titel, buttons, params) +function IFRAMER_HEADER(titel, buttons, params, checkBoxes) { params = params || {}; var collapsed = getQParamInt("collapsed", 0) == 1; @@ -596,6 +596,30 @@ function IFRAMER_HEADER(titel, buttons, params)
class="fcltframeheader<%=(params.collapsible ? ' collapsible' : '')%> block-buttons order-first col-12<%=collapsed ? ' collapsed' : ''%>"<%=params.collapsible? " onclick=\"$('#collapseblock, div.fcltblock, div.fcltblockhead, div.buttoncontainer, div.fcltframefooter div#buttons', $(this).parent()).toggle();$(this).toggleClass('collapsed');FcltMgr.resized(window);updateTableHeaders()\"" : ""%>> + <% // checkboxes: Array of objects containing data to create extra checkboxes to filter table: { lcl, checked, param, transitParams } + if (checkBoxes) { + var i = 0; + while(i < checkBoxes.length) { + var checkboxId = "toggle-"+ i; + var isChecked = checkBoxes[i].checked; + var qParams = "?" + checkBoxes[i].param + "=" + + (isChecked ? "0" : "1") + + "&rst_filters=1" + + checkBoxes[i].transitParams; + %> + + <%CHECKBOX("", checkboxId, isChecked);%> + + + + <% i++; + } + } %> + <% if (buttons) { %>
<% CreateButtons(buttons, { showIcons: true, inlineId: params.inlineId, isModal: params.noHamburger, inhamburger: params.inhamburger || false }); diff --git a/APPL/Shared/resultset_table_v2.inc b/APPL/Shared/resultset_table_v2.inc index 3a5c331450..811da27c30 100644 --- a/APPL/Shared/resultset_table_v2.inc +++ b/APPL/Shared/resultset_table_v2.inc @@ -173,6 +173,7 @@ function ResultsetTable(params) this.columncodes = null; // bitwise column enabler this.urllink = null; this.subtabicon = null; + this.rstCheckboxes = null; // multiple resultsets this.rstableCount = 1; @@ -1221,8 +1222,14 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al if (asSavedWidget) this.buttons.push({ icon: "fa-search-plus", id: "searchBlockToggler", action: "toggleSearchBlock();", tooltip: L("lcl_search") }); - if (this.title || buttons.length > 0) - IFRAMER_HEADER(this.title || "", buttons, { id: this.rstableNr, inlineId: (this.inline && this.filterParams && this.filterParams.mld_key ? this.filterParams.mld_key : ""), collapsible: this.collapsible }); + if (this.title || buttons.length > 0 || this.rstCheckBoxes.length > 0 ) + IFRAMER_HEADER( + this.title || "", + buttons, { id: this.rstableNr, + inlineId: (this.inline && this.filterParams && this.filterParams.mld_key ? this.filterParams.mld_key : ""), collapsible: this.collapsible }, + this.rstCheckBoxes + ); + if (this.rstableNr == 1) { // collapseblock sluiten we nooit omdat we niet weten of er nog een volgende tabel komen.