Turn off DR for all challenges by default, hide the DR information

hohosky · hohosky · commit 58306bb428a7 · 2015-08-25T21:29:02.000+08:00
diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java
@@ -287,6 +287,13 @@ public class SaveDraftContestAction extends ContestAction {
      */
     private static final ProjectStatus PROJECT_STATUS_ACTIVE = new ProjectStatus(1, "ACTIVE");
 
+    /**
+     * <p>
+     * Constant for draft project status.
+     * </p>
+     */
+    private static final ProjectStatus PROJECT_STATUS_DRAFT = new ProjectStatus(2, "DRAFT");
+
     /**
      * <p>
      * Constant for root catalog id property header.
@@ -987,6 +994,15 @@ public boolean evaluate(Object object) {
                 softwareCompetition.getProjectHeader().getProperties().remove(THURGOOD_LAUGUAGE_KEY);
             }
         }
+
+        // turn DR off if it's draft contest
+        if (softwareCompetition.getProjectHeader().getProjectStatus().getId() == PROJECT_STATUS_DRAFT.getId()) {
+            softwareCompetition.getProjectHeader().getProperties().put(
+                    ProjectPropertyType.DIGITAL_RRUN_FLAG_PROJECT_PROPERTY_KEY, "Off");
+            softwareCompetition.getProjectHeader().getProperties().put(
+                    ProjectPropertyType.DR_POINTS_PROJECT_PROPERTY_KEY, "0"
+            );
+        }
     }
 
     /**
@@ -1084,7 +1100,8 @@ protected void initializeCompetition(SoftwareCompetition softwareCompetition) th
         if (projectHeaderTemp.getProjectCategory().getProjectType().getDescription() == null) {
             projectHeaderTemp.getProjectCategory().getProjectType().setDescription("");
         }
-        projectHeaderTemp.setProjectStatus(PROJECT_STATUS_ACTIVE);
+
+        projectHeaderTemp.setProjectStatus(PROJECT_STATUS_DRAFT);
 
         // process project resources
 
diff --git a/src/web/WEB-INF/copilot-contests-details.jsp b/src/web/WEB-INF/copilot-contests-details.jsp
@@ -435,7 +435,7 @@
         <div class="totalCostContainer">
                  <p style="padding-left:10px" class="note">
                   Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
                 </div>
     </div>
     <!-- End .detailsContent -->
@@ -477,7 +477,7 @@
                 <br>
                 <p class="note">
                   Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
                 </div>
             </div>
         </div>
diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp
@@ -501,7 +501,7 @@
                         <td class="first_tab"></td>
                         <td class="sec_tab_prize"><strong>5th Prize&nbsp;&nbsp;&nbsp;&nbsp;:
                         &nbsp;&nbsp;&nbsp;&nbsp;</strong><span id="rPrize5"></span></td>                         
-                        <td class="third_tab_prize"><strong>Studio Cup:</strong> $<span id="rswDigitalRun"></span></td>
+                        <td class="third_tab_prize drHide"><strong>Studio Cup:</strong> $<span id="rswDigitalRun"></span></td>
                       </tr>                                                     
                       <tr>
                         <td class="first_tab"></td>
@@ -529,7 +529,7 @@
                       <span class="name" class="last_info"><strong>Estimated Challenge Total: </strong></span> $<span id="rswTotal"></span>
                       <p class="note">
                         Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
                   </p>
               </div>
              <div class="clear"></div>
@@ -599,8 +599,8 @@
                             <tr>
                                 <td>Spec Review Fee: $<span id="studioSpecReviewFee"></span></td>
                                 <td>Screening Cost: $<span id="studioScreeningCost"></span></td>
-                                <td><input type="checkbox" id="studioCupPointsCheckBox" style="top:0px;"/></td>
-                                <td>Studio Cup: $<span id="studioCupPoints"></span></td>
+                                <td class="drHide"><input type="checkbox" id="studioCupPointsCheckBox" style="top:0px;"/></td>
+                                <td class="drHide">Studio Cup: $<span id="studioCupPoints"></span></td>
                                 <td>Copilot Fee: $<span id="studioCopilotFee"></span></td>
                                 <td>Challenge Fee: $<span id="studioAdminFee"></span></td>
                             </tr>
@@ -611,7 +611,7 @@
                         <strong>Estimated Challenge Total:&nbsp;&nbsp;$  <span id="studioTotal"></span></strong>
                         <p class="note">
                         Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
                     </div>
 
                     <div class="clear"></div>
diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp
@@ -450,7 +450,7 @@
                    </tr>
                    <tr class="rightbor">
                        <td class="first_tab topcoderPrize"  align="left"><strong>2nd Place:</strong> $<span id="rswSecondPlace"></span></td>
-                       <td class="sec_tab_prize topcoderPrize"><strong>Digital Run:</strong> $<span id="rswDigitalRun"></span></td>
+                       <td class="sec_tab_prize topcoderPrize drHide"><strong>Digital Run:</strong> $<span id="rswDigitalRun"></span></td>
                        <td class="sec_tab_prize"><strong>Copilot Fee:</strong> $<span id="rswCopilotFee"></span></td>
                        
                    </tr>
@@ -474,7 +474,7 @@
              <strong>Estimated Challenge Total:</strong> $<span id="rswTotal"></span>
              <p class="note">
                   Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
          </div>
 
          <div class="clear"></div>
@@ -553,9 +553,9 @@
                              <span class="">
                                  <span class="mid_info topcoderPrize">Reliability Bonus:&nbsp;&nbsp;$ <span
                                          id="swReliabilityBonus"></span></span>
-                                 <span class="mid_info topcoderPrize">&nbsp;Digital Run:&nbsp;</span><input type="checkbox" id="DRCheckbox" class="topcoderPrize"/>
-                                 <span class="mid_info topcoderPrize">Digital Points:&nbsp;&nbsp;$</span>
-                                 <input type="text" class="prizesInput topcoderPrize" value="" id="swDigitalRun" readonly="true" size="7"/>
+                                 <span class="mid_info topcoderPrize drHide">&nbsp;Digital Run:&nbsp;</span><input type="checkbox" id="DRCheckbox" class="topcoderPrize drHide"/>
+                                 <span class="mid_info topcoderPrize drHide">Digital Points:&nbsp;&nbsp;$</span>
+                                 <input type="text" class="prizesInput topcoderPrize drHide" value="" id="swDigitalRun" readonly="true" size="7"/>
                              </span>
 
                          <br />
@@ -593,7 +593,7 @@
               <div class="totalCostContainer">
                   <strong>Estimated Challenge Total:&nbsp;&nbsp;$  <span id="swTotal"></span></strong>
                   <p class="note">
-                  Note: Challenge prizes, costs, and fees in this section are estimates.</n> Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                  Note: Challenge prizes, costs, and fees in this section are estimates.</n> Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
               </div>
 
                     <div class="clear"></div>
diff --git a/src/web/WEB-INF/includes/copilot/steps/step6.jsp b/src/web/WEB-INF/includes/copilot/steps/step6.jsp
@@ -205,7 +205,7 @@
                 <div class="totalCostContainer">
                 <p class="note">
                   Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentive paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
                 </div>
             </div>
             <!--End .rowItem-->
diff --git a/src/web/WEB-INF/includes/launch/orderReview.jsp b/src/web/WEB-INF/includes/launch/orderReview.jsp
@@ -98,7 +98,7 @@
 		<tr>
         <p class="note">
         Note: Challenge prizes, costs, and fees in this section are estimates. <br>
-        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
         </tr>
     </table>    
 	
diff --git a/src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp b/src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp
@@ -76,7 +76,7 @@
 		<tr>
         <p class="note">
         Note: Challenge prizes, costs, and fees in this section are estimates. <br>
-        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
         </tr>
     </table>    
 	
diff --git a/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp b/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp
@@ -68,7 +68,7 @@
   		<tbody><tr>
   			<td>First Place Cost : $<span id="sworFirstPlaceCost"></span> <a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
   			<td class="topcoderPrize">Second Place Cost : $<span id="sworSecondPlaceCost"></span> <a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
-  			<td class="topcoderPrize">DR points : $<span id="sworDRPoints"></span> <a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
+  			<td class="topcoderPrize drHide">DR points : $<span id="sworDRPoints"></span> <a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
   			<td class="topcoderPrize">Reliability Bonus Cost : $<span id="sworReliabilityBonusCost"></span> <a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
   			<td class="last">$<span id="sworContestPrizeCost"></span></td>
   		</tr></tbody>  				
@@ -101,7 +101,7 @@
 		<tr>
         <p class="note">
         Note: Challenge prizes, costs, and fees in this section are estimates. <br>
-        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+        Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
         </tr>
     </table>    
   
diff --git a/src/web/WEB-INF/includes/launch/overview.jsp b/src/web/WEB-INF/includes/launch/overview.jsp
@@ -137,12 +137,12 @@
     <!-- end .mPrizes -->
 
     <!-- Studio Cup Points -->
-    <div class="studioCupPoints" id="studioCupPointsDiv">
+    <div class="studioCupPoints drHide" id="studioCupPointsDiv">
 
         <h3><span class="icon">Studio Cup Points:</span><a href="javascript:;" class="helpIcon"><span class="hide">Help</span></a></h3>
 
         <div class="studioCupPointsInner">
-            <input type="checkbox" id="studioCupPointsCheckBox" checked="checked"/> <!-- checked by default -->
+            <input type="checkbox" id="studioCupPointsCheckBox"/> <!-- checked by default -->
             <strong>&nbsp;Studio Cup Points&nbsp;:&nbsp;&nbsp;<span id="rStudioCupPoints"></span></strong>
         </div>
 
diff --git a/src/web/WEB-INF/includes/launch/overviewSoftware.jsp b/src/web/WEB-INF/includes/launch/overviewSoftware.jsp
@@ -251,12 +251,12 @@
 			  <span class="first_info">Review Cost:&nbsp;&nbsp;$ <span id="swReviewCost"></span></span>
               <span class="">
                   <span class="mid_info topcoderPrize">Reliability Bonus:&nbsp;&nbsp;$ <span id="swReliabilityBonus"></span></span>
-                  <span class="mid_info topcoderPrize">&nbsp;Digital Run:&nbsp;</span>
-                  <input type="checkbox" id="DRCheckbox" checked="checked" autocomplete="off" class="topcoderPrize"/>
-                  <span class="mid_info topcoderPrize">
+                  <span class="mid_info topcoderPrize drHide">&nbsp;Digital Run:&nbsp;</span>
+                  <input type="checkbox" id="DRCheckbox" autocomplete="off" class="topcoderPrize drHide"/>
+                  <span class="mid_info topcoderPrize drHide">
                     Digital Points:&nbsp;&nbsp;$
                   </span>
-                  <input type="text" class="prizesInput topcoderPrize" value="" id="swDigitalRun" readonly="true" size="7" style="padding: 0 5px; font-size: 11px;"/>
+                  <input type="text" class="prizesInput topcoderPrize drHide" value="" id="swDigitalRun" readonly="true" size="7" style="padding: 0 5px; font-size: 11px;"/>
                   <br/>
               </span>
               <span class="first_info topcoderPrize">Spec Review Fee:&nbsp;&nbsp;$  <span id="swSpecCost"></span></span>
@@ -265,7 +265,7 @@
 			  <div class="totalCostContainer"><strong>Estimated Challenge Total:&nbsp;&nbsp;$ <span id="swTotal"></span></strong>
               <p class="note">
                   Note: Challenge prizes, costs, and fees in this section are estimates. <br> 
-                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses and digital run incentives paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
+                  Actual costs are based on prizes paid, review fees based on number of submissions, reliability bonuses paid, co-pilot fees, and so on.  Challenge fees are also part of the final costs. </p>
         </div>
 		  </span>
     </div>
diff --git a/src/web/css/direct/screen.css b/src/web/css/direct/screen.css
@@ -1314,6 +1314,10 @@ IMG {
     display: none;
 }
 
+.drHide {
+    display: none;
+}
+
 .fLeft {
     float: left !important;
 }
diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js
@@ -1115,6 +1115,8 @@ function initContest(contestJson) {
     if (contestJson.projectStatus.name != "Draft") {
     	canEditMultiRound = false;
     }
+
+    $(".drHide").hide();
 }
 
 
diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js
@@ -1374,11 +1374,9 @@ function showPage(pageId) {
             $("#overviewPage .maxSubmissions").show();
         }
 
-        if(isDesignF2F() || isIdeaGeneration()) {
-            $("#studioCupPointsDiv").hide().find("input[type=checkbox]").removeAttr('checked');
-        } else {
-            $("#studioCupPointsDiv").show().find("input[type=checkbox]").attr('checked', 'checked');
-        }
+
+        $("#studioCupPointsDiv").hide().find("input[type=checkbox]").removeAttr('checked');
+
 
         delay(studioPrizeChangeHandler(), 1000);
     }
diff --git a/src/web/scripts/launch/pages/orderReview.js b/src/web/scripts/launch/pages/orderReview.js
@@ -166,7 +166,6 @@ function updateOrderReviewSoftware() {
        $('#sworDRPoints').parents("td").show()
    }
     var contestPrizesPart = 0;
-
     if(isCode()) {
         var contestPrizesHTML = "";
         var prizes = mainWidget.softwareCompetition.projectHeader.prizes;
@@ -233,6 +232,9 @@ function updateOrderReviewSoftware() {
         // show the prize settings for TopCoder contests
         $(".topcoderPrize").show();
     }
+
+    $(".drHide").hide();
+
 }
 
 /**
@@ -273,7 +275,7 @@ function updateOrderReviewStudio() {
        html +=
        '<td>'+ place +' : $'+ amount.formatMoney(2) +'<a href="javascript: showPage(\'overviewPage\');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit" /></a></td>';
    });
-   html +=   '<td>' +'Studio Cup points : ' + calculateStudioCupPoints() + '</td>';
+   html +=   '<td class="drHide">' +'Studio Cup points : ' + calculateStudioCupPoints() + '</td>';
    html += '<td class="last">$'+ contestPrizesTotal.formatMoney(2) +'</td>';
    $('#orPrizesTR').html(html);
    
diff --git a/src/web/scripts/launch/pages/selection.js b/src/web/scripts/launch/pages/selection.js
@@ -500,7 +500,7 @@ function continueContestSelection() {
       showPage('overviewPage');
    }
 
-   
+    $(".drHide").hide();
 }
 
 function saveAsDraftContestSelection() {
