diff --git a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js index bd4f195a82b1062a0a392d4474a06cd12923e208..d19b96086f035070a8b8fdace3f78b5472b7d4c5 100644 --- a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js +++ b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js @@ -45,9 +45,26 @@ angular.module('reportApp') scope.plottables = ExperimentsService.plottables; scope.addNewTable = () => { - let id = getNextItemId('table'); + const id = getNextItemId('table'); + + // default fields are fields that are meant for tables + // that have the 'primary' property on the field value set to true + const defaultFieldsSet = Object.entries(ExperimentsService.tableables) + // only exps in group + .filter(([expName, o]) => scope.group.experiments.includes(expName)) + .map(([expName, o]) => Object.entries(o)) + .reduce((a, fEntries) => [...a, ...fEntries], []) + // only fields with primary == true + .filter(([fName, o]) => o.primary) + .map(([fName, o]) => fName) + .reduce((s, fName) => s.add(fName), new Set()) + ; + + const defaultFields = Array.from(defaultFieldsSet); + console.log(defaultFields); + scope.group.addReportItem(id, { - fields: [], + fields: defaultFields, precision: 10 }); }; diff --git a/beat/web/reports/static/reports/app/services/experimentsService.js b/beat/web/reports/static/reports/app/services/experimentsService.js index d394e5ccea4c33e988ec0bc824f4328a5b9232a6..c82798fffeb2fbc0ff9534c1fb61799c3b80ed40 100644 --- a/beat/web/reports/static/reports/app/services/experimentsService.js +++ b/beat/web/reports/static/reports/app/services/experimentsService.js @@ -178,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;