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

FSN#34749 Mogelijkheid voor jqplot Graphs Default options

Browse Source 
svn path=/Website/trunk/; revision=27826
This commit is contained in:
Erik Groener
2016-01-20 13:05:33 +00:00
parent 4ba456ad46
commit c91c4499f0
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
APPL/FAC/fac_report.asp
View File

@@ -249,7 +249,9 @@ function fac_usrrap_list_graph (model, scf_params)
} }
var default_options = eval('(' + l_init.default_options + ')'); var default_options = eval('(' + l_init.default_options + ')');
var report_options = eval('(' + l_init.report_options + ')'); var report_options = $.extend(default_options,
eval('(' + l_init.report_options + ')'));
<% <%
switch (graphInit.graph_type) switch (graphInit.graph_type)
{ {
@@ -296,11 +298,6 @@ function fac_usrrap_list_graph (model, scf_params)
l_limits = report_options.seriesDefaults.rendererOptions.intervals; l_limits = report_options.seriesDefaults.rendererOptions.intervals;
delete report_options.seriesDefaults.rendererOptions.intervals; // Voorkom dat deze array de "effectiveprops" overschrijft. delete report_options.seriesDefaults.rendererOptions.intervals; // Voorkom dat deze array de "effectiveprops" overschrijft.
} // De eeste waarde in het array wordt alleen gebruikt voor het minimum. } // De eeste waarde in het array wordt alleen gebruikt voor het minimum.
else if ("intervals" in default_options.seriesDefaults.rendererOptions)
{
l_limits = default_options.seriesDefaults.rendererOptions.intervals;
delete default_options.seriesDefaults.rendererOptions.intervals;
}
if (l_limits.length < 3) if (l_limits.length < 3)
l_limits = l_init.limiet; l_limits = l_init.limiet;
@@ -407,17 +404,7 @@ function fac_usrrap_list_graph (model, scf_params)
if ("graphdata" in report_options) var effectiveprops = $.extend(true, props, report_options);
effectivedata = eval(report_options["graphdata"]);
else if ("graphdata" in default_options)
effectivedata = eval(default_options["graphdata"]);
if ("overruleall" in report_options)
var effectiveprops = report_options;
else if ("overruleall" in default_options)
var effectiveprops = default_options;
else
var effectiveprops = $.extend(true, props, (report_options ? report_options : default_options) );
$(function () { $(function () {
plot1 = $.jqplot( 'myGraph' plot1 = $.jqplot( 'myGraph'