Merge pull request #437 from deedee/effort-days

Change column name enable_effort_hours and Effort Estimate label

Author: skyhit

services/client_project_entities_dao/src/java/main/com/topcoder/clients/dao/ejb3/ProjectDAOBean.java

@@ -124,7 +124,7 @@ public class ProjectDAOBean extends GenericEJB3DAO<Project, Long> implements
     private static final String SELECT_PROJECT = "select p.project_id, p.name, p.po_box_number, p.description, "
               + " p.active, p.sales_tax, p.payment_terms_id, p.modification_user, p.modification_date, "
               + " p.creation_date, p.creation_user, p.is_deleted, "
-              + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_hours "
+              + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_days "
               + " from project as p left join client_project as cp on p.project_id = cp.project_id left join client c "
               + "            on c.client_id = cp.client_id and (c.is_deleted = 0 or c.is_deleted is null) "
               + " where p.active = 1 and p.start_date <= current and current <= p.end_date ";
@@ -135,7 +135,7 @@ public class ProjectDAOBean extends GenericEJB3DAO<Project, Long> implements
     private static final String SELECT_PROJECT_BY_CLIENT_ID = "select p.project_id, p.name, p.po_box_number, p.description, "
         + " p.active, p.sales_tax, p.payment_terms_id, p.modification_user, p.modification_date, "
         + " p.creation_date, p.creation_user, p.is_deleted, "
-        + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_hours "
+        + " cp.client_id, c.name as client_name, p.is_manual_prize_setting, c.code_name, c.enable_effort_days "
         + " from project as p, client_project as cp, client as c "
         + " where p.start_date <= current and current <= p.end_date "
         + " and c.client_id = cp.client_id and (p.is_deleted = 0 or p.is_deleted is null) "

services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java

@@ -104,14 +104,14 @@ public class Client extends AuditableEntity {
      * <p>
      * Through corresponding getter/setter methods. It is retrieved from
      * Client.enableEffortDays [Client.isEffortDaysEnabled()] and in table
-     * client.enable_effort_hours.
+     * client.enable_effort_days.
      * </p>
      * <p>
      * There are no restrictions at this moment. It can take any value.
      * OPTIONAL.
      * </p>
      */
-    @Column(name = "enable_effort_hours")
+    @Column(name = "enable_effort_days")
     private Boolean enableEffortDays;
 
     /**

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

@@ -187,7 +187,7 @@
                 </div><!-- End .tooltipCaption -->
 
                 <div class="tooltipContent">
-                    <p>Effort Days Estimate</p>
+                    <p>onsite efforts in person days * 6 + offshore efforts in person days</p>
                 </div><!-- End .tooltipContent -->
 
             </div></div>

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

@@ -163,7 +163,7 @@
             </tr>
             <tr></tr>
             <tr class="effortEstimateRow hide">
-                <td class="first_tab_type"><strong>Effort Days Estimate</strong></td>
+                <td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
                 <td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
             </tr>
             <tr></tr>
@@ -342,7 +342,7 @@
                      </div>
                      <br/><br/>
                       <div class="effortEstimateRow">
-                        <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort:&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
+                        <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
                         <input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
                       </div>
                      <br/><br/>

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

@@ -135,7 +135,7 @@
             </tr>
             <tr></tr>
             <tr class="effortEstimateRow hide">
-                <td class="first_tab_type"><strong>Effort Hours Estimate</strong></td>
+                <td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
                 <td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
             </tr>
             <tr></tr>
@@ -295,7 +295,7 @@
             </div>
             <br /><br />
             <div class="effortEstimateRow">
-             <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort:&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
+             <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
              <input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
             </div>
             <br/><br/>

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

@@ -185,7 +185,7 @@
             </tr>
             <tr></tr>
             <tr class="effortEstimateRow hide">
-                <td class="first_tab_type"><strong>Effort Days Estimate</strong></td>
+                <td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
                 <td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
             </tr>
             <tr></tr>
@@ -369,7 +369,7 @@
           <br/>
 
           <div class="effortEstimateRow">
-            <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort:&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
+            <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
             <input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
             <br/>
             <br/>

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

@@ -237,7 +237,7 @@
           </div>
       </div>
       <div class="ms-row effortEstimateRow">
-          <label>Estimated Effort:&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
+          <label>Estimated Effort<br/>(in Person Days):&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
           <input id="effortDaysEstimate" class="text" name="effortDaysEstimate" type="text"/>
       </div>
   </div>

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

@@ -167,7 +167,7 @@
                 </div><!-- End .tooltipCaption -->
 
                 <div class="tooltipContent">
-                    <p>Effort Days Estimate</strong></p>
+                    <p>onsite efforts in person days * 6 + offshore efforts in person days</p>
                 </div><!-- End .tooltipContent -->
 
             </div></div>

src/web/css/direct/launchcontest.css

@@ -309,7 +309,7 @@
     margin-left: 14px;
     font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
     font-size: 14px;
-    line-height: 28px;
+    line-height: 24px;
 }
 
 #launchContestOut.launchCopilotContest .addNewContest label {
@@ -3256,6 +3256,10 @@ div.ms-group-display .ms-group-div{
     margin-top: 17px;
 }
 
+.effortEstimateRow {
+    height: 50px;
+}
+
 .dropdown-menu {
     position: absolute;
     top: 100%;
@@ -3287,3 +3291,7 @@ div.ms-group-display .ms-group-div{
     width: 401px;
     height: 25px;
 }
+
+span.name.fixWidthName {
+    line-height: 24px;
+}