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

Jump to bottom

Fix: cohorts get stuck when passing strings instead of numbers. #3397

Merged
merged 4 commits into from
Feb 5, 2019
Merged

Fix: cohorts get stuck when passing strings instead of numbers. #3397

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7194b9c
Fix: cohorts get stuck when passing strings instead of numbers.
arikfr Feb 5, 2019
655ce50
Use parseInt for stage
arikfr Feb 5, 2019
bae6f12
Remove redundant parseInt
arikfr Feb 5, 2019
7cbdc06
Merge branch 'master' into cohort-fix
kravets-levko Feb 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
21 changes: 11 additions & 10 deletions client/app/visualizations/cohort/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,21 @@ function prepareSimpleData(sortedData, options) {
function prepareData(rawData, options) {
rawData = _.map(rawData, item => ({
date: item[options.dateColumn],
stage: item[options.stageColumn],
total: item[options.totalColumn],
value: item[options.valueColumn],
stage: parseInt(item[options.stageColumn], 10),
total: parseFloat(item[options.totalColumn]),
value: parseFloat(item[options.valueColumn]),
}));
const sortedData = _.sortBy(rawData, r => r.date + parseInt(r.stage, 10));
const sortedData = _.sortBy(rawData, r => r.date + r.stage);
const initialDate = moment(sortedData[0].date).toDate();

let data;
switch (options.mode) {
case 'simple': data = prepareSimpleData(sortedData, options); break;
default: data = prepareDiagonalData(sortedData, options); break;
case 'simple':
data = prepareSimpleData(sortedData, options);
break;
default:
data = prepareDiagonalData(sortedData, options);
break;
}

return { data, initialDate };
Expand Down Expand Up @@ -160,10 +164,7 @@ function cohortRenderer() {
return;
}

const { data, initialDate } = prepareData(
$scope.queryResult.getData(),
$scope.options,
);
const { data, initialDate } = prepareData($scope.queryResult.getData(), $scope.options);

Cornelius.draw({
initialDate,
Expand Down