Skip to content

Issue #126 #154

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

Merged
merged 2 commits into from
Jul 31, 2018
Merged

Issue #126 #154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55ada2a
- Fixed issue where identical data were being treated as different an…
architectt1 Jul 30, 2018
3215780
Merge branch 'feature/timeline-milestone' into issue/126
architectt1 Jul 30, 2018
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
13 changes: 11 additions & 2 deletions src/routes/timelines/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,31 @@ module.exports = [
// Omit deletedAt, deletedBy
updated = _.omit(updatedTimeline.toJSON(), ['deletedAt', 'deletedBy']);

// Update milestones startDate and endDate if necessary
if (original.startDate !== updated.startDate || original.endDate !== updated.endDate) {
// Update milestones startDate and endDate if necessary, if the timeline startDate changed
if (original.startDate.getTime() !== updated.startDate.getTime()) {
return updatedTimeline.getMilestones()
.then((milestones) => {
let startDate = updated.startDate;

// Process milestones in order
const updateMilestonePromises = _.chain(milestones).sortBy('order').map((_milestone) => {
const milestone = _milestone;

// Update if the iterating startDate is different than the saved one
if (milestone.startDate.getTime() !== startDate.getTime()) {
milestone.startDate = startDate;
milestone.updatedBy = req.authUser.userId;
}

// Make sure the endDate is the correct, i.e. for duration = 1 it should be equal to the start date,
// for duration = 2 it should be equal to the next day and so on...
const endDate = moment.utc(milestone.startDate).add(milestone.duration - 1, 'days').toDate();
if (!milestone.endDate || endDate.getTime() !== milestone.endDate.getTime()) {
milestone.endDate = endDate;
milestone.updatedBy = req.authUser.userId;
}

// Next iterated milestone should have as startDate this milestone's endDate plus one day
startDate = moment.utc(milestone.endDate).add(1, 'days').toDate();
return milestone.save();
}).value();
Expand Down