From cffeaf7de9e2410d567951ad13af8c617858fc3e Mon Sep 17 00:00:00 2001
From: Flavio Tarsetti <Flavio.Tarsetti@idiap.ch>
Date: Tue, 23 Aug 2016 00:18:52 +0200
Subject: [PATCH] [reports] possibility to select ONLY authorized
plotterparameter (self,public) and for a specific plotter
---
.../reports/app/directives/reportItemView.js | 66 ++++++++++++++++++-
1 file changed, 63 insertions(+), 3 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/reportItemView.js b/beat/web/reports/static/reports/app/directives/reportItemView.js
index 23420bd10..b4ff74163 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;
--
GitLab