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

DJIN#69715 Rapportages vastleggen en hergebruiken via "Favorieten" werkt niet meer

Browse Source 
svn path=/Website/branches/v2021.1/; revision=54077
This commit is contained in:
Alex Tiehuis
2021-12-09 12:16:45 +00:00
parent 747f49ea9b
commit 04a775b096
6 changed files with 9 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
APPL/FAC/fac_report.asp
View File

@@ -57,36 +57,6 @@
var params = { transit: { "usrrap_key": usrrap_key },
search: { requires: { js: ["./fac_report.js"] }, keepfilter: "report"}
};
// get filters from fac_menu_filter
if (getQParamInt("has_filters", 0) == 1)
{
var filters = null;
var fsql = " SELECT fac_menu_filter"
+ " FROM fac_menu"
+ " WHERE prs_perslid_key = " + user_key
+ " AND fac_menu_key = " + getQParamInt("tab_menu_key");
var foRs = Oracle.Execute( fsql );
if (foRs.Eof)
{
Response.Write("</script>");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/all.min.css");
Response.Write("</head><body>" + L("lcl_shared_pin_removed_error") + "</body></html>");
Response.End;
}
else
{
filters = foRs("fac_menu_filter").Value || "";
}
foRs.Close();
}
else
{
var filters = "";
}
var fcltfilters = filters;
if (fcltfilters)
params.fcltfilters = JSON.parse(fcltfilters);
if ("estimated_rows" in rapport && rapport.estimated_rows < 250)
params.search.autosearch = true;

3
APPL/FAC/fac_report.js
View File

@@ -89,6 +89,7 @@ $(function ()
.attr('title', L("lcl_usrrap_beware"))
.click(toggleInputSelect)
);
$("div.multitoggle").css({"width": width, "display": "inline-block"});
setTimeout(function() { $("div.multitoggle").css({"width": width, "display": "inline-block"}); });
});

2
APPL/Localscripts/iface.js
View File

@@ -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('&laquo;')
input.prev().html(I('fa-angle-double-left'));
}
else
input.val(formObject[objName]); // gewoon

28
APPL/MLD/mld_search.asp
View File

@@ -98,35 +98,9 @@ var backo = urole == "bo";
var minfo = urole == "mi";
var frontend = (urole == "fe" || (!fronto && !backo && !minfo));
var tiny = getQParamInt("tiny", 0) == 1;
// get filters from fac_menu_filter
if (getQParamInt("has_filters", 0) == 1)
{
var filters = null;
var fsql = " SELECT fac_menu_filter"
+ " FROM fac_menu"
+ " WHERE prs_perslid_key = " + user_key
+ " AND fac_menu_key = " + getQParamInt("tab_menu_key");
var foRs = Oracle.Execute( fsql );
if (foRs.Eof)
{
Response.Write("</script>");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/all.min.css");
Response.Write("</head><body>" + L("lcl_shared_pin_removed_error") + "</body></html>");
Response.End;
}
else
{
filters = foRs("fac_menu_filter").Value || "";
}
foRs.Close();
}
else
{
var filters = "";
}
// PREFILL PARAMETERS:
var fcltfilters = filters;
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

5
APPL/SCF/scaffolding_search.inc
View File

@@ -158,6 +158,11 @@ function scaffolding_search(model, scf_params)
<html>
<head>
<% FCLTHeader.Generate() %>
<%
var fcltfilters = FCLTHeader.filters;
if (fcltfilters)
params.fcltfilters = JSON.parse(fcltfilters);
%>
<script>
<% if ("title" in scf_params.search && !scf_params.title_locked) { %>
FcltMgr.setTitle("<%=safe.jsstring(scf_params.search.title)%>");

5
APPL/Shared/default.csx
View File

@@ -1145,11 +1145,6 @@ div.advmultitoggle {
/* font-size: 12px; */
}
table[id^=searchblock] div.multitoggle,
table[id^=searchblock] div.advmultitoggle {
width: calc(100% - 23px);
display: inline-block;
}
select.advMultiSuggest {
max-width: 100%;
}