Skip to content

Corrected logic in calculating progress of the milestones. #2389

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
vikasrohit merged 1 commit into from
Aug 16, 2018
Merged

Corrected logic in calculating progress of the milestones. #2389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions ...cts/detail/components/timeline/milestones/MilestoneTypeAddLinks/MilestoneTypeAddLinks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,11 @@ class MilestoneTypeAddLinks extends React.Component {

const isActive = milestone.status === MILESTONE_STATUS.ACTIVE
const isCompleted = milestone.status === MILESTONE_STATUS.COMPLETED
const today = moment().hours(0).minutes(0).seconds(0).milliseconds(0)

const endDate = moment(milestone.endDate)
const startDate = moment(milestone.startDate)
const daysLeft = endDate.diff(moment(), 'days')
const startDate = moment(milestone.actualStartDate || milestone.startDate)
const endDate = moment(milestone.startDate).add(milestone.duration - 1, 'days')
const daysLeft = endDate.diff(today, 'days')
const totalDays = endDate.diff(startDate, 'days')

const progressText = daysLeft >= 0
Expand Down
9 changes: 5 additions & 4 deletions ...nents/timeline/milestones/MilestoneTypeCheckpointReview/MilestoneTypeCheckpointReview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,13 @@ class MilestoneTypeCheckpointReview extends React.Component {
const isActive = milestone.status === MILESTONE_STATUS.ACTIVE
const isCompleted = milestone.status === MILESTONE_STATUS.COMPLETED
const minCheckedDesigns = this.getMinSelectedDesigns()
const today = moment().hours(0).minutes(0).seconds(0).milliseconds(0)

const endDate = moment(milestone.endDate)
const startDate = moment(milestone.startDate)
const daysLeft = endDate.diff(moment(), 'days')
const hoursLeft = endDate.diff(moment(), 'hours')
const startDate = moment(milestone.actualStartDate || milestone.startDate)
const endDate = moment(milestone.startDate).add(milestone.duration - 1, 'days')
const daysLeft = endDate.diff(today, 'days')
const totalDays = endDate.diff(startDate, 'days')
const hoursLeft = endDate.diff(moment(), 'hours')

const progressText = daysLeft >= 0
? `${daysLeft} days until designs are completed`
Expand Down
9 changes: 5 additions & 4 deletions ...il/components/timeline/milestones/MilestoneTypeFinalDesigns/MilestoneTypeFinalDesigns.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,12 +278,13 @@ class MilestoneTypeFinalDesigns extends React.Component {
const isActive = milestone.status === MILESTONE_STATUS.ACTIVE
const isCompleted = milestone.status === MILESTONE_STATUS.COMPLETED
const minCheckedDesigns = this.getMinSelectedDesigns()
const today = moment().hours(0).minutes(0).seconds(0).milliseconds(0)

const endDate = moment(milestone.endDate)
const startDate = moment(milestone.startDate)
const daysLeft = endDate.diff(moment(), 'days')
const hoursLeft = endDate.diff(moment(), 'hours')
const startDate = moment(milestone.actualStartDate || milestone.startDate)
const endDate = moment(milestone.startDate).add(milestone.duration - 1, 'days')
const daysLeft = endDate.diff(today, 'days')
const totalDays = endDate.diff(startDate, 'days')
const hoursLeft = endDate.diff(moment(), 'hours')

const progressText = daysLeft >= 0
? `${daysLeft} days until designs are completed`
Expand Down
7 changes: 4 additions & 3 deletions ...cts/detail/components/timeline/milestones/MilestoneTypeProgress/MilestoneTypeProgress.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ class MilestoneTypeProgress extends React.Component {
const links = _.get(milestone, 'details.content.links', [])
const isActive = milestone.status === MILESTONE_STATUS.ACTIVE
const isCompleted = milestone.status === MILESTONE_STATUS.COMPLETED
const today = moment().hours(0).minutes(0).seconds(0).milliseconds(0)

const endDate = moment(milestone.endDate)
const startDate = moment(milestone.startDate)
const daysLeft = endDate.diff(moment(), 'days')
const startDate = moment(milestone.actualStartDate || milestone.startDate)
const endDate = moment(milestone.startDate).add(milestone.duration - 1, 'days')
const daysLeft = endDate.diff(today, 'days')
const totalDays = endDate.diff(startDate, 'days')

const progressText = daysLeft > 0
Expand Down