From f39394b955744abfa2e4bc429b51233cf8e57d43 Mon Sep 17 00:00:00 2001 From: Cristina Alvarino Date: Thu, 30 Jun 2011 13:12:08 +0200 Subject: [PATCH] Incorporate new fields to the user FEA: ItEr75S07UserSettings --- .../business/users/entities/User.java | 20 +++++++++++++++ .../src/main/resources/db.changelog-1.1.xml | 10 ++++++++ .../business/users/entities/Users.hbm.xml | 2 ++ .../web/users/ISettingsModel.java | 9 ++++++- .../web/users/SettingsController.java | 16 ++++++++++++ .../navalplanner/web/users/SettingsModel.java | 25 ++++++++++++++++++- .../src/main/webapp/users/_editUser.zul | 10 ++++++++ .../src/main/webapp/users/settings.zul | 23 +++++++++++++++++ 8 files changed, 113 insertions(+), 2 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java index dc430a35f..5eca45125 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java @@ -62,6 +62,10 @@ public class User extends BaseEntity { private boolean expandResourceLoadViewCharts = true; + private String firstName = ""; + + private String lastName = ""; + /** * Necessary for Hibernate. Please, do not call it. */ @@ -240,4 +244,20 @@ public class User extends BaseEntity { this.expandCompanyPlanningViewCharts = expandCompanyPlanningViewCharts; } + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + } diff --git a/navalplanner-business/src/main/resources/db.changelog-1.1.xml b/navalplanner-business/src/main/resources/db.changelog-1.1.xml index 9d67c1872..7c0b92385 100644 --- a/navalplanner-business/src/main/resources/db.changelog-1.1.xml +++ b/navalplanner-business/src/main/resources/db.changelog-1.1.xml @@ -51,4 +51,14 @@ + + Add new column to store the first and last name for this user + + + + + + + + diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml index 9110c3b97..5701d5437 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml @@ -35,6 +35,8 @@ column="expand_order_planning_view_charts" /> + + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java index 6a6afbb3c..1f3aee65c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java @@ -20,7 +20,6 @@ package org.navalplanner.web.users; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.users.entities.Language; -import org.navalplanner.business.users.entities.User; /** * Model for UI operations related to user settings @@ -51,4 +50,12 @@ public interface ISettingsModel { boolean isExpandCompanyPlanningViewCharts(); + void setLastName(String lastName); + + String getLastName(); + + void setFirstName(String firstName); + + String getFirstName(); + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java index ab749eaed..a6acf5edd 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java @@ -126,4 +126,20 @@ public class SettingsController extends GenericForwardComposer { return settingsModel.isExpandResourceLoadViewCharts(); } + public String getFirstName() { + return settingsModel.getFirstName(); + } + + public void setFirstName(String firstName) { + settingsModel.setFirstName(firstName); + } + + public String getLastName() { + return settingsModel.getLastName(); + } + + public void setLastName(String lastName) { + settingsModel.setLastName(lastName); + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java index 58ec1234e..39f77ace6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java @@ -18,7 +18,6 @@ */ package org.navalplanner.web.users; -import org.apache.commons.lang.Validate; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.users.daos.IUserDAO; @@ -146,4 +145,28 @@ public class SettingsModel implements ISettingsModel { } } + @Override + public String getFirstName() { + return user.getFirstName(); + } + + @Override + public void setFirstName(String firstName) { + if (user != null) { + user.setFirstName(firstName); + } + } + + @Override + public String getLastName() { + return user.getLastName(); + } + + @Override + public void setLastName(String lastName) { + if (user != null) { + user.setLastName(lastName); + } + } + } diff --git a/navalplanner-webapp/src/main/webapp/users/_editUser.zul b/navalplanner-webapp/src/main/webapp/users/_editUser.zul index a218a2f00..6442c6878 100644 --- a/navalplanner-webapp/src/main/webapp/users/_editUser.zul +++ b/navalplanner-webapp/src/main/webapp/users/_editUser.zul @@ -43,6 +43,16 @@ value="@{controller.user.loginName}" width="300px" constraint="no empty:${i18n:_('cannot be null or empty')}"/> + + + +