Merge pull request #430 from deedee/dev

enable null value for Client effortHours

Author: skyhit

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

@@ -112,7 +112,7 @@ public class Client extends AuditableEntity {
      * </p>
      */
     @Column(name = "enable_effort_hours")
-    private boolean enableEffortHours;
+    private Boolean enableEffortHours;
 
     /**
      * <p>
@@ -381,7 +381,7 @@ public void setStartDate(Date startDate) {
      *
      * @return whether this client enabled effort hours.
      */
-    public boolean isEffortHoursEnabled() {
+    public Boolean isEffortHoursEnabled() {
         return this.enableEffortHours;
     }
 
@@ -391,7 +391,7 @@ public boolean isEffortHoursEnabled() {
      * @param enableEffortHours
      *            whether this client enabled effort hours.
      */
-    public void setEnableEffortHours(boolean enableEffortHours) {
+    public void setEnableEffortHours(Boolean enableEffortHours) {
         this.enableEffortHours = enableEffortHours;
     }
 }

src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java

@@ -399,7 +399,7 @@ public String getBillingAccountsForProject() {
                 billingAccount.put("cca", String.valueOf(requireCCAs[i]));
                 // Add enableEffortHours for each billing account
                 Client client = billingAccountsByProject.get(i).getClient();
-                if (client != null) {
+                if (client != null && client.isEffortHoursEnabled() != null) {
                     billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
                 } else {
                     billingAccount.put("enableEffortHours", false);

src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java

@@ -571,7 +571,7 @@ protected void executeAction() throws Exception {
             billingAccount.put("cca", String.valueOf(requireCCAs[i]));
             // Add enableEffortHours for each billing account
             Client client = billingProjects.get(i).getClient();
-            if (client != null) {
+            if (client != null && client.isEffortHoursEnabled() != null) {
                 billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
             } else {
                 billingAccount.put("enableEffortHours", false);