diff --git a/beat/web/reports/static/reports/app/directives/reportItemView.js b/beat/web/reports/static/reports/app/directives/reportItemView.js index 23420bd102221c3295d2690c76cf38187457d510..b4ff741631b04ee7b623812d75f8e10d891cb745 100644 --- a/beat/web/reports/static/reports/app/directives/reportItemView.js +++ b/beat/web/reports/static/reports/app/directives/reportItemView.js @@ -811,10 +811,30 @@ app.directive("addreportitem", function($compile) } var plotterparameter = []; + //get plotterparameters valid for requested plotter + var required_plotter_id = undefined; + for(var i = 0; i < scope.report.plotters.length; i++) + { + if(required_plotter[0] == scope.report.plotters[i].name) + { + required_plotter_id = scope.report.plotters[i].id + } + } + //Get other plotterparameter for (var i = 0; i < scope.report.plotterparameter.length; i++) { - plotterparameter.push(scope.report.plotterparameter[i].name); + if(required_plotter_id == undefined) + { + plotterparameter.push(scope.report.plotterparameter[i].name); + } + else + { + if(scope.report.plotterparameter[i].plotter == required_plotter_id) + { + plotterparameter.push(scope.report.plotterparameter[i].name); + } + } } var chart_name = sub_content.name; @@ -950,10 +970,30 @@ app.directive("addreportitem", function($compile) } var plotterparameter = []; + //get plotterparameters valid for requested plotter + var required_plotter_id = undefined; + for(var i = 0; i < scope.report.plotters.length; i++) + { + if(required_plotter[0] == scope.report.plotters[i].name) + { + required_plotter_id = scope.report.plotters[i].id + } + } + //Get other plotterparameter for (var i = 0; i < scope.report.plotterparameter.length; i++) { - plotterparameter.push(scope.report.plotterparameter[i].name); + if(required_plotter_id == undefined) + { + plotterparameter.push(scope.report.plotterparameter[i].name); + } + else + { + if(scope.report.plotterparameter[i].plotter == required_plotter_id) + { + plotterparameter.push(scope.report.plotterparameter[i].name); + } + } } var chart_name = sub_content.name; @@ -1925,10 +1965,30 @@ app.directive("buttonexportitem", function() } var plotterparameter = []; + //get plotterparameters valid for requested plotter + var required_plotter_id = undefined; + for(var i = 0; i < scope.report.plotters.length; i++) + { + if(required_plotter[0] == scope.report.plotters[i].name) + { + required_plotter_id = scope.report.plotters[i].id + } + } + //Get other plotterparameter for (var i = 0; i < scope.report.plotterparameter.length; i++) { - plotterparameter.push(scope.report.plotterparameter[i].name); + if(required_plotter_id == undefined) + { + plotterparameter.push(scope.report.plotterparameter[i].name); + } + else + { + if(scope.report.plotterparameter[i].plotter == required_plotter_id) + { + plotterparameter.push(scope.report.plotterparameter[i].name); + } + } } var chart_name = sub_content.name;