Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/components/ChallengeEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,14 @@ class ChallengeEditor extends Component {
*/
isPhaseEditable (phaseIndex) {
const { phases } = this.state.challenge
return moment(phases[phaseIndex].scheduledEndDate).isAfter(moment())
const phase = phases[phaseIndex]
if (phase.name === 'Registration' && moment(phase.scheduledEndDate).isAfter(moment())) {
return true
}
if (!phase.isOpen) {
return false
}
return moment(phase.scheduledEndDate).isAfter(moment())
}

render () {
Expand Down
5 changes: 4 additions & 1 deletion src/components/DurationInput/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ const DurationInput = ({ duration, onDurationChange, index, isActive }) => {
min={0}
type='number'
value={Number(duration).toString()}
onChange={e => onDurationChange(e.target.value)}
onChange={e => {
e.preventDefault()
onDurationChange(e.target.value)
}}
autoFocus={inputRef.current === document.activeElement}
disabled={!isActive}
/>
Expand Down
8 changes: 5 additions & 3 deletions src/util/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,13 @@ export const updateChallengePhaseBeforeSendRequest = (challengeDetail) => {
if (challengeDetail.phases) {
const challengeDetailTmp = _.cloneDeep(challengeDetail)
challengeDetailTmp.startDate = 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)
// challengeDetailTmp.submissionEndDate = moment(challengeDetail.phases[1].scheduledEndDate)
challengeDetailTmp.phases = challengeDetailTmp.phases.map((p) => ({
duration: p.duration * hourToSecond,
phaseId: p.phaseId,
scheduledStartDate: p.scheduledStartDate,
scheduledEndDate: p.scheduledEndDate
phaseId: p.phaseId
}))
return challengeDetailTmp
}
Expand Down