From 2116a83ef10af24219202860ceb3f61246c12508 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Thu, 9 Mar 2017 15:58:07 +0100
Subject: [PATCH] distinguish plots by plot name not by plot type
---
.../static/reports/app/directives/groupAddItemsMenu.js | 2 +-
.../static/reports/app/services/experimentsService.js | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/groupAddItemsMenu.js b/beat/web/reports/static/reports/app/directives/groupAddItemsMenu.js
index 6f908f63b..14e416af1 100644
--- a/beat/web/reports/static/reports/app/directives/groupAddItemsMenu.js
+++ b/beat/web/reports/static/reports/app/directives/groupAddItemsMenu.js
@@ -79,7 +79,7 @@ angular.module('reportApp')
</button>
<ul class='dropdown-menu' ng-repeat='(expName, plots) in plottables' ng-if='expName === group.experiments[0]'>
<li ng-repeat='plot in plots'>
- <a href='#' ng-click='addNewPlot(plot.type)'>{{ plot.type }}</a>
+ <a href='#' ng-click='addNewPlot(plot.label)'>{{ plot.label }} <i>({{ plot.type }})</i></a>
</li>
</ul>
</div>
diff --git a/beat/web/reports/static/reports/app/services/experimentsService.js b/beat/web/reports/static/reports/app/services/experimentsService.js
index b52e62505..d394e5cce 100644
--- a/beat/web/reports/static/reports/app/services/experimentsService.js
+++ b/beat/web/reports/static/reports/app/services/experimentsService.js
@@ -54,7 +54,6 @@ angular.module('reportApp').factory('ExperimentsService', ['experimentFactory',
const getTableablesFromExpName = (expName) => {
let currExp = expData[expName];
- console.log(currExp);
// get all result objs that have a type that doesnt start with 'plot/'
// these results can be displayed in a table
let results = Object.entries(getVarProp(currExp.results))
@@ -142,7 +141,7 @@ angular.module('reportApp').factory('ExperimentsService', ['experimentFactory',
const getPlottablesFromExpName = (expName) => {
return Object.entries(getVarProp(expData[expName].results))
.filter(([res_name, obj]) => obj.type.startsWith('plot/'))
- .map(([res_name, obj]) => obj);
+ .map(([res_name, obj]) => Object.assign(obj, { label: res_name }));
};
// make sure there are no invalid experiments in the report's groups
@@ -179,7 +178,7 @@ angular.module('reportApp').factory('ExperimentsService', ['experimentFactory',
cleanGroups(Object.keys(expData));
console.log(expData);
- console.log(tableData);
+ //console.log(tableData);
console.log(plotData);
return expData;
--
GitLab