refactor code about renaming to task

components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java

@@ -41,7 +41,7 @@
  *
  * <p>
  *     Version 1.2.6 (Provide Way To Pre_register members When Launching Challenge)
- *     - Add property {@link #PRIVATE_PROJECT}
+ *     - Add property {@link #TASK_FLAG}
  * </p>
  *
  * @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

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));
     }
 
     /**

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);

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");

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;
 
     /**
      * <p>Execute the action</p>
@@ -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;
     }
 
 

src/web/WEB-INF/contest-details2.jsp

@@ -103,8 +103,8 @@
                     <div class="areaHeader">
                         <h2 class="title contestTitle" style="background:url('/images/<s:if test="marathon">icon-marathon</s:if><s:else><s:property value="viewData.contest.contestType.letter"/></s:else>.png') no-repeat scroll left center transparent">
                         <s:property value="viewData.contestStats.contest.title"/>  <img id="contestLoading" style="display:none" src="/images/dots-white.gif"/>
-                            <a href="javascript:forceCancelContest();" class="button6 preview privateCmd hide"><span class="left"><span class="right">CANCEL</span></span></a>
-                            <a href="javascript:closeContest();" class="button6 preview privateCmd hide"><span class="left"><span class="right">CLOSE</span></span></a>
+                            <a href="javascript:forceCancelContest();" class="button6 preview taskCmd hide"><span class="left"><span class="right">CANCEL</span></span></a>
+                            <a href="javascript:closeContest();" class="button6 preview taskCmd hide"><span class="left"><span class="right">CLOSE</span></span></a>
                             <a href="javascript:activateContestEdit();" class="activateButton" style="float:right;display: none"></a>
                         </h2>
 

src/web/WEB-INF/includes/contest/editTab.jsp

@@ -123,9 +123,9 @@
                 <td class="sec_tab_type"><strong>: <span id="rCopilots"></span></strong></td>
             </tr>
             <tr></tr>
-            <tr class="privateProjectRow hide">
+            <tr class="taskFlagRow hide">
                 <td class="first_tab_type" title="Run this as an assigned task. Registration will not be open to anyone else, but it will still be publically listed."><strong>Task</strong></td>
-                <td class="sec_tab_type"><strong>: <span id="rPrivateProject"></span></strong></td>
+                <td class="sec_tab_type"><strong>: <span id="rTaskFlag"></span></strong></td>
             </tr>
             <tr></tr>
             <tr class="preRegisterUsersDiv hide">
@@ -283,9 +283,9 @@
                       <div class="clearFix"></div>
                  </div>
                  <br /><br />
-                     <div id="privateProjectEditDiv" class="hide">
+                     <div id="taskFlagEditDiv" class="hide">
                          <span class="name fixWidthName" title="Run this as an assigned task. Registration will not be open to anyone else, but it will still be publically listed."><strong>Task</strong></span>
-                         <input type="checkbox"  name="privateProject" id="privateProject"/>
+                         <input type="checkbox"  name="taskFlag" id="taskFlag"/>
                      </div>
                      <br />
                      <div id="preRegisterUsersEditDiv" class="hide">

src/web/WEB-INF/includes/contest/editTabMarathon.jsp

@@ -221,17 +221,6 @@
                     </select>
                 </div>
             </div>
-
-             <br /><br />
-            <div id="privateProjectEditDiv">
-                <span class="name fixWidthName"><strong>Task</strong></span>
-                <input type="checkbox"  name="privateProject" id="privateProject"/>
-            </div>
-            <br />
-            <div id="preRegisterUsersEditDiv">
-                <span class="name fixWidthName"><strong>Assign Member(s):</strong></span>
-                <span class="value"><input type="text"  name="preRegisterUsers" class="bigin" id="preRegisterUsers"/></span>
-            </div>
             <br /><br />
 
                 <span class="name fixWidthName"><strong>Created By</strong></span>

src/web/WEB-INF/includes/contest/editTabSoftware.jsp

@@ -145,9 +145,9 @@
             </tr>
             <tr></tr>
 
-            <tr class="privateProjectRow hide">
+            <tr class="taskFlagRow hide">
                 <td class="first_tab_type" title="Run this as an assigned task. Registration will not be open to anyone else, but it will still be publically listed."><strong>Task</strong></td>
-                <td class="sec_tab_type"><strong>: <span id="rPrivateProject"></span></strong></td>
+                <td class="sec_tab_type"><strong>: <span id="rTaskFlag"></span></strong></td>
             </tr>
             <tr></tr>
             <tr class="preRegisterUsersDiv hide">
@@ -312,9 +312,9 @@
               <div class="clearFix"></div>
           </div>
             <br />
-          <div id="privateProjectEditDiv" class="hide">
+          <div id="taskFlagEditDiv" class="hide">
               <span class="name fixWidthName" title="Run this as an assigned task. Registration will not be open to anyone else, but it will still be publically listed."><strong>Task</strong></span>
-                <input type="checkbox"  name="privateProject" id="privateProject"/>
+                <input type="checkbox"  name="taskFlag" id="taskFlag"/>
           </div>
           <br />
           <div id="preRegisterUsersEditDiv" class="hide">

src/web/WEB-INF/includes/launch/contestSelection.jsp

@@ -185,9 +185,9 @@
           </div>
       </div>
 
-      <div class="row privateProjectRow hide">
+      <div class="row taskFlagRow hide">
           <label>Task</label>
-          <input type="checkbox" name="privateProject" title="Is this challenge private?">
+          <input type="checkbox" name="taskFlag" title="Is this challenge private?">
       </div>
 
       <div class="row preRegisterUsersRow hide">

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;
 }
 

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();
                     });
                 },

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;}
 } 
 
 /**