Merge pull request #217 from skyhit/enable_assign_members_and_fix_double_payments_issues

enable assigning members for active task and fix double payments issues

Closes #214
Closes #215

Author: skyhit

services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java

@@ -9113,7 +9113,20 @@ public void closeSoftwareContest(TCSubject tcSubject, long projectId, long winne
                     if (phase.getPhaseStatus().getId() != PhaseStatus.OPEN.getId()) {
                         needToUpdate = true;
                         phase.setPhaseStatus(PhaseStatus.OPEN);
-                        break;
+                    }
+                } else if (PROJECT_ITERATIVE_REVIEW_PHASE_NAME.equals(phase.getPhaseType().getName()) ||
+                        PROJECT_REVIEW_PHASE_NAME.equals(phase.getPhaseType().getName())){
+                    //check whether iterative/review open and winner has been choosen
+                    //which mean challenge has been close
+                    if (phase.getPhaseStatus().getId() == PhaseStatus.OPEN.getId()) {
+                        Submission[] submissions = uploadManager.getProjectSubmissions(contest.getId());
+                        for (Submission submission : submissions){
+                            if(submission.getPlacement() != null && submission.getPlacement() == 1L){
+                                logger.error("Challenge has been closed");
+                                throw new ContestServiceException("Winner for this challenge has been selected or " +
+                                "challenge has been closed before");
+                            }
+                        }
                     }
                 }
             }
@@ -9139,7 +9152,7 @@ public void closeSoftwareContest(TCSubject tcSubject, long projectId, long winne
                     Date currentDate = new Date();
                     //length 1 hour
                     long length = 60 * MINUTE_IN_MILIS;
-                    //submision start 3h before
+                    //reg start 3h before
                     Date regStartDate = new Date(currentDate.getTime() - 180 * MINUTE_IN_MILIS);
                     //submision start 2h before
                     Date submissionStartDate = new Date(currentDate.getTime() - 120 * MINUTE_IN_MILIS);
@@ -9231,8 +9244,33 @@ public void cancelSoftwareContestByUser(TCSubject tcSubject, long projectId) thr
         logger.debug("Entering #cancelSoftwareContestByUser");
         try {
             Project contest = projectServices.getProject(projectId);
+            com.topcoder.project.phases.Project projectPhases = projectServices.getPhases(contest.getId());
+            com.topcoder.project.phases.Phase[] phases = projectPhases.getAllPhases();
+
+            //check whether iterative/review open and winner has been choosen
+            //which mean challenge has been close before
+            for (com.topcoder.project.phases.Phase phase : phases) {
+                if (PROJECT_ITERATIVE_REVIEW_PHASE_NAME.equals(phase.getPhaseType().getName()) ||
+                        PROJECT_REVIEW_PHASE_NAME.equals(phase.getPhaseType().getName())){
+                    //check whether iterative/review open and winner has been choosen
+                    //which mean challenge has been close
+                    if (phase.getPhaseStatus().getId() == PhaseStatus.OPEN.getId()) {
+                        Submission[] submissions = uploadManager.getProjectSubmissions(contest.getId());
+                        for (Submission submission : submissions){
+                            if(submission.getPlacement() != null && submission.getPlacement() == 1L){
+                                logger.error("Challenge has been closed");
+                                throw new ContestServiceException("Can't  cancel this challenge because winner " +
+                                            "for this challenge has been selected or challenge has been closed before");
+                            }
+                        }
+                    }
+                }
+            }
+
             contest.setProjectStatus(ProjectStatus.CANCELLED_CLIENT_REQUEST);
             projectManager.updateProject(contest, "cancel-client request", String.valueOf(tcSubject.getUserId()));
+        } catch (ContestServiceException e) {
+            throw  e;
         } catch (Exception e) {
             logger.error("Failed to update challenge");
             throw new ContestServiceException("Failed to update challenge", e);

src/web/scripts/launch/contestDetailSoftware.js

@@ -1266,7 +1266,6 @@ function populateTypeSection() {
         }
         if (mainWidget.softwareCompetition.projectHeader.projectStatus.name == ACTIVE_STATUS) {
             $("#privateProject").attr("disabled", "true");
-            $("#preRegisterUsers").attr("disabled", "true");
         }
     } else {
         $(".privateProjectRow").hide();
@@ -3354,7 +3353,8 @@ function doCloseContest(winnerId) {
             handleJsonResult(jsonResult,
                 function(result) {
                     showConfirmation("Success", "The system will close the challenge shortly.", "OK", function () {
-                        location.reload();
+                        $(".privateCmd").hide();
+                        closeModal();
                     });
                 },
                 function(errorMessage) {