diff --git a/beat/web/experiments/static/experiments/js/utils.js b/beat/web/experiments/static/experiments/js/utils.js index 681018d338d85e29713c747384fe7cb870b70a90..42894ec70ccfe93ca3fa995b4abbb4ff000d0678 100644 --- a/beat/web/experiments/static/experiments/js/utils.js +++ b/beat/web/experiments/static/experiments/js/utils.js @@ -468,7 +468,8 @@ beat.experiments.utils.displayPlot = function(prefix, container, value, availabl value.merged = state_merged; _regenerate_multiple_graph(plotter_selector); if (callback) - callback(value["plotter"], $(plotter_selector).val()); + callback(value["plotter"], value["parameter"], value["merged"]); + //callback(value["plotter"], $(plotter_selector).val()); }); diff --git a/beat/web/reports/static/reports/app/directives/reportItemView.js b/beat/web/reports/static/reports/app/directives/reportItemView.js index 03ecae9eb087d13340346a6f4b2ebf85ba4cf652..389750f8c8275de791003970eb54082c29c69f11 100644 --- a/beat/web/reports/static/reports/app/directives/reportItemView.js +++ b/beat/web/reports/static/reports/app/directives/reportItemView.js @@ -265,7 +265,6 @@ app.directive("addreportitem", function($compile) - content_detail["name"] = plot_details.data.output[0]; //content_detail["description"] = scope.report.content[chart_id].data.plotter; if(plot_details.data.plotter != undefined) @@ -280,6 +279,10 @@ app.directive("addreportitem", function($compile) { content_detail["merged"] = plot_details.data.merged; } + if(plot_details.merged != undefined) + { + content_detail["merged"] = plot_details.merged; + } var html_div_code = '<div class="panel panel-default" id="' + chart_id + '"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-' + chart_id + '" aria-expanded="true" aria-controls="collapse-info"><i class="fa fa-area-chart"> ' + content_detail.name + '</i></a></h4></div><div id="collapse-' + chart_id + '" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading"><div id="'+chart_id+'" class="panel-body chart {$ report.status $}"></div></div></div>'; generate_element(scope, "plot", html_div_code); @@ -998,7 +1001,6 @@ app.directive("addreportitem", function($compile) request_data.merged = plot_detail["merged"]; } - scope.plots_details[container.id]= plot_detail; if(scope.report.status == "editable" && scope.report.number != scope.report_number) @@ -1006,9 +1008,10 @@ app.directive("addreportitem", function($compile) beat.experiments.utils.displayPlot(base_url, $(container).find('.panel-body')[0], request_data, required_plotter, plotterparameter, false, - function(r_plotter, r_plotterparameter) { + function(r_plotter, r_plotterparameter, r_merged) { scope.plots_details[container.id]["data"]["plotter"] = r_plotter; scope.plots_details[container.id]["selected_template"] = r_plotterparameter; + scope.plots_details[container.id]["merged"] = r_merged; } ); } @@ -1017,7 +1020,7 @@ app.directive("addreportitem", function($compile) beat.experiments.utils.displayPlot(base_url, $(container).find('.panel-body')[0], request_data, [], [], false, - function(r_plotter, r_plotterparameter) { + function(r_plotter, r_plotterparameter, r_merged) { } ); }