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

57 add warnings #91

Merged
merged 2 commits into from
Jul 11, 2017
Merged

57 add warnings #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f00df9e
give warning/error msg on inaccurate graph config
alison985 Jun 22, 2017
28c9bb9
updated based on PR comments
alison985 Jul 7, 2017
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
5 changes: 5 additions & 0 deletions client/app/visualizations/edit-visualization-dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* Edit Visualization Dialog specific CSS */

.slight-padding {
padding: 5px;
}
10 changes: 9 additions & 1 deletion client/app/visualizations/edit-visualization-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,18 @@ <h4 class="modal-title">Visualization Editor</h4>
<div class="col-md-7" style="border: 1px solid #eee">
<visualization-renderer visualization="$ctrl.visualization" query-result="$ctrl.queryResult"></visualization-renderer>
</div>
<div class="col-md-7">
<div class="bg-warning slight-padding" ng-if="$ctrl.visualization.options.series.stacking == null && $ctrl.has3plusColumnsFunction()" ng-bind-html="$ctrl.warning_three_column_stacking">
</div>
<div ng-repeat="value in $ctrl.visualization.options.columnMapping">
<div ng-if="value == 'unused' && $ctrl.has3plusColumnsFunction()" ng-bind-html="$ctrl.warning_three_column_groupby" class="bg-danger slight-padding"></div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="$ctrl.closeDialog()">Close</button>
<button type="button" class="btn btn-primary" ng-click="$ctrl.submit()">Save</button>
<button type="button" class="btn btn-primary" ng-click="$ctrl.submit()" ng-disabled="$ctrl.disableSubmit()">Save</button>
</div>
</div>
19 changes: 19 additions & 0 deletions client/app/visualizations/edit-visualization-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { pluck } from 'underscore';
import { copy } from 'angular';
import template from './edit-visualization-dialog.html';
import './edit-visualization-dialog.css';

const EditVisualizationDialog = {
template,
Expand All @@ -19,6 +20,9 @@ const EditVisualizationDialog = {
this.visualization = copy(this.originalVisualization);
this.visTypes = Visualization.visualizationTypes;

this.warning_three_column_groupby = '<b>You have more than 2 columns in your result set.</b> To ensure the chart is accurate, please do one of the following: <ul> <li>Change the SQL query to give 2 result columns. You can CONCAT() columns together if you wish.</li> <LI>Select column(s) to group by.</LI> </ul>';
this.warning_three_column_stacking = '<b>You have more than 2 columns in your result set.</b> You may wish to make the Stacking option equal to `Enabled` or `Percent`.';

this.newVisualization = () =>
({
type: Visualization.defaultVisualization.type,
Expand Down Expand Up @@ -47,6 +51,21 @@ const EditVisualizationDialog = {
}
};

this.has3plusColumnsFunction = () => {
let has3plusColumns = false;
if ((JSON.stringify(this.visualization.options.columnMapping).match(/,/g) || []).length > 1) {
has3plusColumns = true;
}
return has3plusColumns;
};

this.disableSubmit = () => {
if (this.has3plusColumnsFunction() && JSON.stringify(this.visualization.options.columnMapping).includes('unused')) {
return true;
}
return false;
};

this.submit = () => {
if (this.visualization.id) {
Events.record('update', 'visualization', this.visualization.id, { type: this.visualization.type });
Expand Down