IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do sestav žádosti o služební cestu a vyúčtování vstupuje podpis

Browse Source 
uživatele a podpis schvalovatele. 
closes #132
This commit is contained in:
Josef Rokos
2014-09-08 15:25:08 +02:00
parent d108f4a070
commit 74586f9820
8 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/reports/tripBill.jasper
BIN
View File
Binary file not shown.
src/main/webapp/WEB-INF/reports/tripBill.jrxml
+16 -2
View File
@@ -1,11 +1,12 @@
<?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="593"/>
<property name="ireport.y" value="432"/>
<property name="ireport.x" value="214"/>
<property name="ireport.y" value="422"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["/home/pepa/Dokumenty/dev/java/isspst/"]]></defaultValueExpression>
</parameter>
<parameter name="P_USER_SIGNATURE" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
@@ -360,6 +361,19 @@ tuzemské pracovní cesty]]></text>
<textElement textAlignment="Right" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
</textField>
<image>
<reportElement uuid="0a136d64-9565-4ed7-9baa-3b68aa98eada" x="406" y="120" width="147" height="24">
<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"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[new Date()]]></textFieldExpression>
</textField>
</band>
</summary>
</jasperReport>
src/main/webapp/WEB-INF/reports/tripRequirement.jasper
BIN
View File
Binary file not shown.
src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
+21 -1
View File
@@ -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="96"/>
<property name="ireport.y" value="128"/>
<style name="table">
<box>
<pen lineWidth="1.0" lineColor="#000000"/>
@@ -32,6 +32,9 @@
</field>
</subDataset>
<subDataset name="dataset1" uuid="2030e480-17f9-4ac5-a8f1-7499b269f3b4"/>
<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"/>
<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"/>
@@ -307,6 +310,23 @@ L - letadlo, P - pěšky, T - taxi]]></text>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
</textField>
<image>
<reportElement uuid="954e517f-5d23-4166-b776-7c31b4409ddd" x="378" y="71" width="183" height="50">
<printWhenExpression><![CDATA[$P{P_USER_SIGNATURE} != null]]></printWhenExpression>
</reportElement>
<imageExpression><![CDATA[$P{P_USER_SIGNATURE}]]></imageExpression>
</image>
<textField pattern="dd. MM. yyyy" isBlankWhenNull="true">
<reportElement uuid="97daa8a7-dab0-4104-babb-c3889faac21a" x="301" y="399" width="77" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{P_APPROVE_DATE}]]></textFieldExpression>
</textField>
<image>
<reportElement uuid="baf922bc-b6fb-4dbf-abc9-250f448baef3" x="378" y="368" width="183" height="50">
<printWhenExpression><![CDATA[$P{P_APPROVER_SIGNATURE} != null]]></printWhenExpression>
</reportElement>
<imageExpression><![CDATA[$P{P_APPROVER_SIGNATURE}]]></imageExpression>
</image>
</band>
</detail>
</jasperReport>
src/main/webapp/WEB-INF/spring/root-context.xml
+4 -4
View File
@@ -159,16 +159,16 @@
<aop:scoped-proxy/>
</bean>
<bean id="paramFiller" class="info.bukova.isspst.reporting.ParamFiller"/>
<bean id="genFactory" class="info.bukova.isspst.reporting.GeneratorFactory"/>
<!-- File storage -->
<bean id="storage" class="info.bukova.isspst.storage.LocalFileStorage">
<property name="context" ref="servletContext"/>
<property name="rootPath" value="/WEB-INF/upload"/>
</bean>
<bean id="definitionFiller" class="info.bukova.isspst.reporting.DefinitionFiller"/>
<bean id="genFactory" class="info.bukova.isspst.reporting.GeneratorFactory"/>
<!-- Session data -->
<bean id="sessionData" class="info.bukova.isspst.SessionData" scope="session">
<aop:scoped-proxy/>