Formulář v agendě uživatelů byl rozšířen o tab pro zadání adresy

uživatele. Na sestavy žádosti o služební cestu a vyúčtování služební
cesty byla přidána adresa. 
closes #128
This commit is contained in:
2014-09-10 22:19:40 +02:00
parent 74586f9820
commit 3a8954a909
8 changed files with 218 additions and 82 deletions
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
@@ -43,10 +44,13 @@ public class User extends Member implements UserDetails, DataModel {
private List<Role> authorities;
@Column(name="SETTINGS", length=1048576)
private String settings;
@Embedded
private UsersAddress address;
public User() {
authorities = new ArrayList<Role>();
setParents(new ArrayList<Workgroup>());
address = new UsersAddress();
}
@Override
@@ -207,4 +211,16 @@ public class User extends Member implements UserDetails, DataModel {
this.settings = settings;
}
public UsersAddress getAddress() {
if (address == null) {
address = new UsersAddress();
}
return address;
}
public void setAddress(UsersAddress address) {
this.address = address;
}
}
@@ -0,0 +1,50 @@
package info.bukova.isspst.data;
import javax.persistence.Column;
import javax.persistence.Embeddable;
@Embeddable
public class UsersAddress {
@Column(name = "STREET")
private String street;
@Column(name = "HOUSE_NUMBER")
private String houseNumber;
@Column(name = "ZIP_CODE")
private String zipCode;
@Column(name = "CITY")
private String city;
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public String getHouseNumber() {
return houseNumber;
}
public void setHouseNumber(String houseNumber) {
this.houseNumber = houseNumber;
}
public String getZipCode() {
return zipCode;
}
public void setZipCode(String zipCode) {
this.zipCode = zipCode;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
}