Merge pull request #1363 from nursoltan-s/issue-1357

fix issue 1357

Author: jmgasper

src/components/ChallengeEditor/index.js

@@ -820,23 +820,25 @@ class ChallengeEditor extends Component {
     newChallenge.phases[index]['scheduledEndDate'] = phase.endDate
 
     let lastDate = phase.endDate
-    for (let phaseIndex = index + 1; phaseIndex < phases.length; phaseIndex++) {
-      if (moment(phases[phaseIndex]['scheduledStartDate']).isBefore(lastDate)) {
-        lastDate = moment(lastDate).add('1', 'hour').format('MM/DD/YYYY HH:mm')
+    for (let phaseIndex = 0; phaseIndex < phases.length; phaseIndex++) {
+      if (phaseIndex !== index) {
+        if (moment(phases[phaseIndex]['scheduledStartDate']).isBefore(lastDate)) {
+          lastDate = moment(lastDate).add('1', 'hour').format('MM/DD/YYYY HH:mm')
 
-        if (newChallenge.phases[phaseIndex]['name'] !== 'Submission') {
-          newChallenge.phases[phaseIndex]['scheduledStartDate'] = lastDate
-        } else {
-          newChallenge.phases[phaseIndex]['scheduledStartDate'] = newChallenge.phases[index]['scheduledStartDate']
-        }
+          if (newChallenge.phases[phaseIndex]['name'] !== 'Submission') {
+            newChallenge.phases[phaseIndex]['scheduledStartDate'] = lastDate
+          } else {
+            newChallenge.phases[phaseIndex]['scheduledStartDate'] = newChallenge.phases[index]['scheduledStartDate']
+          }
 
-        if (moment(phases[phaseIndex]['scheduledEndDate']).isBefore(lastDate)) {
-          lastDate = moment(lastDate).add('1', 'hour').format('MM/DD/YYYY HH:mm')
-          newChallenge.phases[phaseIndex]['scheduledEndDate'] = lastDate
-        }
+          if (moment(phases[phaseIndex]['scheduledEndDate']).isBefore(lastDate)) {
+            lastDate = moment(lastDate).add('1', 'hour').format('MM/DD/YYYY HH:mm')
+            newChallenge.phases[phaseIndex]['scheduledEndDate'] = lastDate
+          }
 
-        newChallenge.phases[phaseIndex]['duration'] =
+          newChallenge.phases[phaseIndex]['duration'] =
           moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).diff(newChallenge.phases[phaseIndex]['scheduledStartDate'], 'hours')
+        }
       }
     }
 

src/components/DurationInput/DurationInput.module.scss

@@ -5,4 +5,14 @@
     cursor: not-allowed !important;
     background-color: $inactive !important;
   }
+
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+
+  &[type=number] {
+    -moz-appearance: textfield;
+  }
 }

src/components/PhaseInput/index.js

@@ -27,13 +27,6 @@ const PhaseInput = ({ onUpdatePhase, phase, readOnly, phaseIndex, isActive }) =>
       setEndDate(phase.scheduledEndDate)
       setDuration(moment(phase.scheduledEndDate).diff(phase.scheduledStartDate, 'hours'))
     }
-  }, [])
-
-  useEffect(() => {
-    if (phase) {
-      setStartDate(phase.scheduledStartDate)
-      setEndDate(phase.scheduledEndDate)
-    }
   }, [phase])
 
   useEffect(() => {