valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 17:38:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow defaults for existing visualizations, link time label to time interval

Browse Source
This commit is contained in:
nathanlubchenco 2015-09-16 10:34:22 -06:00
parent bf88d8b578
commit 0990d93b03
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rd_ui/app/scripts/visualizations/cohort.js
View File

@ -5,8 +5,7 @@
var editTemplate = '<cohort-editor></cohort-editor>';
var defaultOptions = {
'timeInterval': 'daily',
'timeLabel': 'day'
'timeInterval': 'daily'
};
VisualizationProvider.registerVisualization({
@ -27,7 +26,7 @@
template: "",
replace: false,
link: function($scope, element, attrs) {
$scope.$watch('[queryResult && queryResult.getData(), visualization.options.timeInterval, visualization.options.timeLabel]', function () {
$scope.$watch('[queryResult && queryResult.getData(), visualization.options.timeInterval ]', function () {
if ($scope.queryResult.getData() == null) {
} else {
@ -49,6 +48,11 @@
var initialDate = moment(sortedData[0].date).toDate(),
container = angular.element(element)[0];
$scope.visualization.options.timeInterval = $scope.visualization.options.timeInterval || 'daily';
var timeLabels = {'daily': 'Day', 'weekly': 'Week', 'monthly': 'Month'};
var timeLabel = timeLabels[$scope.visualization.options.timeInterval];
Cornelius.draw({
initialDate: initialDate,
container: container,
@ -56,11 +60,11 @@
title: null,
timeInterval: $scope.visualization.options.timeInterval,
labels: {
time: 'Activation ' + $scope.visualization.options.timeLabel,
time: 'Activation ' + timeLabel,
people: 'Users'
},
formatHeaderLabel: function (i) {
return $scope.visualization.options.timeLabel + (i - 1);
return timeLabel + (i - 1);
}
});
}

6
rd_ui/app/views/visualizations/cohort_editor.html
View File

@ -5,10 +5,4 @@
<option value="weekly">Weekly</option>
<option value="monthly">Monthly</option>
</select>
<label class="control-label">Time Label </label>
<select class="form-control" ng-model="visualization.options.timeLabel">
<option value="day">Day</option>
<option value="week">Week</option>
<option value="month">Month</option>
</select>
</div>