From f4fe974931b5c4658b6d06df4d18045d856c4a34 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Thu, 15 Jan 2015 15:09:11 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Do=20UserServis=20byla=20p=C5=99id=C3=A1na?=
 =?UTF-8?q?=20metoda=20getUsersForCombo,=20kter=C3=A1=20vr=C3=A1t=C3=AD=20?=
 =?UTF-8?q?seznam=20u=C5=BEivatel=C5=AF=20podle=20abecedy.=20Vol=C3=A1=20s?=
 =?UTF-8?q?e=20pro=20pln=C4=9Bn=C3=AD=20combobox=C5=AF=20u=20filtr=C5=AF?=
 =?UTF-8?q?=20a=20na=20formul=C3=A1=C5=99i=20pro=20zad=C3=A1n=C3=AD=20?=
 =?UTF-8?q?=C5=BE=C3=A1dosti=20o=20slu=C5=BEebn=C3=AD=20cestu-=20combo=20s?=
 =?UTF-8?q?polucestuj=C3=ADc=C3=AD.=20closes=20#191?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/bukova/isspst/services/users/UserService.java    | 1 +
 .../bukova/isspst/services/users/UserServiceImpl.java     | 8 ++++++++
 .../bukova/isspst/ui/requirement/RequirementSubpage.java  | 2 +-
 .../bukova/isspst/ui/requirement/TripRequirementForm.java | 2 +-
 src/main/webapp/WEB-INF/locales/zk-label.properties       | 1 +
 .../webapp/main/trips/requirements/requirementsForm.zul   | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

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<User> {
 	public void setUserSettings(UserSettingsData settings);
 	public void setAuthMethod(AuthMethod method);
 	public AuthMethod getAuthMethod();
+	public List<User> 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<User> implements UserServic
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	@Transactional
+	public List<User> 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<T extends RequirementBase> extends ListViewModel
 
 	public List<User> 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<TripRequirement> {
 	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 7caf1dca..f4ccef91 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -312,6 +312,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/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 @@
 							<comboitem label="@load(each)"/>
 						</template>
 					</combobox>
-					<button label="${labels.AddItem}" 
+					<button label="${labels.Confirm}"
 						onClick="@command('addPassanger')"
 						sclass="nicebutton"
 						disabled="@load(vm.selUser eq null)"/>

From 2a6ce7e4d388a0855ccbd5c8dd3240c696e33979 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Thu, 15 Jan 2015 15:36:23 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Upraveno=20form=C3=A1tovan=C3=AD=20=C4=8Das?=
 =?UTF-8?q?u=20na=20sestav=C4=9B=20ces=C5=A5=C3=A1ku.=20Drobn=C3=A9=20?=
 =?UTF-8?q?=C3=BApravy=20form=C3=A1tov=C3=A1n=C3=AD=20sestavy=20=C5=BE?=
 =?UTF-8?q?=C3=A1dosti=20a=20ces=C5=A5=C3=A1ku.=20closes=20#180=20closes?=
 =?UTF-8?q?=20#188?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/reports/tripBill.jasper    | Bin 43796 -> 43838 bytes
 .../webapp/WEB-INF/reports/tripBill.jrxml     |  14 +++++++-------
 .../WEB-INF/reports/tripRequirement.jasper    | Bin 56020 -> 56062 bytes
 .../WEB-INF/reports/tripRequirement.jrxml     |   2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper
index 3780bb8097df68b82d06404b65619497ba489e2c..9d6778f855143d54d67e3d89673c87fdab7c1b6d 100644
GIT binary patch
delta 9686
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
bJmMNZorJv{=)JacLdulMs)pp&>FoakI-{pM

delta 9247
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

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripBill" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f59e8277-a431-4cdc-abaa-c82c1cf193af">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="214"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.x" value="181"/>
+	<property name="ireport.y" value="439"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["/home/pepa/Dokumenty/dev/java/isspst/"]]></defaultValueExpression>
 	</parameter>
@@ -106,7 +106,7 @@
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{requirement.endDate}]]></textFieldExpression>
 			</textField>
-			<textField pattern="hh:mm">
+			<textField pattern="HH:mm">
 				<reportElement uuid="0db3d6e2-36e3-4c66-b4a1-2cdc555b2831" x="90" y="163" width="53" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{requirement.tripDate}]]></textFieldExpression>
@@ -360,12 +360,12 @@ tuzemské pracovní cesty]]></text>
 3) Počet km uvádějte jen při použití vlastního dopravního prostředku.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ff356c6e-d796-4148-b20f-114dde6e9340" x="305" y="147" width="266" height="15"/>
+				<reportElement uuid="ff356c6e-d796-4148-b20f-114dde6e9340" x="334" y="147" width="237" height="15"/>
 				<textElement textAlignment="Center"/>
 				<text><![CDATA[Datum a podpis účtovatele ]]></text>
 			</staticText>
 			<line>
-				<reportElement uuid="db423f1f-b9c6-49ec-8336-fa06680c9dad" x="306" y="145" width="265" height="1"/>
+				<reportElement uuid="db423f1f-b9c6-49ec-8336-fa06680c9dad" x="334" y="145" width="237" height="1"/>
 			</line>
 			<line>
 				<reportElement uuid="452bba4b-d293-4253-92c3-5fa58f58ea53" x="-1" y="168" width="572" height="1"/>
@@ -376,13 +376,13 @@ tuzemské pracovní cesty]]></text>
 				<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
 			</textField>
 			<image>
-				<reportElement uuid="0a136d64-9565-4ed7-9baa-3b68aa98eada" x="406" y="120" width="147" height="24">
+				<reportElement uuid="0a136d64-9565-4ed7-9baa-3b68aa98eada" x="450" y="107" width="113" height="36">
 					<printWhenExpression><![CDATA[$P{P_USER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
 				<imageExpression><![CDATA[$P{P_USER_SIGNATURE}]]></imageExpression>
 			</image>
 			<textField pattern="dd. MM. yyyy">
-				<reportElement uuid="bf1013d3-8037-4f6f-9c23-6e1d801afbeb" x="306" y="132" width="100" height="13"/>
+				<reportElement uuid="bf1013d3-8037-4f6f-9c23-6e1d801afbeb" x="345" y="132" width="100" height="13"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper
index cfd40c1afadcc36201224674960f1b2b630374e3..79f8b7abf291e6596a01fa59ae596378909612e0 100644
GIT binary patch
delta 1249
zcmcbzmHFRR<_(M-j0~HZIMk#V%_b*=YHtovnrFz!IN9D;d^1<bZh1!6$p_5DCf~2%
z-2AjSh<oy{CdtW8^{QaHs9p(3i)@}%&%z?EUc$g^Xk<~yP{*PQV(OWKm};B1HeY07
zd_8%-mfGgEZS|}waUfwZ5nE6UWHWj&FdPmk00Ou~+~k0sD#nz_r+b{)Aj&5noFHrj
zVL~+dVrl{#=8P;JJ2|pfhB0=sV87Jl3B9a5(I80%kUEy6$qRdJ!ty~(Fp-PJEf86V
zgcC?BL?;6f{0Cx?lfjZKY4$)a+^BqzV=a(1qc|2Kf$7*>ka2ZIlP~hgO*Y_QoxHHm
zhA|hr(>eQX!s<cxfr(lyPKU^n;&g}(kkg??Lo}l}9ij%)>9ruIgWOYD!oX3In3R(m
z@9Y85?+=rz#qJgT2{vIpAgy4c3yW7EvZQzgq66d=Yh=wRUV%tpdZi2I-pa}R6Qvlt
zfUcIFTpz$X*=wR8Bh%y$iDHxYP2!wfJ&~Jn`s9h`Qj-@>^tYW2@&K5aiNymDStJj@
ztbj;>lQyy%6n8=;fLg$Ag$L)%$rFr~Cr_PZ3w6fZN#3^0K+XUYORzWtB8$Zt5DBm|
zkkz0#11f>xj3ppvY`!~LiBU?!-T{~k7#IY~IY1<cSpjl0i^gQhsbNA!hQ`K5#uf(V
zrY7-5rj`a~rkfk52J<s+n|yVN9(LI@rp?vMUHE`X4s2D%qGWR8)CHTTZu@~%ZvHJ(
E05R&0PXGV_

delta 1299
zcmeyjmHEn6<_(M-j9i<UIMk#VJtrrGYHtovnrFz!HQC-*d^1<bZh1!c$p_5DCf~2%
z-2AjSh?}*Lp^o|9WUqQ{D66Ah1H#&TxSo|oT&0A8+0e)WsES1i#MCndF_kypZ@$RH
z_+s<Mwxz7x(I6o(5j8onN0<%5pIp^b#h5txYmajVM4+G;sE*N_f#GmS0T947MMETf
zF(tqnoRP(&KspOb7+6aZlX6la8vQ{+Ak%=hPmr425WvFA5&_c00MgGAKlya84R;QR
z2_~{YZmfs!AqF^s6hqW90KtDC1{n#KWJ$IMa^aeDAUaSyfov3tCm<4-p2#XFU@0i5
zE1G<fPj0dS2kYe1eKw3hXF(h<g5r3vgZ4k1oG`(Zy9VS8Fi{2e1B6eCACPsR_yJi0
z#Sah(Og~f=6evMLy{v?R0~{Oi&K?lAz#|0cOso+SIl+dz6XY2%(GK<uginfRkaeJV
z23Z2dGY|<(&$MIlOo$7bXMoO}AU!#Mq8KnUeMl6WJZGW^<CMu8CuVZb0C@#WOapl(
z1;R)23Metb)y#lMptu-W2a1cK641oR2oKq5lP4G}Pu@St7U+bD=2DZzCwp@*23Y|n
z7J{7t;bU<IvIL4VkR?!@0hPdT#zK%YHnUGrVw6&~cL1eT2A*;bASnQ1R)F)A>SX7s
zVM2xm#^#n51{TI<M)8&=hDK(_o9&mTF>Mx{@s@{i^W^_a^sp;gB><FtwN)9Lto*ha
UDx#PMmoOMjHe{EX{Nk1v06HI*A^-pY

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]]></text>
 				<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
 			</textField>
 			<image>
-				<reportElement uuid="954e517f-5d23-4166-b776-7c31b4409ddd" x="378" y="71" width="183" height="50">
+				<reportElement uuid="954e517f-5d23-4166-b776-7c31b4409ddd" x="378" y="69" width="183" height="50">
 					<printWhenExpression><![CDATA[$P{P_USER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
 				<imageExpression><![CDATA[$P{P_USER_SIGNATURE}]]></imageExpression>

From ce17f5b6263cb4c6685c673a657008451e4913d1 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Thu, 15 Jan 2015 15:44:44 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Na=20toolbar=20v=20z=C3=A1lo=C5=BEk=C3=A1ch?=
 =?UTF-8?q?=20M=C3=A1=20st=C5=99ediska,=20M=C3=A9=20komise=20a=20V=C5=A1e?=
 =?UTF-8?q?=20bylo=20p=C5=99id=C3=A1no=20tla=C4=8D=C3=ADtko=20pro=20smaz?=
 =?UTF-8?q?=C3=A1n=C3=AD=20z=C3=A1znamu.=20refs=20#183?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/main/toolbar.zul | 1 +
 1 file changed, 1 insertion(+)

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 @@
 <zk>
 <toolbar>
 	<toolbarbutton image="/img/edit.png" tooltiptext="${labels.ToolbarRecEdit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
+	<toolbarbutton image="/img/delete.png" tooltiptext="${labels.ToolbarRecDelete}" id="btnDelete" onClick="@command('delete')" disabled="@load(not vm.ableToDelete)" />
 	<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.ToolbarRecFilter}" id="btnFilter" onClick="@command('filter')" />
 	<toolbarbutton image="/img/print.png" tooltiptext="${labels.ToolbarPrint}" id="btnPrint" onClick="@command('onPrint')" />
 </toolbar>