From c7ec66cb3bd509fe5e349b5259f48a99920bc73c Mon Sep 17 00:00:00 2001 From: Deddy Syefria Date: Wed, 20 Jun 2018 08:13:01 +0700 Subject: [PATCH] enable null value for Client effortHours --- .../src/java/main/com/topcoder/clients/model/Client.java | 6 +++--- .../services/view/action/contest/launch/CommonAction.java | 2 +- .../view/action/contest/launch/GetContestAction.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java b/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java index 0d603ec39..5b3b666b5 100644 --- a/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java +++ b/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java @@ -112,7 +112,7 @@ public class Client extends AuditableEntity { *

*/ @Column(name = "enable_effort_hours") - private boolean enableEffortHours; + private Boolean enableEffortHours; /** *

@@ -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; } } diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java index e6f9586e7..0e15af484 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java +++ b/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); diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java index d9c3b814d..4046fbe19 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java +++ b/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);