From 0c2d08ec133e1a7f80e4b178c11aca8a462c779c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 30 Jun 2011 16:19:45 +0200 Subject: [PATCH 1/4] Avoid duplicating visual effect on arrows A background was being applied via css besides the src property. Now divs are used so the duplication is removed. FEA: ItEr75S08MigrationZK5 --- .../web/js/ganttz/DependencyComponent.js | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/ganttzk/src/main/resources/web/js/ganttz/DependencyComponent.js b/ganttzk/src/main/resources/web/js/ganttz/DependencyComponent.js index cd1d7b42a..583366b0e 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/DependencyComponent.js +++ b/ganttzk/src/main/resources/web/js/ganttz/DependencyComponent.js @@ -118,7 +118,6 @@ ganttz.DependencyComponentBase = zk.$extends(zul.Widget,{ var deparrow = this._findImageElement('arrow'); - deparrow.attr('src', this.$class.getImagesDir() + "arrow3.png"); deparrow.css({top : yend - 5, left : xend - 8}); }, _drawArrowEndStart : function(coordOrig, coordDest){ @@ -155,23 +154,18 @@ ganttz.DependencyComponentBase = zk.$extends(zul.Widget,{ depend.css(dependcss); var deparrow = this._findImageElement('arrow'); - var deparrowsrc, deparrowcss; + var deparrowcss; if ( width == 0 ) { deparrowcss = {top : (yend - 10) , left : (xend - 5)}; - deparrowsrc = this.$class.getImagesDir() + "arrow2.png"; if ( yorig > yend ) { deparrowcss = {top : yend}; - deparrowsrc = this.$class.getImagesDir() + "arrow4.png"; } } else { deparrowcss = {top : (yend -5), left : (xend - 10)}; - deparrowsrc = this.$class.getImagesDir() + "arrow.png"; if (width < 0) { deparrowcss = {top : (yend - 5), left : xend} - deparrowsrc = this.$class.getImagesDir() + "arrow3.png"; } } - deparrow.attr('src', deparrowsrc); deparrow.css(deparrowcss); }, findPos_ : function(element){ @@ -180,22 +174,18 @@ ganttz.DependencyComponentBase = zk.$extends(zul.Widget,{ return {left : (pos2.left - pos1.left), top : (pos2.top - pos1.top)}; }, _findImageElement : function(name) { - var img = jq('.' + name + '', this.$n()); - return img; + return jq('.' + name + '', this.$n()); }, setupArrow_ : function(){ var image_data = [ [ "start", "pixel.gif" ], [ "mid", "pixel.gif" ], [ "end", "pixel.gif" ], [ "arrow", "arrow.png" ] ]; - var img; + var imgDiv; var insertPoint = jq(this.$n()); for ( var i = 0; i < image_data.length; i++) { - img = jq(document.createElement('img')); - img.attr({ - 'class' : image_data[i][0] + " extra_padding", - 'src' : this.$class.getImagesDir() + image_data[i][1] - }); + imgDiv = jq(document.createElement('div')); + imgDiv.attr('class', image_data[i][0] + " extra_padding"); - insertPoint.append(img); + insertPoint.append(imgDiv); } } },{ @@ -342,4 +332,4 @@ ganttz.UnlinkedDependencyComponent = zk.$extends(ganttz.DependencyComponentBase, zk.afterLoad('ganttz',function(){ ganttz.UnlinkedDependencyComponent.molds = ganttz.DependencyComponent.molds; -}) \ No newline at end of file +}) From f39394b955744abfa2e4bc429b51233cf8e57d43 Mon Sep 17 00:00:00 2001 From: Cristina Alvarino Date: Thu, 30 Jun 2011 13:12:08 +0200 Subject: [PATCH 2/4] 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')}"/> + + + +