diff --git a/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java b/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java index 267736d28..be5902cf0 100644 --- a/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java +++ b/components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java @@ -41,7 +41,7 @@ * *

* Version 1.2.6 (Provide Way To Pre_register members When Launching Challenge) - * - Add property {@link #PRIVATE_PROJECT} + * - Add property {@link #TASK_FLAG} *

* * @author tuenm, iamajia, flytoj2ee, tangzx, GreatKevin, TCSCODER @@ -360,11 +360,11 @@ public class ProjectPropertyType implements Serializable { public static final String FORUM_TYPE = "Forum Type"; /** - * Represent "Private Project Status" project property type + * Represent "Task Flag" project property type * * @since 1.2.6 */ - public static final String PRIVATE_PROJECT = "Private Project Status"; + public static final String TASK_FLAG = "Task Flag"; /** * Represents the id of this instance. Only values greater than zero is diff --git a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java index 7ec8985b8..b7edbfdfe 100644 --- a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java +++ b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java @@ -3681,7 +3681,7 @@ else if (isDevContest) contest.getProjectHeader().setProperty(ProjectPropertyType.RATED_PROJECT_PROPERTY_KEY, "No"); } - if (isPrivateProject(contest)) { + if (isTask(contest)) { // not rate for private contest.getProjectHeader().setProperty(ProjectPropertyType.RATED_PROJECT_PROPERTY_KEY, "No"); } @@ -4509,7 +4509,7 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo contest.getProjectHeader().setProperty(ProjectPropertyType.RATED_PROJECT_PROPERTY_KEY, "No"); } - if (isPrivateProject(contest)) { + if (isTask(contest)) { contest.getProjectHeader().setProperty(ProjectPropertyType.RATED_PROJECT_PROPERTY_KEY, "No"); } @@ -9066,8 +9066,8 @@ public boolean[] requireBillingProjectsCCA(long[] billingProjectIds) throws Pers * @return True if project if private * @since 3.4 */ - private boolean isPrivateProject(SoftwareCompetition contest){ - return contest.getProjectHeader().getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && "1".equals(contest.getProjectHeader().getProperty(ProjectPropertyType.PRIVATE_PROJECT)); + private boolean isTask(SoftwareCompetition contest){ + return contest.getProjectHeader().getProperty(ProjectPropertyType.TASK_FLAG) != null && "1".equals(contest.getProjectHeader().getProperty(ProjectPropertyType.TASK_FLAG)); } /** diff --git a/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java b/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java index 479113beb..c314f8c0d 100644 --- a/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java +++ b/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java @@ -2081,7 +2081,7 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader } if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId() && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) { - if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && "1".equals(projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT))) { + if (projectHeader.getProperty(ProjectPropertyType.TASK_FLAG) != null && "1".equals(projectHeader.getProperty(ProjectPropertyType.TASK_FLAG))) { if (p.getPhaseStatus().getId() != PhaseStatus.CLOSED.getId()) { Date now = new Date(); p.setFixedStartDate(now); @@ -5169,7 +5169,7 @@ private void setNewPhasesProperties(Project projectHeader, } if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId()) { - if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1") && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) { + if (projectHeader.getProperty(ProjectPropertyType.TASK_FLAG) != null && projectHeader.getProperty(ProjectPropertyType.TASK_FLAG).equals("1") && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) { p.setPhaseStatus(PhaseStatus.CLOSED); Date now = new Date(); p.setFixedStartDate(now); diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/CancelContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/CancelContestAction.java index 305cdfa5d..98e9ca339 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/CancelContestAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/CancelContestAction.java @@ -31,8 +31,8 @@ protected void executeAction() throws Exception { if (!AuthorizationProvider.isUserGrantedWriteAccessToProject(currentUser, contest.getTcDirectProjectId())) { throw new Exception("You don't have access to this resource"); } - if (contest.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && - contest.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) { + if (contest.getProperty(ProjectPropertyType.TASK_FLAG) != null && + "1".equals(contest.getProperty(ProjectPropertyType.TASK_FLAG))) { contestServiceFacade.cancelSoftwareContestByUser(currentUser, getProjectId()); } else { throw new Exception("Only for private challenge"); diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/CloseContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/CloseContestAction.java index 03f80ab8a..5d5e647c2 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/CloseContestAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/CloseContestAction.java @@ -22,7 +22,7 @@ public class CloseContestAction extends ContestAction { /** * User id of registrant that is been choose as thw winner */ - private long winner; + private long winnerId; /** *

Execute the action

@@ -39,30 +39,30 @@ protected void executeAction() throws Exception { throw new Exception("You don't have access to this resource"); } - if (contest.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && - contest.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) { - contestServiceFacade.closeSoftwareContest(currentUser, getProjectId(), winner); + if (contest.getProperty(ProjectPropertyType.TASK_FLAG) != null && + "1".equals(contest.getProperty(ProjectPropertyType.TASK_FLAG))) { + contestServiceFacade.closeSoftwareContest(currentUser, getProjectId(), winnerId); } else { throw new Exception("Only for private challenge"); } } /** - * Getter for {@link #winner} + * Getter for {@link #winnerId} * - * @return winner + * @return winnerId */ - public long getWinner() { - return winner; + public long getWinnerId() { + return winnerId; } /** - * Setter for {@link #winner} + * Setter for {@link #winnerId} * - * @param winner + * @param winnerId */ - public void setWinner(long winner) { - this.winner = winner; + public void setWinnerId(long winnerId) { + this.winnerId = winnerId; } diff --git a/src/web/WEB-INF/contest-details2.jsp b/src/web/WEB-INF/contest-details2.jsp index 91d32bf7f..99c4ed5fb 100644 --- a/src/web/WEB-INF/contest-details2.jsp +++ b/src/web/WEB-INF/contest-details2.jsp @@ -103,8 +103,8 @@

icon-marathon.png') no-repeat scroll left center transparent"> - CANCEL - CLOSE + CANCEL + CLOSE

diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index 759e5a047..e92f39d9f 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -123,9 +123,9 @@ : - + Task - : + : @@ -283,9 +283,9 @@


-
+
Task - +

diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp index 1a4afba3e..f2617fc6f 100644 --- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp +++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp @@ -221,17 +221,6 @@
- -

-
- Task - -
-
-
- Assign Member(s): - -


Created By diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp index db1553d8b..5cae54b44 100644 --- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp +++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp @@ -145,9 +145,9 @@ - + Task - : + : @@ -312,9 +312,9 @@

-
+
Task - +

diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp index 85aa40eda..22a694ad9 100644 --- a/src/web/WEB-INF/includes/launch/contestSelection.jsp +++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp @@ -185,9 +185,9 @@
-
+
- +
diff --git a/src/web/css/direct/launchcontest.css b/src/web/css/direct/launchcontest.css index 34f7b8eb4..e36a14772 100644 --- a/src/web/css/direct/launchcontest.css +++ b/src/web/css/direct/launchcontest.css @@ -1538,7 +1538,7 @@ a.contiune span.right { padding: 0 22px 0 18px; } -a.preview.privateCmd{ +a.preview.taskCmd{ margin-right: 0px; } diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js index 971dfeac2..55524b8ef 100644 --- a/src/web/scripts/launch/contestDetailSoftware.js +++ b/src/web/scripts/launch/contestDetailSoftware.js @@ -1152,7 +1152,7 @@ function initContest(contestJson) { if (contestJson.projectStatus != null && contestJson.projectStatus.name == DRAFT_STATUS) { isActiveContest = true; $(".edit_prize").parent().show(); - if (contestJson.properties["Private Project Status"] == "1"){ + if (contestJson.properties[TASK_FLAG] == "1"){ $(".edit_round").show(); $('#roundEdit').show(); $(".edit_prize").show(); @@ -1174,10 +1174,10 @@ function initContest(contestJson) { if(contestJson.isReviewPhaseClosed) { $(".edit_prize").hide(); $(".edit_round").hide(); - $(".privateCmd").hide(); + $(".taskCmd").hide(); }else if (contestJson.projectStatus != null && contestJson.projectStatus.id == ACTIVE_PROJECT_STATUS && - contestJson.properties["Private Project Status"] == "1"){ - $(".privateCmd").show(); + contestJson.properties[TASK_FLAG] == "1"){ + $(".taskCmd").show(); } @@ -1242,34 +1242,34 @@ function populateTypeSection() { } if (isF2F() || isDesignF2F()) { - var privateProject = p["Private Project Status"]; + var taskFlag = p[TASK_FLAG]; var registrants = []; for (var i=0; i < mainWidget.softwareCompetition.registrants.length; i++) { registrants.push(mainWidget.softwareCompetition.registrants[i]["handle"]); } var preRegisterUsers = registrants.join(","); - $(".privateProjectRow").show(); - $("#privateProjectEditDiv").show(); - if (privateProject === "1") { - $("#rPrivateProject").text("Yes"); - $("#privateProject").attr("checked", "checked"); + $(".taskFlagRow").show(); + $("#taskFlagEditDiv").show(); + if (taskFlag === "1") { + $("#rTaskFlag").text("Yes"); + $("#taskFlag").attr("checked", "checked"); $(".preRegisterUsersDiv").show(); $("#preRegisterUsersEditDiv").show(); $("#rPreRegisterUsers").text(preRegisterUsers); $("#preRegisterUsers").val(preRegisterUsers); }else{ - $("#rPrivateProject").text("No"); - $("#privateProject").attr("checked", false); + $("#rTaskFlag").text("No"); + $("#taskFlag").attr("checked", false); $(".preRegisterUsersDiv").hide(); $("#preRegisterUsersEditDiv").hide(); } if (mainWidget.softwareCompetition.projectHeader.projectStatus.name == ACTIVE_STATUS) { - $("#privateProject").attr("disabled", "true"); + $("#taskFlag").attr("disabled", "true"); } } else { - $(".privateProjectRow").hide(); - $("#privateProjectEditDiv").hide(); + $(".taskFlagRow").hide(); + $("#taskFlagEditDiv").hide(); $("#preRegisterUsersEditDiv").hide(); } @@ -2388,7 +2388,7 @@ function validateFieldsPrizeSection() { } } - if (isActiveContest && !mainWidget.softwareCompetition.isPrivateProject()) { + if (isActiveContest && !mainWidget.softwareCompetition.isTask()) { var totalCostWithoutAdminFee = retrieveContestCostWithoutAdminFee(); if (totalCostWithoutAdminFee < preCost) { errors.push('The cost of active challenge should not be decreased.'); @@ -3117,8 +3117,8 @@ function handleActivationResultEdit(jsonResult) { canEditMultiRound = false; $('#resubmit').hide(); $(".activateButton").hide(); - if (mainWidget.softwareCompetition.isPrivateProject()) { - $(".privateCmd").show(); + if (mainWidget.softwareCompetition.isTask()) { + $(".taskCmd").show(); } $("#timelineModule .heading .status").removeClass('draft'); $("#timelineModule .heading .status").addClass(result.projectStatus.name.toLowerCase()); @@ -3341,7 +3341,7 @@ function setupReviewerDropdown(challengeTypeId, directProjectId) { } function doCloseContest(winnerId) { - var request = {"projectId": mainWidget.softwareCompetition.projectHeader.id , "winner": parseInt(winnerId)}; + var request = {"projectId": mainWidget.softwareCompetition.projectHeader.id , "winnerId": parseInt(winnerId)}; $.ajax({ type: 'POST', url: ctx+"/contest/close", @@ -3353,7 +3353,7 @@ function doCloseContest(winnerId) { handleJsonResult(jsonResult, function(result) { showConfirmation("Success", "The system will close the challenge shortly.", "OK", function () { - $(".privateCmd").hide(); + $(".taskCmd").hide(); closeModal(); }); }, diff --git a/src/web/scripts/launch/entity.js b/src/web/scripts/launch/entity.js index 7919bd6b1..a8241c1c3 100644 --- a/src/web/scripts/launch/entity.js +++ b/src/web/scripts/launch/entity.js @@ -193,6 +193,7 @@ var STUDIO_IDEA_GENERATION = 22; var DRAFT_STATUS = "Draft"; var ACTIVE_STATUS = "Active"; +var TASK_FLAG = "Task Flag"; var projectCategoryArray = [ {id:SOFTWARE_CATEGORY_ID_CONCEPT, name:'CONCEPTUALIZATION', label:'Software Conceptualization', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, @@ -304,7 +305,7 @@ com.topcoder.direct.SoftwareCompetition = function() { this.registrants = null; - this.isPrivateProject = function(){return this.projectHeader.properties["Private Project Status"] == "1" ? true : false;} + this.isTask = function(){return this.projectHeader.properties[TASK_FLAG] == "1" ? true : false;} } /** diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js index 3405c4ba0..bb192103c 100644 --- a/src/web/scripts/launch/main.js +++ b/src/web/scripts/launch/main.js @@ -527,7 +527,7 @@ $(document).ready(function() { swUploader.submit(); }); - $("input[name=privateProject]").click(function(){ + $("input[name=taskFlag]").click(function(){ if ($(this).attr("checked") === true) { $(".preRegisterUsersRow").show(); $("#preRegisterUsersEditDiv").show(); @@ -972,7 +972,7 @@ function isContestSaved() { } function disablePrizeAdjustment() { - return (phaseOpen && !mainWidget.softwareCompetition.isPrivateProject()) + return (phaseOpen && !mainWidget.softwareCompetition.isTask()) } /** @@ -1003,16 +1003,16 @@ function saveAsDraftRequest() { } if (isF2F() || isDesignF2F()) { - if ($("input[name=privateProject]:checked").length > 0){ - mainWidget.softwareCompetition.projectHeader.properties["Private Project Status"] = "1"; - if (mainWidget.softwareCompetition.projectHeader.properties["Private Project Status"] == + if ($("input[name=taskFlag]:checked").length > 0){ + mainWidget.softwareCompetition.projectHeader.properties[TASK_FLAG] = "1"; + if (mainWidget.softwareCompetition.projectHeader.properties[TASK_FLAG] == $("input[name=preRegisterUsers]").val().trim()){ mainWidget.softwareCompetition.preRegisterUsers = ""; }else{ mainWidget.softwareCompetition.preRegisterUsers = $("input[name=preRegisterUsers]").val(); } }else{ - mainWidget.softwareCompetition.projectHeader.properties["Private Project Status"] = "0"; + mainWidget.softwareCompetition.projectHeader.properties[TASK_FLAG] = "0"; mainWidget.softwareCompetition.preRegisterUsers = ""; } } @@ -1290,7 +1290,7 @@ function handleSaveAsDraftContestResultSoftware(jsonResult) { if(mainWidget.softwareCompetition.projectHeader.id < 0 ) { mainWidget.softwareCompetition.projectHeader.id = result.projectId; modalClose(); - if (mainWidget.softwareCompetition.isPrivateProject()){ + if (mainWidget.softwareCompetition.isTask()){ if (result.failedRegisterUser != null && result.failedRegisterUser.length > 0) { handleFailedRegsiterUsers(result.failedRegisterUser, result.projectId); }else { @@ -1305,7 +1305,7 @@ function handleSaveAsDraftContestResultSoftware(jsonResult) { } } else { modalClose(); - if (mainWidget.softwareCompetition.isPrivateProject()){ + if (mainWidget.softwareCompetition.isTask()){ if (result.failedRegisterUser != null && result.failedRegisterUser.length > 0) { handleFailedRegsiterUsers(result.failedRegisterUser, result.projectId); }else { @@ -1341,7 +1341,7 @@ function handleSaveAsDraftContestResultStudio(jsonResult) { var contestName = mainWidget.softwareCompetition.assetDTO.name; if (mainWidget.softwareCompetition.projectHeader.id < 0) { mainWidget.softwareCompetition.projectHeader.id = result.projectId; - if (mainWidget.softwareCompetition.isPrivateProject()){ + if (mainWidget.softwareCompetition.isTask()){ if (result.failedRegisterUser != null && result.failedRegisterUser.length > 0) { handleFailedRegsiterUsers(result.failedRegisterUser, result.projectId); }else { @@ -1355,7 +1355,7 @@ function handleSaveAsDraftContestResultStudio(jsonResult) { }); } } else { - if (mainWidget.softwareCompetition.isPrivateProject()){ + if (mainWidget.softwareCompetition.isTask()){ if (result.failedRegisterUser != null && result.failedRegisterUser.length > 0) { handleFailedRegsiterUsers(result.failedRegisterUser, result.projectId); }else{ @@ -1390,7 +1390,7 @@ function handleSaveAsDraftContestResultAlgorithm(jsonResult) { var contestName = mainWidget.softwareCompetition.assetDTO.name; if(mainWidget.softwareCompetition.projectHeader.id < 0 ) { mainWidget.softwareCompetition.projectHeader.id = result.projectId; - if (mainWidget.softwareCompetition.isPrivateProject()){ + if (mainWidget.softwareCompetition.iaTask()){ if (result.failedRegisterUser != null && result.failedRegisterUser.length > 0) { handleFailedRegsiterUsers(result.failedRegisterUser, result.projectId); }else{ @@ -1404,7 +1404,7 @@ function handleSaveAsDraftContestResultAlgorithm(jsonResult) { }); } } else { - if (mainWidget.softwareCompetition.isPrivateProject()){ + if (mainWidget.softwareCompetition.isTask()){ if (result.failedRegisterUser != null && result.failedRegisterUser.length > 0) { handleFailedRegsiterUsers(result.failedRegisterUser, result.projectId); }else{ diff --git a/src/web/scripts/launchcontest.js b/src/web/scripts/launchcontest.js index bc9f3fe7e..879beead5 100644 --- a/src/web/scripts/launchcontest.js +++ b/src/web/scripts/launchcontest.js @@ -1053,8 +1053,8 @@ function onContestTypeChange() { } if(typeId == SOFTWARE_CATEGORY_ID_F2F || typeId == STUDIO_CATEGORY_ID_DESIGN_F2F) { - $(".privateProjectRow").show(); - if ($("input[name=privateProject]").attr("checked") === true) { + $(".taskFlagRow").show(); + if ($("input[name=taskFlag]").attr("checked") === true) { $(".preRegisterUsersRow").show(); $("#preRegisterUsersEditDiv").show(); }else{ @@ -1062,7 +1062,7 @@ function onContestTypeChange() { $("#preRegisterUsersEditDiv").hide(); } } else { - $(".privateProjectRow").hide(); + $(".taskFlagRow").hide(); $(".preRegisterUsersRow").hide(); }