Skip to content
Snippets Groups Projects
Commit af695f91 authored by Jaden Diefenbaugh's avatar Jaden Diefenbaugh
Browse files

add table button just adds table, no col select

parent 6f140dfb
No related branches found
No related tags found
1 merge request!223Reports overhaul
...@@ -44,19 +44,12 @@ angular.module('reportApp') ...@@ -44,19 +44,12 @@ angular.module('reportApp')
scope.plottables = ExperimentsService.plottables; scope.plottables = ExperimentsService.plottables;
// use the data sub-obj to hold the selected fields scope.addNewTable = () => {
// to keep twoway binding let id = getNextItemId('table');
scope.newTable = { data: [] }; scope.group.addReportItem(id, {
fields: [],
scope.addNewTable = function() { precision: 10
return () => { });
let id = getNextItemId('table');
scope.group.addReportItem(id, {
fields: Array.from(scope.newTable.data),
precision: 10
});
scope.newTable.data.length = 0;
};
}; };
scope.addNewPlot = (content) => { scope.addNewPlot = (content) => {
...@@ -68,8 +61,6 @@ angular.module('reportApp') ...@@ -68,8 +61,6 @@ angular.module('reportApp')
let id = getNextItemId('text'); let id = getNextItemId('text');
scope.group.addReportItem(id, ''); scope.group.addReportItem(id, '');
}; };
scope.tableFieldSelectorId = `${scope.group.name}_newTableDropdownToggle`;
}, },
template: ` template: `
<div class="btn-group" role="group"> <div class="btn-group" role="group">
...@@ -83,16 +74,9 @@ angular.module('reportApp') ...@@ -83,16 +74,9 @@ angular.module('reportApp')
</li> </li>
</ul> </ul>
</div> </div>
<div class="btn-group" role="group" <button class='btn btn-default' ng-click='addNewTable()'>
group-table-field-selector Add Table
id='tableFieldSelectorId' </button>
group='group'
cols-selected='newTable.data'
button-action='addNewTable()'
title="Add Table"
button-text="Add Table"
>
</div>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<button ng-disabled='!isEditable' <button ng-disabled='!isEditable'
ng-click='addNewText()' ng-click='addNewText()'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment