diff --git a/src/main/java/info/bukova/isspst/services/users/UserService.java b/src/main/java/info/bukova/isspst/services/users/UserService.java index d5f729ce..d574c9db 100644 --- a/src/main/java/info/bukova/isspst/services/users/UserService.java +++ b/src/main/java/info/bukova/isspst/services/users/UserService.java @@ -27,5 +27,6 @@ public interface UserService extends UserDetailsService, Service { public void setUserSettings(UserSettingsData settings); public void setAuthMethod(AuthMethod method); public AuthMethod getAuthMethod(); + public List getUsersForCombo(); } diff --git a/src/main/java/info/bukova/isspst/services/users/UserServiceImpl.java b/src/main/java/info/bukova/isspst/services/users/UserServiceImpl.java index 514b1978..25faf30b 100644 --- a/src/main/java/info/bukova/isspst/services/users/UserServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/users/UserServiceImpl.java @@ -230,4 +230,12 @@ public class UserServiceImpl extends AbstractService implements UserServic } } + @SuppressWarnings("unchecked") + @Override + @Transactional + public List getUsersForCombo() { + Query q = dao.getQuery("from User u order by u.lastName"); + return q.list(); + } + } diff --git a/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java b/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java index 780b41d8..42f59983 100644 --- a/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java +++ b/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java @@ -25,7 +25,7 @@ public class RequirementSubpage extends ListViewModel public List getAllUsers() { - return userService.getAll(); + return userService.getUsersForCombo(); } private BigDecimalConverter bigDecimalConverter; diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java index ecaae786..a39ec9fe 100644 --- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java +++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java @@ -42,7 +42,7 @@ public class TripRequirementForm extends FormViewModel { public void init() { tripRequirementService.loadType(getDataBean()); centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent())); - users = userService.getAll(); + users = userService.getUsersForCombo(); passengers = getDataBean().getPassengers(); validator = new TripRequirementFormValidator(); } diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index 71b1ffb4..3702bcbb 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -315,6 +315,7 @@ DateTimeFormat=dd. MM. yyyy, HH:MM:ss AddItem=Přidat položku SelectGroup=Vybrat skupinu... RemoveItem=Smazat +Confirm=Potvrdit StudentProject = Studentský projekt StudentProjectAbr = St. projekt diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper index 3780bb80..9d6778f8 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 142b8b15..17eaf900 100644 --- a/src/main/webapp/WEB-INF/reports/tripBill.jrxml +++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml @@ -1,8 +1,8 @@ - - + + @@ -106,7 +106,7 @@ - + @@ -360,12 +360,12 @@ tuzemské pracovní cesty]]> 3) Počet km uvádějte jen při použití vlastního dopravního prostředku.]]> - + - + @@ -376,13 +376,13 @@ tuzemské pracovní cesty]]> - + - + diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper index cfd40c1a..79f8b7ab 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 5fed777f..ea605366 100644 --- a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml +++ b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml @@ -316,7 +316,7 @@ L - letadlo, P - pěšky, T - taxi]]> - + diff --git a/src/main/webapp/main/toolbar.zul b/src/main/webapp/main/toolbar.zul index f80975e2..97d2a968 100644 --- a/src/main/webapp/main/toolbar.zul +++ b/src/main/webapp/main/toolbar.zul @@ -2,6 +2,7 @@ + diff --git a/src/main/webapp/main/trips/requirements/requirementsForm.zul b/src/main/webapp/main/trips/requirements/requirementsForm.zul index 8e916917..4402d87f 100644 --- a/src/main/webapp/main/trips/requirements/requirementsForm.zul +++ b/src/main/webapp/main/trips/requirements/requirementsForm.zul @@ -129,7 +129,7 @@ -