diff --git a/pom.xml b/pom.xml
index 5a13e178..ba907f2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,6 +305,12 @@
xercesImpl
2.8.1
+
+
+ commons-io
+ commons-io
+ 1.4
+
diff --git a/src/main/java/info/bukova/isspst/data/User.java b/src/main/java/info/bukova/isspst/data/User.java
index a8422b52..f1b36fe7 100644
--- a/src/main/java/info/bukova/isspst/data/User.java
+++ b/src/main/java/info/bukova/isspst/data/User.java
@@ -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 authorities;
@Column(name="SETTINGS", length=1048576)
private String settings;
+ @Embedded
+ private UsersAddress address;
public User() {
authorities = new ArrayList();
setParents(new ArrayList());
+ 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;
+ }
+
}
diff --git a/src/main/java/info/bukova/isspst/data/UsersAddress.java b/src/main/java/info/bukova/isspst/data/UsersAddress.java
new file mode 100644
index 00000000..d5aeb44b
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/data/UsersAddress.java
@@ -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;
+ }
+
+}
diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper
index 3777829c..3780bb80 100644
Binary files a/src/main/webapp/WEB-INF/reports/tripBill.jasper and b/src/main/webapp/WEB-INF/reports/tripBill.jasper differ
diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jrxml b/src/main/webapp/WEB-INF/reports/tripBill.jrxml
index 6c2c48b6..142b8b15 100644
--- a/src/main/webapp/WEB-INF/reports/tripBill.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml
@@ -2,7 +2,7 @@
-
+
@@ -41,6 +41,11 @@
+
+
+
+
+
@@ -196,6 +201,15 @@ tuzemské pracovní cesty]]>
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper
index fb065a35..cfd40c1a 100644
Binary files a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper and b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper differ
diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
index 460059d6..5fed777f 100644
--- a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
@@ -49,6 +49,11 @@
+
+
+
+
+
@@ -327,6 +332,13 @@ L - letadlo, P - pěšky, T - taxi]]>
+
+
+
+
+
+
+
diff --git a/src/main/webapp/admin/users/userForm.zul b/src/main/webapp/admin/users/userForm.zul
index d35ad21f..a99856d4 100644
--- a/src/main/webapp/admin/users/userForm.zul
+++ b/src/main/webapp/admin/users/userForm.zul
@@ -11,87 +11,125 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file