diff --git a/APPL/FAC/fac_report.asp b/APPL/FAC/fac_report.asp index c6ab09051d..44d25e0017 100644 --- a/APPL/FAC/fac_report.asp +++ b/APPL/FAC/fac_report.asp @@ -270,6 +270,17 @@ function fac_usrrap_list_graph (model, scf_params) } } + + try + { + var x_1 = JSON.parse(rapport.graph_options); + } + catch(e) + { + __Log("Ongeldige JSON in graph_options"); + } + + graphInit = { title : model.records_title , graph_type : graph_type , maxrows : 0 @@ -294,7 +305,19 @@ function fac_usrrap_list_graph (model, scf_params) if (val && (typeof val == "string") && val.substr(0,10) == "function()") { val = val.substr(11, val.length-12); - val = eval(val); + switch(val) + { + case "$.jqplot.Highlighter": val = $.jqplot.Highlighter; break; + case "$.jqplot.PieRenderer": val = $.jqplot.PieRenderer; break; + case "$.jqplot.BarRenderer": val = $.jqplot.BarRenderer; break; + case "$.jqplot.CanvasAxisLabelRenderer": val = $.jqplot.CanvasAxisLabelRenderer; break; + case "$.jqplot.CanvasAxisTickRenderer": val = $.jqplot.CanvasAxisTickRenderer; break; + case "$.jqplot.CanvasOverlay": val = $.jqplot.CanvasOverlay; break; + case "$.jqplot.CanvasTextRenderer": val = $.jqplot.CanvasTextRenderer; break; + case "$.jqplot.CategoryAxisRenderer": val = $.jqplot.CategoryAxisRenderer; break; + case "$.jqplot.MeterGaugeRenderer": val = $.jqplot.MeterGaugeRenderer; break; + case "$.jqplot.PointLabels": val = $.jqplot.PointLabels; break; + } } return val; }