From bf6f9bd3ebcf845f1563c8595fe05c4112ac25ab Mon Sep 17 00:00:00 2001 From: Deddy Syefria Date: Thu, 28 Jun 2018 22:34:25 +0700 Subject: [PATCH] - Change column name enable_effort_hours to enable_effort_days of table client - Change Effort Estimate label and tooltip --- .../com/topcoder/clients/dao/ejb3/ProjectDAOBean.java | 4 ++-- .../java/main/com/topcoder/clients/model/Client.java | 4 ++-- src/web/WEB-INF/contest-details2.jsp | 2 +- src/web/WEB-INF/includes/contest/editTab.jsp | 4 ++-- src/web/WEB-INF/includes/contest/editTabMarathon.jsp | 4 ++-- src/web/WEB-INF/includes/contest/editTabSoftware.jsp | 4 ++-- src/web/WEB-INF/includes/launch/contestSelection.jsp | 2 +- src/web/WEB-INF/launch-contest.jsp | 2 +- src/web/css/direct/launchcontest.css | 10 +++++++++- 9 files changed, 22 insertions(+), 14 deletions(-) diff --git a/services/client_project_entities_dao/src/java/main/com/topcoder/clients/dao/ejb3/ProjectDAOBean.java b/services/client_project_entities_dao/src/java/main/com/topcoder/clients/dao/ejb3/ProjectDAOBean.java index 66798ea4f..250c6fdd8 100644 --- a/services/client_project_entities_dao/src/java/main/com/topcoder/clients/dao/ejb3/ProjectDAOBean.java +++ b/services/client_project_entities_dao/src/java/main/com/topcoder/clients/dao/ejb3/ProjectDAOBean.java @@ -124,7 +124,7 @@ public class ProjectDAOBean extends GenericEJB3DAO 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 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) " 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 dd885bf5e..f6f1a3f51 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 @@ -104,14 +104,14 @@ public class Client extends AuditableEntity { *

* Through corresponding getter/setter methods. It is retrieved from * Client.enableEffortDays [Client.isEffortDaysEnabled()] and in table - * client.enable_effort_hours. + * client.enable_effort_days. *

*

* There are no restrictions at this moment. It can take any value. * OPTIONAL. *

*/ - @Column(name = "enable_effort_hours") + @Column(name = "enable_effort_days") private Boolean enableEffortDays; /** diff --git a/src/web/WEB-INF/contest-details2.jsp b/src/web/WEB-INF/contest-details2.jsp index d18fc76ef..d0566f3d8 100644 --- a/src/web/WEB-INF/contest-details2.jsp +++ b/src/web/WEB-INF/contest-details2.jsp @@ -187,7 +187,7 @@
-

Effort Days Estimate

+

onsite efforts in person days * 6 + offshore efforts in person days

diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index 24157e6f0..3dd6ee35d 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -163,7 +163,7 @@ - Effort Days Estimate + Estimated Effort
(in Person Days): : @@ -342,7 +342,7 @@

- Estimated Effort: help + Estimated Effort
(in Person Days): help


diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp index 55886994e..37c8649f2 100644 --- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp +++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp @@ -135,7 +135,7 @@ - Effort Hours Estimate + Estimated Effort
(in Person Days): : @@ -295,7 +295,7 @@

- Estimated Effort: help + Estimated Effort
(in Person Days): help


diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp index db31521e1..520abfd25 100644 --- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp +++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp @@ -185,7 +185,7 @@ - Effort Days Estimate + Estimated Effort
(in Person Days): : @@ -369,7 +369,7 @@
- Estimated Effort: help + Estimated Effort
(in Person Days): help

diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp index b7d19f738..8d81a028f 100644 --- a/src/web/WEB-INF/includes/launch/contestSelection.jsp +++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp @@ -237,7 +237,7 @@
- +
diff --git a/src/web/WEB-INF/launch-contest.jsp b/src/web/WEB-INF/launch-contest.jsp index c31d10718..05e6551f2 100644 --- a/src/web/WEB-INF/launch-contest.jsp +++ b/src/web/WEB-INF/launch-contest.jsp @@ -167,7 +167,7 @@
-

Effort Days Estimate

+

onsite efforts in person days * 6 + offshore efforts in person days

diff --git a/src/web/css/direct/launchcontest.css b/src/web/css/direct/launchcontest.css index d424b2908..90ee4fd92 100644 --- a/src/web/css/direct/launchcontest.css +++ b/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; +} \ No newline at end of file