From ef431867e10d7fc91a6ffb2bf997264e03040eef Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Wed, 8 Apr 2015 11:35:41 +0200
Subject: [PATCH] =?UTF-8?q?V=20glob=C3=A1ln=C3=ADm=20nastaven=C3=AD=20umo?=
 =?UTF-8?q?=C5=BEn=C4=9Bn=20upload=20loga=20=C5=A1koly.=20Upraveny=20tisko?=
 =?UTF-8?q?v=C3=BDch=20sestav=20vlo=C5=BEeno=20logo=20a=20n=C3=A1zev=20org?=
 =?UTF-8?q?anizace.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #199
---
 .../info/bukova/isspst/data/SettingsData.java |  10 ++
 .../bukova/isspst/reporting/ParamFiller.java  |  18 +++-
 .../isspst/ui/settings/GlobalSettingsVM.java  |  34 ++++++-
 .../WEB-INF/locales/zk-label.properties       |   2 +
 .../webapp/WEB-INF/reports/tripBill.jasper    | Bin 50282 -> 51569 bytes
 .../webapp/WEB-INF/reports/tripBill.jrxml     |  93 ++++++++++--------
 .../WEB-INF/reports/tripBillFreeMeals.jasper  | Bin 18022 -> 18022 bytes
 .../WEB-INF/reports/tripBillItems.jasper      | Bin 47113 -> 47113 bytes
 .../WEB-INF/reports/tripRequirement.jasper    | Bin 56063 -> 57146 bytes
 .../WEB-INF/reports/tripRequirement.jrxml     |  33 ++++---
 src/main/webapp/app/reporting/report.zul      |  32 ++++--
 .../webapp/app/reporting/reportDialog.zul     |   2 +-
 .../webapp/settings/global/requirements.zul   |  56 ++++++++---
 13 files changed, 202 insertions(+), 78 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/data/SettingsData.java b/src/main/java/info/bukova/isspst/data/SettingsData.java
index acbb9fdd..ae1674dd 100644
--- a/src/main/java/info/bukova/isspst/data/SettingsData.java
+++ b/src/main/java/info/bukova/isspst/data/SettingsData.java
@@ -22,6 +22,7 @@ public class SettingsData {
 	private List<Vehicle> vehicles;
 	private Map<Integer, BigDecimal[]> refunds;
 	private String stampFile;
+	private String logoFile;
 	
 	public SettingsData() {
 		newReqTemplate = new MailMessage();
@@ -140,4 +141,13 @@ public class SettingsData {
 		this.stampFile = stampFile;
 	}
 
+	public String getLogoFile()
+	{
+		return logoFile;
+	}
+
+	public void setLogoFile(String logoFile)
+	{
+		this.logoFile = logoFile;
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java
index 4cb8e873..b1bbddda 100644
--- a/src/main/java/info/bukova/isspst/reporting/ParamFiller.java
+++ b/src/main/java/info/bukova/isspst/reporting/ParamFiller.java
@@ -1,8 +1,6 @@
 package info.bukova.isspst.reporting;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.AuthItem;
 import info.bukova.isspst.data.Order;
 import info.bukova.isspst.data.TripBill;
@@ -13,8 +11,13 @@ import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.storage.FileStorage;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.mysql.jdbc.StringUtils;
+
 public class ParamFiller {
 	
 	@Autowired
@@ -74,6 +77,15 @@ public class ParamFiller {
 				definition.setParam("P_STAMP", storage.serverPath(settingService.getSettings().getStampFile()));
 			}
 		}
+
+		definition.setParam("P_LOGO", storage.serverPath(settingService.getSettings().getLogoFile()));
+
+		Address mainAddress = settingService.getSettings().getMainAddress();
+
+		if (mainAddress != null) {
+			String addr = (StringUtils.isNullOrEmpty(mainAddress.getCompany()) ? "" : mainAddress.getCompany());
+			definition.setParam("P_MAIN_ADDRESS", addr);
+		}
 	}
 
 }
diff --git a/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java b/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
index fdeda412..3577e450 100644
--- a/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
+++ b/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
@@ -1,6 +1,7 @@
 package info.bukova.isspst.ui.settings;
 
 import info.bukova.isspst.Constants;
+import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.SettingsData;
@@ -77,7 +78,24 @@ public class GlobalSettingsVM extends DocumentViewModel
 		storage.removeFile(settings.getStampFile());
 		settings.setStampFile(null);
 	}
-	
+
+	@Command
+	@NotifyChange({ "settings", "logoImg" })
+	public void uploadLogo(@ContextParam(ContextType.TRIGGER_EVENT) UploadEvent upEvent) {
+		int i = upEvent.getMedia().getName().lastIndexOf(".");
+		String fileName = "LogoImageFile" + upEvent.getMedia().getName().substring(i);
+		storage.saveFile(upEvent.getMedia().getByteData(), fileName);
+		settings.setLogoFile(fileName);
+	}
+
+	@Command
+	@NotifyChange("logoImg")
+	public void removeLogo()
+	{
+		storage.removeFile(settings.getLogoFile());
+		settings.setLogoFile(null);
+	}
+
 	public List<String> getRequirementFields() {
 		return ReflectionTools.getEntityFields(Requirement.class);
 	}
@@ -144,7 +162,7 @@ public class GlobalSettingsVM extends DocumentViewModel
 	}
 	
 	public RenderedImage getStampImg() {
-		if (settings.getStampFile() == null || settings.getStampFile().isEmpty()) {
+		if (StringUtils.isNullOrEmpty(settings.getStampFile())) {
 			return null;
 		}
 		
@@ -155,4 +173,16 @@ public class GlobalSettingsVM extends DocumentViewModel
 		}
 	}
 
+	public RenderedImage getLogoImg() {
+		if (StringUtils.isNullOrEmpty(settings.getLogoFile())) {
+			return null;
+		}
+
+		try {
+			return ImageIO.read(storage.file(settings.getLogoFile()));
+		}
+		catch (IOException e) {
+			return null;
+		}
+	}
 }
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index b83c18bb..a800620e 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -182,6 +182,8 @@ GlobalSettingsFreeMealsCount=Počet jídel zdarma
 GlobalSettingsHours=Hodin
 GlobalSettingsUploadStamp=Nahrát obrázek razítka
 GlobalSettingsStamp=Razítko
+GlobalSettingsUploadOrganizationLogo=Nahrát logo
+GlobalSettingsOrganizationLogo=Logo
 GlobalSettingsReqEnable=Povolení požadavků
 GlobalSettingsInsertUrl=Vložit URL záznamu
 
diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jasper b/src/main/webapp/WEB-INF/reports/tripBill.jasper
index a2febae2cc4e9fb6b49f732deb6ca24fd9105e2e..c0abfc27c4fb57364b3984184ad61a2cd81744d7 100644
GIT binary patch
delta 13424
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
T0bNXg({%8wy~23jt6l#S_|ZB&

delta 12280
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
Mv%0dTyuw}k-=$reg8%>k

diff --git a/src/main/webapp/WEB-INF/reports/tripBill.jrxml b/src/main/webapp/WEB-INF/reports/tripBill.jrxml
index 2a937252..b4c83281 100644
--- a/src/main/webapp/WEB-INF/reports/tripBill.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripBill.jrxml
@@ -1,12 +1,14 @@
 <?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="176"/>
-	<property name="ireport.y" value="856"/>
+<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="10" bottomMargin="20" uuid="f59e8277-a431-4cdc-abaa-c82c1cf193af">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="375"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["/home/pepa/Dokumenty/dev/java/isspst/"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="P_USER_SIGNATURE" class="java.lang.String"/>
+	<parameter name="P_LOGO" class="java.lang.String"/>
+	<parameter name="P_MAIN_ADDRESS" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -50,159 +52,159 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="259" splitType="Stretch">
+		<band height="275" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="6e60bd03-48b9-4555-91ab-757532d93e6a" x="10" y="47" width="143" height="20"/>
+				<reportElement uuid="6e60bd03-48b9-4555-91ab-757532d93e6a" x="10" y="61" width="143" height="20"/>
 				<textElement>
 					<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[Příjmení, jméno, titul:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="448ba3e9-dc29-45c4-b384-3e597d036134" x="10" y="67" width="100" height="20"/>
+				<reportElement uuid="448ba3e9-dc29-45c4-b384-3e597d036134" x="10" y="81" width="100" height="20"/>
 				<textElement>
 					<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[Bydliště:]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="62d493f1-c058-42e6-b2f5-1a691ac9e5db" x="196" y="47" width="181" height="20"/>
+				<reportElement uuid="62d493f1-c058-42e6-b2f5-1a691ac9e5db" x="196" y="61" width="181" height="20"/>
 				<textElement>
 					<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{ownedBy}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="86395201-6c9d-4584-a8a3-eb46dd4af411" x="143" y="92" width="143" height="27"/>
+				<reportElement uuid="86395201-6c9d-4584-a8a3-eb46dd4af411" x="143" y="106" width="143" height="27"/>
 				<textElement textAlignment="Center"/>
 				<text><![CDATA[Místo jednání]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="f62e3881-5a60-45ed-997b-71f5e1c25b28" x="0" y="120" width="143" height="20"/>
+				<reportElement uuid="f62e3881-5a60-45ed-997b-71f5e1c25b28" x="0" y="134" width="143" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{requirement.from}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="67730ab5-6550-4a51-8daa-ef3c509d44ad" x="143" y="90" width="1" height="75"/>
+				<reportElement uuid="67730ab5-6550-4a51-8daa-ef3c509d44ad" x="143" y="104" width="1" height="75"/>
 			</line>
 			<line>
-				<reportElement uuid="98195ce4-de92-4643-bd50-f63d553a6235" x="0" y="165" width="572" height="1"/>
+				<reportElement uuid="98195ce4-de92-4643-bd50-f63d553a6235" x="0" y="179" width="572" height="1"/>
 			</line>
 			<staticText>
-				<reportElement uuid="4827d565-87ea-4648-a5b0-6473e8814bb1" x="429" y="92" width="143" height="26"/>
+				<reportElement uuid="4827d565-87ea-4648-a5b0-6473e8814bb1" x="429" y="106" width="143" height="26"/>
 				<textElement textAlignment="Center"/>
 				<text><![CDATA[Konec cesty (místo, datum)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="76f85619-891b-44f4-8c7f-d1ceba0bef3c" x="0" y="92" width="143" height="27"/>
+				<reportElement uuid="76f85619-891b-44f4-8c7f-d1ceba0bef3c" x="0" y="106" width="143" height="27"/>
 				<textElement textAlignment="Center"/>
 				<text><![CDATA[Počátek cesty (místo, datum, hodina)]]></text>
 			</staticText>
 			<line>
-				<reportElement uuid="e5c8f5ac-f7b5-4235-ba39-566b94bb6382" x="428" y="90" width="1" height="75"/>
+				<reportElement uuid="e5c8f5ac-f7b5-4235-ba39-566b94bb6382" x="428" y="104" width="1" height="75"/>
 			</line>
 			<textField pattern="dd. MM. yyyy">
-				<reportElement uuid="f758abfe-1e97-4ac0-a7e8-293438ef1d78" x="429" y="140" width="143" height="20"/>
+				<reportElement uuid="f758abfe-1e97-4ac0-a7e8-293438ef1d78" x="429" y="154" width="143" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{requirement.endDate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="HH:mm">
-				<reportElement uuid="0db3d6e2-36e3-4c66-b4a1-2cdc555b2831" x="90" y="140" width="53" height="20"/>
+				<reportElement uuid="0db3d6e2-36e3-4c66-b4a1-2cdc555b2831" x="90" y="154" width="53" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{requirement.tripDate}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="76000adf-2d9c-4c56-9471-51bc278ca433" x="286" y="120" width="143" height="40"/>
+				<reportElement uuid="76000adf-2d9c-4c56-9471-51bc278ca433" x="286" y="134" width="143" height="40"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{requirement.description}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4b1e7687-d605-46bb-aa2b-08637cff229a" x="143" y="120" width="143" height="20"/>
+				<reportElement uuid="4b1e7687-d605-46bb-aa2b-08637cff229a" x="143" y="134" width="143" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{requirement.to}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="70db0a7e-650a-4324-9c62-f75bcbdcbb8d" x="285" y="90" width="1" height="75"/>
+				<reportElement uuid="70db0a7e-650a-4324-9c62-f75bcbdcbb8d" x="285" y="104" width="1" height="75"/>
 			</line>
 			<staticText>
-				<reportElement uuid="d52c698d-07c8-4740-a791-2df4f5cb1c6e" x="286" y="91" width="143" height="27"/>
+				<reportElement uuid="d52c698d-07c8-4740-a791-2df4f5cb1c6e" x="286" y="105" width="143" height="27"/>
 				<textElement textAlignment="Center"/>
 				<text><![CDATA[Účel cesty]]></text>
 			</staticText>
 			<textField pattern="dd. MM. yyyy">
-				<reportElement uuid="88c08297-c140-410a-8980-02416ec62475" x="0" y="140" width="90" height="20"/>
+				<reportElement uuid="88c08297-c140-410a-8980-02416ec62475" x="0" y="154" width="90" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{requirement.tripDate}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="21724842-be95-48ba-a811-0bf7a862ae3f" x="429" y="120" width="143" height="20"/>
+				<reportElement uuid="21724842-be95-48ba-a811-0bf7a862ae3f" x="429" y="134" width="143" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{requirement.end}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="dd38c006-cfb4-4b8f-abf8-986222d3bd27" x="0" y="89" width="572" height="1"/>
+				<reportElement uuid="dd38c006-cfb4-4b8f-abf8-986222d3bd27" x="0" y="103" width="572" height="1"/>
 			</line>
 			<staticText>
-				<reportElement uuid="831faf0e-2b31-47df-9ccf-4bf1c5bcdcbd" x="1" y="3" width="572" height="38"/>
-				<textElement textAlignment="Center">
+				<reportElement uuid="831faf0e-2b31-47df-9ccf-4bf1c5bcdcbd" x="101" y="16" width="472" height="39"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom">
 					<font size="14" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[VYÚČTOVÁNÍ
 tuzemské pracovní cesty]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6990eca1-ad98-4545-b211-1892d039bc74" x="1" y="172" width="571" height="20"/>
+				<reportElement uuid="6990eca1-ad98-4545-b211-1892d039bc74" x="1" y="186" width="571" height="20"/>
 				<textElement textAlignment="Center">
 					<font size="14" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[VYÚČTOVÁNÍ PRACOVNÍ CESTY]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9b5868e4-5034-4141-b470-8c199e81ee4e" x="0" y="195" width="296" height="20"/>
+				<reportElement uuid="9b5868e4-5034-4141-b470-8c199e81ee4e" x="0" y="209" width="296" height="20"/>
 				<textElement>
 					<font isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
 				<text><![CDATA[Zpráva o výsledku pracovní cesty byla podána dne:]]></text>
 			</staticText>
 			<textField pattern="dd. MM. yyyy">
-				<reportElement uuid="d7b2da96-3040-4a89-9380-0dbb55068601" x="428" y="192" width="144" height="20"/>
+				<reportElement uuid="d7b2da96-3040-4a89-9380-0dbb55068601" x="428" y="206" width="144" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{resultMessageDate}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="b2b60eec-df87-4385-a6d9-8d3f80cc319a" x="1" y="215" width="295" height="20"/>
+				<reportElement uuid="b2b60eec-df87-4385-a6d9-8d3f80cc319a" x="1" y="229" width="295" height="20"/>
 				<textElement>
 					<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[Se způsobem provedení souhlasí:]]></text>
 			</staticText>
 			<line>
-				<reportElement uuid="0cf99b2a-b025-4a50-bcb5-8e371536bb77" x="296" y="235" width="276" height="1"/>
+				<reportElement uuid="0cf99b2a-b025-4a50-bcb5-8e371536bb77" x="296" y="249" width="276" height="1"/>
 			</line>
 			<staticText>
-				<reportElement uuid="17876cb8-7666-48f4-9275-f7a70cd08ff9" x="296" y="239" width="276" height="20"/>
+				<reportElement uuid="17876cb8-7666-48f4-9275-f7a70cd08ff9" x="296" y="253" width="276" height="20"/>
 				<textElement textAlignment="Center">
 					<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[Datum a podpis oprávněné osoby]]></text>
 			</staticText>
 			<line>
-				<reportElement uuid="c67f7840-5e38-4eed-ab3f-e4907ac33b5c" x="0" y="258" width="572" height="1"/>
+				<reportElement uuid="c67f7840-5e38-4eed-ab3f-e4907ac33b5c" x="0" y="272" width="572" height="1"/>
 			</line>
 			<line>
-				<reportElement uuid="e3530085-daa8-4675-bf3a-d98c775be07e" x="0" y="41" width="571" height="1"/>
+				<reportElement uuid="e3530085-daa8-4675-bf3a-d98c775be07e" x="0" y="55" width="571" height="1"/>
 			</line>
 			<line>
 				<reportElement uuid="47e4e70d-fb5f-4266-889a-4149c71efa42" x="-1" y="0" width="572" height="1"/>
 			</line>
 			<line>
-				<reportElement uuid="d4738137-17c1-4721-b222-7187988c1b06" x="-1" y="1" width="1" height="258"/>
+				<reportElement uuid="d4738137-17c1-4721-b222-7187988c1b06" x="-1" y="1" width="1" height="272"/>
 			</line>
 			<line>
-				<reportElement uuid="bf83547c-60d9-4f95-a5f1-db0763ba17cb" x="571" y="0" width="1" height="259"/>
+				<reportElement uuid="bf83547c-60d9-4f95-a5f1-db0763ba17cb" x="571" y="1" width="1" height="272"/>
 			</line>
 			<textField>
-				<reportElement uuid="8af60406-55bf-46f0-82e9-865dc9edbdb4" x="196" y="68" width="375" height="20">
+				<reportElement uuid="8af60406-55bf-46f0-82e9-865dc9edbdb4" x="196" y="82" width="375" height="20">
 					<printWhenExpression><![CDATA[$F{ownedBy.address} != null]]></printWhenExpression>
 				</reportElement>
 				<textElement>
@@ -210,6 +212,19 @@ tuzemské pracovní cesty]]></text>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{ownedBy.address.street} + " " + $F{ownedBy.address.houseNumber} + ", " + $F{ownedBy.address.zipCode} + " " + $F{ownedBy.address.city}]]></textFieldExpression>
 			</textField>
+			<image onErrorType="Blank">
+				<reportElement uuid="031517a3-12c1-4094-9da4-59d82aec9243" x="1" y="1" width="100" height="54">
+					<printWhenExpression><![CDATA[$P{P_LOGO} != null]]></printWhenExpression>
+				</reportElement>
+				<imageExpression><![CDATA[$P{P_LOGO}]]></imageExpression>
+			</image>
+			<textField>
+				<reportElement uuid="2541cdb2-9c7e-4d10-aa30-af0d1f5e0e2f" x="101" y="1" width="470" height="20"/>
+				<textElement textAlignment="Center">
+					<font isBold="true" pdfEncoding="Cp1250"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{P_MAIN_ADDRESS}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<detail>
@@ -329,7 +344,7 @@ tuzemské pracovní cesty]]></text>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<text><![CDATA[Doplatek - přeplatek]]></text>
 			</staticText>
-			<image>
+			<image onErrorType="Blank">
 				<reportElement uuid="0a136d64-9565-4ed7-9baa-3b68aa98eada" x="450" y="106" width="113" height="36">
 					<printWhenExpression><![CDATA[$P{P_USER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
diff --git a/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jasper b/src/main/webapp/WEB-INF/reports/tripBillFreeMeals.jasper
index 2683be74911323ee0eaf7526ed26380dce7d7673..096bd0e613eeb916f8b65b6a0aea61eaff11ca57 100644
GIT binary patch
delta 113
zcmaFX!}zR+aRVa<Bg1AUj%G$CrsByDbmb==;GW#T!?JlR=Uq)HfpQK81_l8jW~eAG
xWT<0!ZSMf$FbGUuW9%$sWNu(-Y-wh0WMmR=YGh_%V7!^pL{12c_+&#jQvk*)8~*?R

delta 113
zcmaFX!}zR+aRVa<BiCjoj%G$CuHwlLbmb==;GW#T!?JlR=Uq)Ho^lQb1_l8jW~eAG
xWT<0!ZSMf$Fz`%XW9%$sU}0foYHn(2U~C?5ZfRm_WVo5pL{12c_+&#jQvl3{92Wop

diff --git a/src/main/webapp/WEB-INF/reports/tripBillItems.jasper b/src/main/webapp/WEB-INF/reports/tripBillItems.jasper
index a5f52472cfa7ebc98cade4fe26cd7f2d3104356e..3b13ab43b81f8ec79ad81fe1ca0b4e480ea7d48f 100644
GIT binary patch
delta 150
zcmeDDz|{GHX#*n%Bg14Sj%$o6liz15OgzB7nT1nKpHXx2J4x-$ZWjAI83iXV@Drb`
z(8{t|q3H*|lt4KL0|SEq5HnO17c$f_FS2(4aTo+98%?s8Ffuo=G`2J|Ff=lcH#4*_
lGBadnU}R*_nOw*!vw7(xSyfR?6(tNtlMUHrCV$>81^|VxC%6Cr

delta 150
zcmeDDz|{GHX#*n%BiCdmj%$pDliz15OgzB7nT1nKAIN(rslD0FVxK3Y*yII%;*%9x
zSvD&){ot44Dd%8dU=RRehKk}shC1d&_6{Hp1J7imN%j&378XWkmZp{#Mh5Zbh6a|F
jhU^TCj0`%H3t440FP$W-DvGJ1gu!UCA-l}v&)dZSnSv+q

diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper
index eff4bf30d0bdc56e9f84c2c8271ba88679ffdddf..7625b9fc175c53f055fe091d49043f71a685d477 100644
GIT binary patch
delta 8271
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
b@df`5wEynzJ+8#>)eCL4)pb=~PyIgurJ$xR

delta 7401
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
YdKY!N?;E+V`ULNi-8V<b$d7~n4*r71=>Px#

diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
index e1bbf087..4d234455 100644
--- a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
@@ -2,7 +2,7 @@
 <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="tripRequirement" pageWidth="612" pageHeight="792" columnWidth="572" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0b7fa2d2-d452-4a1f-b1c0-2d8e16a22525">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="128"/>
+	<property name="ireport.y" value="254"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -35,6 +35,8 @@
 	<parameter name="P_USER_SIGNATURE" class="java.lang.String"/>
 	<parameter name="P_APPROVE_DATE" class="java.util.Date"/>
 	<parameter name="P_APPROVER_SIGNATURE" class="java.lang.String"/>
+	<parameter name="P_LOGO" class="java.lang.String"/>
+	<parameter name="P_MAIN_ADDRESS" class="java.lang.String"/>
 	<field name="requirement" class="info.bukova.isspst.data.TripRequirement"/>
 	<field name="ownedBy" class="info.bukova.isspst.data.User"/>
 	<field name="requirement.reqDate" class="java.util.Date"/>
@@ -59,19 +61,26 @@
 	</background>
 	<title>
 		<band height="79" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="50f96189-2183-4afd-915d-b5342375e988" x="0" y="30" width="572" height="20"/>
+			<image onErrorType="Blank">
+				<reportElement uuid="ef1dc796-f5c6-4036-99eb-26e7b6b7abbc" x="0" y="0" width="100" height="79" isRemoveLineWhenBlank="true">
+					<printWhenExpression><![CDATA[$P{P_LOGO} != null]]></printWhenExpression>
+				</reportElement>
+				<imageExpression><![CDATA[$P{P_LOGO}]]></imageExpression>
+			</image>
+			<textField>
+				<reportElement uuid="3e2074cd-220c-4c9a-b94c-a0a254cc24a6" x="100" y="0" width="471" height="34"/>
 				<textElement textAlignment="Center">
-					<font size="16" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
+					<font isBold="true" pdfEncoding="Cp1250"/>
 				</textElement>
-				<text><![CDATA[Cestovní příkaz]]></text>
-			</staticText>
+				<textFieldExpression><![CDATA[$P{P_MAIN_ADDRESS}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement uuid="5b2dc2ca-188e-4636-b617-dd5c1132246b" x="0" y="50" width="572" height="20"/>
-				<textElement textAlignment="Center">
-					<font size="16" isBold="true" pdfFontName="Helvetica-Bold"/>
+				<reportElement uuid="a7a82c52-e8b8-41cf-b13a-ebc54d30d04f" x="101" y="34" width="470" height="45"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom">
+					<font size="14" isBold="true" pdfEncoding="Cp1250"/>
 				</textElement>
-				<text><![CDATA[k tuzemské pracovní cestě]]></text>
+				<text><![CDATA[CESTOVNÍ PŘÍKAZ
+k tuzemské pracovní cestě]]></text>
 			</staticText>
 		</band>
 	</title>
@@ -315,7 +324,7 @@ L - letadlo, P - pěšky, T - taxi]]></text>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
 			</textField>
-			<image>
+			<image onErrorType="Blank">
 				<reportElement uuid="954e517f-5d23-4166-b776-7c31b4409ddd" x="378" y="69" width="183" height="50">
 					<printWhenExpression><![CDATA[$P{P_USER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
@@ -326,7 +335,7 @@ L - letadlo, P - pěšky, T - taxi]]></text>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{P_APPROVE_DATE}]]></textFieldExpression>
 			</textField>
-			<image>
+			<image onErrorType="Blank">
 				<reportElement uuid="baf922bc-b6fb-4dbf-abc9-250f448baef3" x="378" y="368" width="183" height="50">
 					<printWhenExpression><![CDATA[$P{P_APPROVER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
diff --git a/src/main/webapp/app/reporting/report.zul b/src/main/webapp/app/reporting/report.zul
index 989a9535..10ee9734 100644
--- a/src/main/webapp/app/reporting/report.zul
+++ b/src/main/webapp/app/reporting/report.zul
@@ -1,11 +1,25 @@
-<?page title="${labels.ReportReport}" contentType="text/html;charset=UTF-8"?>
+<?page contentType="text/html;charset=UTF-8"?>
 <zk>
-<window border="normal" closable="true" apply="org.zkoss.bind.BindComposer"
-	viewModel="@id('vm') @init('info.bukova.isspst.ui.reporting.ReportVM')">
-	<caption src="/img/print.png" zclass="form-caption" label="${labels.ReportReport}" />
-	<toolbar>
-		<toolbarbutton image="/img/send.png" tooltiptext="${labels.ReportSend}" onClick="@command('send')"/>
-	</toolbar>
-	<iframe width="800px" height="660px" src="/api/report.pdf"/>
-</window>
+	<window
+		width="95%"
+		height="95%"
+		border="normal"
+		closable="true"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.reporting.ReportVM')">
+		<caption
+			src="/img/print.png"
+			zclass="form-caption"
+			label="${labels.ReportReport}" />
+		<toolbar>
+			<toolbarbutton
+				image="/img/send.png"
+				tooltiptext="${labels.ReportSend}"
+				onClick="@command('send')" />
+		</toolbar>
+		<iframe
+			width="100%"
+			height="100%"
+			src="/api/report.pdf" />
+	</window>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/app/reporting/reportDialog.zul b/src/main/webapp/app/reporting/reportDialog.zul
index a55be370..a3676eb0 100644
--- a/src/main/webapp/app/reporting/reportDialog.zul
+++ b/src/main/webapp/app/reporting/reportDialog.zul
@@ -1,4 +1,4 @@
-<?page title="${labels.ReportReports}" contentType="text/html;charset=UTF-8"?>
+<?page contentType="text/html;charset=UTF-8"?>
 <zk>
 <window id="reportDialog" border="normal" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.reporting.ReportDialogVM')"
diff --git a/src/main/webapp/settings/global/requirements.zul b/src/main/webapp/settings/global/requirements.zul
index efc84862..e311e130 100644
--- a/src/main/webapp/settings/global/requirements.zul
+++ b/src/main/webapp/settings/global/requirements.zul
@@ -1,28 +1,60 @@
 <?page title="requirements" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<groupbox mold="3d">
-		<caption label="${labels.GlobalSettingsReqEnable}"/>
+		<caption label="${labels.GlobalSettingsReqEnable}" />
 		<div>
 			<checkbox
 				label="${labels.EnableRequirements}"
-				checked="@bind(vm.settings.enableRequirements)" disabled="@load(not vm.canSave)" />
-		</div>	
+				checked="@bind(vm.settings.enableRequirements)"
+				disabled="@load(not vm.canSave)" />
+		</div>
 	</groupbox>
 	<groupbox mold="3d">
-		<caption label="${labels.GlobalSettingsStamp}"/>
+		<caption label="${labels.GlobalSettingsStamp}" />
 		<hbox>
-			<button label="${labels.GlobalSettingsUploadStamp}" 
-				upload="true,maxsize=600,accept=image/*" 
+			<button
+				label="${labels.GlobalSettingsUploadStamp}"
+				upload="true,maxsize=600,accept=image/*"
 				onUpload="@command('uploadStamp')"
 				sclass="nicebutton"
-				disabled="@load(not vm.canSave)"/>
-			<div width="400px" height="110px" style="border: 1px solid black;">
-				<image height="100px" content="@load(vm.stampImg)"/>
+				disabled="@load(not vm.canSave)" />
+			<div
+				width="400px"
+				height="110px"
+				style="border: 1px solid black;">
+				<image
+					height="100px"
+					content="@load(vm.stampImg)" />
 			</div>
 		</hbox>
-		<button label="${labels.ButtonDelete}" 
-			onClick="@command('removeStamp')" 
+		<button
+			label="${labels.ButtonDelete}"
+			onClick="@command('removeStamp')"
 			sclass="nicebutton"
-			disabled="@load(not vm.canSave)"/>	
+			disabled="@load(not vm.canSave)" />
+	</groupbox>
+	<groupbox mold="3d">
+		<caption label="${labels.GlobalSettingsOrganizationLogo}" />
+		<hbox>
+			<button
+				label="${labels.GlobalSettingsUploadOrganizationLogo}"
+				upload="true,maxsize=600,accept=image/*"
+				onUpload="@command('uploadLogo')"
+				sclass="nicebutton"
+				disabled="@load(not vm.canSave)" />
+			<div
+				width="400px"
+				height="110px"
+				style="border: 1px solid black;">
+				<image
+					height="100px"
+					content="@load(vm.logoImg)" />
+			</div>
+		</hbox>
+		<button
+			label="${labels.ButtonDelete}"
+			onClick="@command('removeLogo')"
+			sclass="nicebutton"
+			disabled="@load(not vm.canSave)" />
 	</groupbox>
 </zk>
\ No newline at end of file