jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1984 from getredash/patches

Browse Source 
Cohort visualization: make it friendlier to use.
This commit is contained in:
Arik Fraimovich
2017-10-01 14:26:47 +03:00
committed by GitHub
parent f4cb62782a fc18b84f69
commit 0d44466967
1 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
client/app/visualizations/cohort/index.js
View File

@@ -7,6 +7,56 @@ import 'cornelius/src/cornelius.css';
import editorTemplate from './cohort-editor.html';
const momentInterval = {
weekly: 'weeks',
daily: 'days',
monthly: 'months',
};
function prepareData(rawData, timeInterval) {
const sortedData = _.sortBy(rawData, r => r.date + parseInt(r.day_number, 10));
const grouped = _.groupBy(sortedData, 'date');
const initialDate = moment(sortedData[0].date).toDate();
const lastDate = moment(sortedData[sortedData.length - 1].date);
const zeroBased = _.min(_.pluck(rawData, 'day_number')) === 0;
let previousDay = null;
const data = [];
_.each(grouped, (values) => {
if (previousDay !== null) {
let diff = Math.abs(previousDay.diff(values[0].date, momentInterval[timeInterval]));
while (diff > 1) {
data.push([0]);
diff -= 1;
}
}
previousDay = moment(values[0].date);
const row = [parseInt(values[0].total, 10)];
let maxDays = lastDate.diff(moment(values[0].date), momentInterval[timeInterval]);
if (zeroBased) {
maxDays += 1;
}
_.each(values, (value) => {
const index = zeroBased ? value.day_number + 1 : value.day_number;
row[index] = parseInt(value.value, 10);
});
for (let i = 0; i <= maxDays; i += 1) {
if (row[i] === undefined) {
row[i] = 0;
}
}
data.push(row);
});
return { data, initialDate };
}
function cohortRenderer() {
return {
restrict: 'E',
@@ -24,28 +74,9 @@ function cohortRenderer() {
return;
}
const sortedData = _.sortBy($scope.queryResult.getData(), r =>
r.date + parseInt(r.day_number, 10)
);
const { data, initialDate } = prepareData($scope.queryResult.getData(),
$scope.options.timeInterval);
const grouped = _.groupBy(sortedData, 'date');
const maxColumns = _.reduce(grouped, (memo, data) =>
((data.length > memo) ? data.length : memo)
, 0);
const data = _.map(grouped, (values) => {
const row = [parseInt(values[0].total, 10)];
_.each(values, (value) => {
row.push(parseInt(value.value, 10));
});
_.each(_.range(values.length, maxColumns), () => {
row.push(null);
});
return row;
});
const initialDate = moment(sortedData[0].date).toDate();
const container = angular.element(element)[0];
Cornelius.draw({