Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml =================================================================== diff -u -rcadb456a32c5e95823f3472fd99a0b17c52b9218 -r6b897d09ff384d8842aee28ded8ebe6a1f5857d8 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision cadb456a32c5e95823f3472fd99a0b17c52b9218) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 6b897d09ff384d8842aee28ded8ebe6a1f5857d8) @@ -168,6 +168,18 @@ + + @hibernate.property + column="postcode" + length="10" + + + + + + + @hibernate.property + column="portrait_uuid" + length="20" + + Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -r15d26cca23510dedf544fea15caea580230dd7ee -r6b897d09ff384d8842aee28ded8ebe6a1f5857d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 15d26cca23510dedf544fea15caea580230dd7ee) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 6b897d09ff384d8842aee28ded8ebe6a1f5857d8) @@ -81,6 +81,9 @@ private String state; /** nullable persistent field */ + private String postcode; + + /** nullable persistent field */ private String country; /** nullable persistent field */ @@ -140,8 +143,11 @@ /** persistent field */ private Set lessons; + /** persistent field */ + private Long portraitUuid; + /** full constructor */ - public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons) { + public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String postcode, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons, Long portraitUuid) { this.login = login; this.password = password; this.title = title; @@ -152,6 +158,7 @@ this.addressLine3 = addressLine3; this.city = city; this.state = state; + this.postcode = postcode; this.country = country; this.dayPhone = dayPhone; this.eveningPhone = eveningPhone; @@ -171,6 +178,7 @@ this.userGroups = userGroups; this.learningDesigns = learningDesigns; this.lessons = lessons; + this.portraitUuid = portraitUuid; } /** default constructor */ @@ -354,7 +362,21 @@ public void setState(String state) { this.state = state; } + + /** + * @hibernate.property + * column="postcode" + * length="10" + * + */ + public String getPostcode() { + return this.postcode; + } + public void setPostcode(String postcode) { + this.postcode = postcode; + } + /** * @hibernate.property * column="country" @@ -784,4 +806,18 @@ public void setLocale(SupportedLocale locale) { this.locale = locale; } + + /** + * @hibernate.property + * column="portrait_uuid" + * length="20" + * + */ + public Long getPortraitUuid() { + return this.portraitUuid; + } + + public void setPortraitUuid(Long portraitUuid) { + this.portraitUuid = portraitUuid; + } }