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

TWYN#52344 (Rapport) filters heel globaal vasthouden

Browse Source 
svn path=/Website/trunk/; revision=39137
This commit is contained in:
Jos Groot Lipman
2018-09-13 10:44:39 +00:00
parent ab982f51b8
commit fbb888b93e
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/fac_report.asp
View File

@@ -49,7 +49,7 @@
Response.Redirect("fac_usrrap_search.asp?usrrap_key=" + usrrap_key);
var params = { transit: { "usrrap_key": usrrap_key },
search: { requires: { js: ["./fac_report.js"] }}
search: { requires: { js: ["./fac_report.js"] }, keepfilter: "report"}
};
var fcltfilters = getQParam("fcltfilters", "");
if (fcltfilters)

9
APPL/FAC/fac_usrrap_search.asp
View File

@@ -3,6 +3,9 @@
$Revision$
$Id$
LET OP: Dit is het oude rapport-zoekscherm welke alleen voor procedure-rapporten wordt gebruikt.
De meeste rapporten gaan via fac_report.asp met scaffolding
File: fac_usrrap_search.asp
Description: Show the filter fields for the selected report
Parameters:
@@ -44,12 +47,18 @@ var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
<head>
<% FCLTHeader.Generate() %>
<script>
if (!window.fcltfilters)
window.fcltfilters = FcltMgr.getData("filters_report");
// Button 'Uitvoeren' has been pressed
function startSearch()
{
if (!validateForm("u2"))
return false;
var filters = iface.formToString($("form[name=u2]"));
FcltMgr.setData("filters_report", filters);
document.forms.u2.submit();
}

3
APPL/Localscripts/FcltJquery.js
View File

@@ -457,9 +457,6 @@ function fcltPrompt(title, defval, fnSuccess, params)
function do_fcltfilters()
{ // Filters van opgeslagen tabjes verwerken
if (!window.fcltfilters)
window.fcltfilters = FcltMgr.getData("GLOBALFILTER");
if (window.fcltfilters && window.iface && window.fcltfilters != "null")
{
iface.stringToForm(window.fcltfilters, $('form[name=u2]'));

25
APPL/SCF/scaffolding_search.inc
View File

@@ -146,6 +146,11 @@ function scaffolding_search(model, scf_params)
FcltMgr.setTitle("<%=safe.jsstring(scf_params.search.title)%>");
<% } %>
<% if ("keepfilter" in scf_params.search) { %>
if (!window.fcltfilters)
window.fcltfilters = FcltMgr.getData("filters_<%=safe.jsstring(scf_params.search.keepfilter)%>");
<% } %>
$(function ()
{
$("#scfcolpicker table tbody" ).not('thead tr').sortable({ axis: "y", distance: 10 });
@@ -199,8 +204,10 @@ function scaffolding_search(model, scf_params)
if (!validateForm("u2"))
return false;
var filters = iface.formToString($("form[name=u2]"));
FcltMgr.setData("GLOBALFILTER", filters);
<% if ("keepfilter" in scf_params.search) { %>
var filters = iface.formToString($("form[name=u2]"));
FcltMgr.setData("filters_<%=safe.jsstring(scf_params.search.keepfilter)%>", filters);
<% } %>
var cols = [];
var groups = [];
@@ -239,26 +246,12 @@ function scaffolding_search(model, scf_params)
<% if (scf_params.search.autosearch) { %>
$(doSubmit);
<% } %>
function keepFilters()
{
var filter = iface.formToString($("form[name=u2]"))
FcltMgr.setData("globalfilter", filter);
}
function getFilters()
{
window.fcltfilters = FcltMgr.getData("globalfilter");
do_fcltfilters();
}
</script>
</head>
<body id="searchbody">
<div id="search">
<div style='float:right; padding: 5px;'>
<% if (0) { %>
<button onclick='keepFilters()'>Keep filters</button>
<button onclick='getFilters()'>Get filters</button>
<% } %>
<label><%=L("lcl_scf_extra_filter")%> </label>
<select class='notmulti extrafilter' style='width:auto' onchange='addFilter(this)'><option></option>
<%