Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Clean up chart layout code for improved maintainability #3837

Closed
wants to merge 11 commits into from
Closed

[WIP] Clean up chart layout code for improved maintainability #3837

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
16faf41
Initial legend orientation label
brylie May 27, 2019
ef9c994
Add default legend orientation of vertical
brylie May 27, 2019
7624c7a
Bind legend orientation to ng-model
brylie May 27, 2019
884eadc
Rename 'result' to 'layout' for to avoid mental mapping
brylie May 29, 2019
12c84f4
Warn about code that is difficult to comprehend
brylie May 30, 2019
6722fd9
Refactor prepareLayout to single-purpose functions
brylie May 30, 2019
fbff113
Remove orientation widget
brylie Jun 1, 2019
da859f1
Remove legend orientation property
brylie Jun 1, 2019
d95a1a2
Add comment for getFontColor
brylie Jun 3, 2019
0053cec
Refactor preparePieData function for readability
brylie Jun 3, 2019
dd9c0c9
Refactor functions to prepare y-axes
brylie Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/app/visualizations/chart/chart-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,16 @@
</label>
</div>

<label class="control-label" for="legendOrientation">Legend orientation:</label>

<input type="radio" id="legendOrientationVertical"
name="legendOrientation" value="v" ng-model="$ctrl.options.legend.orientation">
<label for="contactChoice1">Vertical</label>

<input type="radio" id="legendOrientationHorizontal"
name="legendOrientation" value="h" ng-model="$ctrl.options.legend.orientation">
<label for="contactChoice2">Horizontal</label>

<div class="checkbox" ng-if="$ctrl.options.globalSeriesType == 'box'">
<label>
<input type="checkbox" ng-model="$ctrl.options.showpoints">
Expand Down
5 changes: 4 additions & 1 deletion client/app/visualizations/chart/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import editorTemplate from './chart-editor.html';
const DEFAULT_OPTIONS = {
globalSeriesType: 'column',
sortX: true,
legend: { enabled: true },
legend: {
enabled: true,
brylie marked this conversation as resolved.
Show resolved Hide resolved
orientation: 'v',
},
yAxis: [{ type: 'linear' }, { type: 'linear', opposite: true }],
xAxis: { type: '-', labels: { enabled: true } },
error_y: { type: 'data', visible: true },
Expand Down