Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

adjust registration phase end date for design challenge #242

Merged
merged 1 commit into from
Apr 6, 2017
Merged

adjust registration phase end date for design challenge #242

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
24 changes: 18 additions & 6 deletions ...project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,9 +1940,15 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
PhaseType.REGISTRATION_PHASE.getId(), PhaseType.REGISTRATION_PHASE.getId(), projectPhases.getStartDate(), projectPhases.getStartDate());
if (multiRoundEndDate != null) {
adjustPhaseForEndDate(PhaseType.CHECKPOINT_SUBMISSION_PHASE, newProjectPhases, multiRoundEndDate);
if (isStudio) {
adjustPhaseForEndDate(PhaseType.REGISTRATION_PHASE, newProjectPhases, multiRoundEndDate);
}
}
if (endDate != null) {
adjustPhaseForEndDate(PhaseType.SUBMISSION_PHASE, newProjectPhases, endDate);
long submissionDuration = adjustPhaseForEndDate(PhaseType.SUBMISSION_PHASE, newProjectPhases, endDate);
if ((isStudio && multiRoundEndDate == null) || isAlgorithm || isFirst2Finish || isCode || submissionDuration <= (48 * 60 * 60 * 1000)) {
adjustPhaseForEndDate(PhaseType.REGISTRATION_PHASE, newProjectPhases, endDate);
}
}
setNewPhasesProperties(projectHeader, newProjectPhases, (multiRoundEndDate != null), isStudio);

Expand Down Expand Up @@ -2015,7 +2021,7 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
}
phaseManager.fillDependencies(phasesMap, new long[]{projectPhases.getId()});

subRegDiff = isStudio ? 0 : -subRegDiff;
//subRegDiff = isStudio ? 0 : -subRegDiff;

if (multiRoundEndDate != null) {
// multiround phase duration
Expand All @@ -2027,8 +2033,11 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
break;
}
}
if (isStudio){
adjustPhaseForEndDate(PhaseType.REGISTRATION_PHASE, projectPhases, multiRoundEndDate);
}
if (multiRoundPhase != null) {
multiRoundPhase.setLength(multiRoundEndDate.getTime() - fixedStart + subRegDiff);
multiRoundPhase.setLength(multiRoundEndDate.getTime() - fixedStart - subRegDiff);
}
}
if (endDate != null) {
Expand All @@ -2051,10 +2060,10 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
}

if (submissionPhase != null) {
submissionPhase.setLength(endDate.getTime() - fixedStart + subRegDiff);
submissionPhase.setLength(endDate.getTime() - fixedStart - subRegDiff);
}

if (registrationPhase != null && (isStudio || isAlgorithm || isFirst2Finish || isCode || submissionPhase.getLength() <= (48 * 60 * 60 * 1000))) {
if (registrationPhase != null && ((isStudio && multiRoundEndDate == null) || isAlgorithm || isFirst2Finish || isCode || submissionPhase.getLength() <= (48 * 60 * 60 * 1000))) {
registrationPhase.setLength(endDate.getTime() - fixedStart);
}
}
Expand Down Expand Up @@ -2739,12 +2748,15 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
if (multiRoundEndDate != null) {
// multiround phase duration
adjustPhaseForEndDate(PhaseType.CHECKPOINT_SUBMISSION_PHASE, newProjectPhases, multiRoundEndDate);
if (isStudio) {
adjustPhaseForEndDate(PhaseType.REGISTRATION_PHASE, newProjectPhases, multiRoundEndDate);
}
}
if (endDate != null) {
// submission phase duration
long submissionDuration = adjustPhaseForEndDate(PhaseType.SUBMISSION_PHASE, newProjectPhases, endDate);

if (isStudio || isAlgorithm || isFirst2Finish || isCode || submissionDuration <= (48 * 60 * 60 * 1000)) {
if ((isStudio && multiRoundEndDate == null) || isAlgorithm || isFirst2Finish || isCode || submissionDuration <= (48 * 60 * 60 * 1000)) {
adjustPhaseForEndDate(PhaseType.REGISTRATION_PHASE, newProjectPhases, endDate);
}
}
Expand Down