Merge branch 'Verze_1.0'

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();
 	
 }

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();
+	}
+
 }

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;

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();
 	}

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

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.x" value="181"/>
-	<property name="ireport.y" value="0"/>
+	<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>

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>

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>

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)"/>