Merge pull request #2389 from appirio-tech/dev

Corrected logic in calculating progress of the milestones.

Author: vikasrohit

src/projects/detail/components/timeline/milestones/MilestoneTypeAddLinks/MilestoneTypeAddLinks.jsx

@@ -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

src/projects/detail/components/timeline/milestones/MilestoneTypeCheckpointReview/MilestoneTypeCheckpointReview.jsx

@@ -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`

src/projects/detail/components/timeline/milestones/MilestoneTypeFinalDesigns/MilestoneTypeFinalDesigns.jsx

@@ -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`

src/projects/detail/components/timeline/milestones/MilestoneTypeProgress/MilestoneTypeProgress.jsx

@@ -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