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

TWYN#52344 filters overrulen nu niet meer 'Altijd' en 'Nee' bij rapport instellingen

Browse Source 
svn path=/Website/trunk/; revision=39829
This commit is contained in:
Koen Reefman
2018-11-16 11:10:54 +00:00
parent f0ed3bf7f0
commit 6c36e9172b
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/Localscripts/FcltJquery.js
View File

@@ -459,7 +459,6 @@ function do_fcltfilters()
{ // Filters van opgeslagen tabjes verwerken
if (window.fcltfilters && window.iface && window.fcltfilters != "null")
{
iface.stringToForm(window.fcltfilters, $('form[name=u2]'));
var formObject = JSON.parse(window.fcltfilters);
if ("columns" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt
{ // Werk de interface checkboxjes ook bij
@@ -467,8 +466,10 @@ function do_fcltfilters()
var grparr = formObject.groupby.split(",");
$("#scfcolpicker tr").each(function()
{
if (!this.id)
// Ignore disabled checkboxes ('Altijd')
if (!this.id || !$(this).find("input:enabled[type=checkbox]").length)
return;
var pos = $.inArray(this.id, colarr);
if (pos > -1)
{
@@ -505,6 +506,8 @@ function do_fcltfilters()
});
}
iface.stringToForm(window.fcltfilters, $('form[name=u2]'));
if ("scf_pivot" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt
{
$("#chk_pivot").prop("checked", formObject.scf_pivot == 1)

6
APPL/Localscripts/iface.js
View File

@@ -160,7 +160,7 @@ var iface =
input = stringForm.find("[name=" + nm + "]");
if (!input.length)
return;
if (input.attr("type")=="checkbox" || input.attr("type")=="radio" )
if (input.attr("type") == "checkbox" || input.attr("type") == "radio")
{
input.prop("checked", !!formObject[nm])
}
@@ -191,7 +191,7 @@ var iface =
input.val(formObject[nm]); // gewoon
}
}
else
else if (!input.hasClass("final")) // Final's niet opslaan als filter
{
input.val(formObject[nm]);
input.prop('defaultValue', formObject[nm]);
@@ -201,7 +201,7 @@ var iface =
input.attr(sg, formObject.suggestattr[nm][sg])
}
}
})
});
},
// Persoonselector functies
persoonDetails: function (fieldName, info)

13
APPL/SCF/scaffolding_search.inc
View File

@@ -204,11 +204,6 @@ function scaffolding_search(model, scf_params)
if (!validateForm("u2"))
return false;
<% 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 = [];
$("#scfcolpicker tr").each(function()
@@ -241,6 +236,12 @@ function scaffolding_search(model, scf_params)
$("#scf_pivot").val($("#chk_pivot").prop("checked")?1:0);
$("#workFrame").width($(window).width()); // grafieken 'krimpen' slecht
<% if ("keepfilter" in scf_params.search) { %>
var filters = iface.formToString($("form[name=u2]"));
FcltMgr.setData("filters_<%=safe.jsstring(scf_params.search.keepfilter)%>", filters);
<% } %>
document.forms.u2.submit();
}
<% if (scf_params.search.autosearch) { %>
@@ -276,7 +277,7 @@ function scaffolding_search(model, scf_params)
<input type='hidden' name='mode' value='list'>
<input type='hidden' name='columns' id='columns'>
<input type='hidden' name='groupby' id='groupby'>
<input type='hidden' name='scf_pivot' id='scf_pivot' value='<%=(model.list.autoPivot&2)?1:0%>'>
<input type='hidden' name='scf_pivot' <%=(model.list.autoPivot&1 ? "" : "class='final' ")%>id='scf_pivot' value='<%=(model.list.autoPivot&2)?1:0%>'>
<%
var defaults = shared.qs2json(model); // TODO: Ook via scf_params