diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index bb239e14..921a5d86 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -1251,7 +1251,7 @@ class ChallengeEditor extends Component {
if (phase.name !== 'Registration') {
return false
}
- return moment(phase.scheduledEndDate).isAfter(moment())
+ return !phase.isOpen
}
render () {
diff --git a/src/components/PhaseInput/index.js b/src/components/PhaseInput/index.js
index e12cf34a..18ad1a9f 100644
--- a/src/components/PhaseInput/index.js
+++ b/src/components/PhaseInput/index.js
@@ -59,18 +59,6 @@ const PhaseInput = ({ onUpdatePhase, phase, readOnly, phaseIndex, isActive }) =>
setDuration(moment(end).diff(start, 'hours'))
}
- const onEndDateChange = (e) => {
- const end = moment(e).format()
- const start = moment(startDate).format()
-
- if (moment(end).isBefore(moment(start))) {
- return null
- }
-
- setEndDate(moment(e).format(dateFormat))
- setDuration(moment(end).diff(start, 'hours'))
- }
-
const onDurationChange = (e) => {
if (e.length > MAX_LENGTH) return null
@@ -90,7 +78,7 @@ const PhaseInput = ({ onUpdatePhase, phase, readOnly, phaseIndex, isActive }) =>
Start Date:
{
- readOnly ? (
+ readOnly || !isActive ? (
{moment(startDate).format(dateFormat)}
)
: (
@@ -102,7 +90,6 @@ const PhaseInput = ({ onUpdatePhase, phase, readOnly, phaseIndex, isActive }) =>
const yesterday = subDays(new Date(), 1)
return isAfter(current, yesterday)
}}
- disabled={!isActive}
dateFormat={inputDateFormat}
timeFormat={inputTimeFormat}
/>)}
@@ -111,22 +98,7 @@ const PhaseInput = ({ onUpdatePhase, phase, readOnly, phaseIndex, isActive }) =>
End Date:
- {
- readOnly ? (
- {moment(endDate).format(dateFormat)}
- )
- : (
- {
- return isAfter(current, new Date(startDate))
- }}
- disabled={!isActive}
- dateFormat={inputDateFormat}
- timeFormat={inputTimeFormat}
- />)}
+ {moment(endDate).format(dateFormat)}
diff --git a/src/util/date.js b/src/util/date.js
index b0bad1ad..32e2733c 100644
--- a/src/util/date.js
+++ b/src/util/date.js
@@ -109,7 +109,7 @@ export const updateChallengePhaseBeforeSendRequest = (challengeDetail) => {
const hourToSecond = 60 * 60
if (challengeDetail.phases) {
const challengeDetailTmp = _.cloneDeep(challengeDetail)
- challengeDetailTmp.startDate = challengeDetail.phases[0].scheduledStartDate
+ challengeDetailTmp.startDate = moment(challengeDetail.phases[0].scheduledStartDate)
// challengeDetailTmp.registrationStartDate = moment(challengeDetail.phases[0].scheduledStartDate)
// challengeDetailTmp.registrationEndDate = moment(challengeDetail.phases[0].scheduledEndDate)
// challengeDetailTmp.submissionStartDate = moment(challengeDetail.phases[1].scheduledStartDate)