Merge branch 'master' into AL-4135
commit
7306ba3556
2
pom.xml
2
pom.xml
|
@ -4,7 +4,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ventaboletosadm</artifactId>
|
<artifactId>ventaboletosadm</artifactId>
|
||||||
<version>1.63.2</version>
|
<version>1.63.4</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-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="RelatorioReceitaServico" pageWidth="882" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="842" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
|
<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="RelatorioReceitaServico" pageWidth="885" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="845" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
|
||||||
<property name="ireport.zoom" value="1.331000000000001"/>
|
<property name="ireport.zoom" value="1.331000000000001"/>
|
||||||
<property name="ireport.x" value="0"/>
|
<property name="ireport.x" value="0"/>
|
||||||
<property name="ireport.y" value="0"/>
|
<property name="ireport.y" value="0"/>
|
||||||
|
@ -95,7 +95,7 @@
|
||||||
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
||||||
<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="757" y="0" width="85" height="13" forecolor="#000000" backcolor="#FFFFFF"/>
|
<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="757" y="0" width="88" height="13" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||||
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
||||||
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||||
<paragraph lineSpacing="Single"/>
|
<paragraph lineSpacing="Single"/>
|
||||||
|
@ -111,7 +111,7 @@
|
||||||
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
|
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
|
||||||
<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="757" y="13" width="85" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
|
<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="757" y="13" width="88" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||||
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
||||||
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||||
<paragraph lineSpacing="Single"/>
|
<paragraph lineSpacing="Single"/>
|
||||||
|
@ -127,7 +127,7 @@
|
||||||
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField>
|
||||||
<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="51" width="842" height="14"/>
|
<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="51" width="845" height="14"/>
|
||||||
<box>
|
<box>
|
||||||
<topPen lineWidth="0.75"/>
|
<topPen lineWidth="0.75"/>
|
||||||
<bottomPen lineWidth="0.75"/>
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
@ -138,7 +138,7 @@
|
||||||
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField pattern="" isBlankWhenNull="false">
|
<textField pattern="" isBlankWhenNull="false">
|
||||||
<reportElement uuid="469acc35-aa0a-41d9-ad44-544cf484879a" mode="Transparent" x="757" y="28" width="85" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
|
<reportElement uuid="469acc35-aa0a-41d9-ad44-544cf484879a" mode="Transparent" x="757" y="28" width="88" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||||
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
||||||
<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||||
<paragraph lineSpacing="Single"/>
|
<paragraph lineSpacing="Single"/>
|
||||||
|
@ -250,7 +250,7 @@
|
||||||
<text><![CDATA[Tipo]]></text>
|
<text><![CDATA[Tipo]]></text>
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="10f27b7d-5cc9-423c-a196-330c78cdb69e" x="516" y="0" width="73" height="12"/>
|
<reportElement uuid="10f27b7d-5cc9-423c-a196-330c78cdb69e" x="516" y="0" width="71" height="12"/>
|
||||||
<box>
|
<box>
|
||||||
<bottomPen lineWidth="0.75"/>
|
<bottomPen lineWidth="0.75"/>
|
||||||
</box>
|
</box>
|
||||||
|
@ -260,7 +260,7 @@
|
||||||
<text><![CDATA[Agência]]></text>
|
<text><![CDATA[Agência]]></text>
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="f2097833-6bd3-4523-b457-44ed6cc4abd6" x="589" y="0" width="38" height="12"/>
|
<reportElement uuid="f2097833-6bd3-4523-b457-44ed6cc4abd6" x="587" y="0" width="41" height="12"/>
|
||||||
<box>
|
<box>
|
||||||
<bottomPen lineWidth="0.75"/>
|
<bottomPen lineWidth="0.75"/>
|
||||||
</box>
|
</box>
|
||||||
|
@ -270,7 +270,7 @@
|
||||||
<text><![CDATA[Data]]></text>
|
<text><![CDATA[Data]]></text>
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="44b2bf55-871a-4eaa-97d4-74bee2a89769" x="660" y="0" width="77" height="12"/>
|
<reportElement uuid="44b2bf55-871a-4eaa-97d4-74bee2a89769" x="661" y="0" width="76" height="12"/>
|
||||||
<box>
|
<box>
|
||||||
<bottomPen lineWidth="0.75"/>
|
<bottomPen lineWidth="0.75"/>
|
||||||
</box>
|
</box>
|
||||||
|
@ -290,7 +290,7 @@
|
||||||
<text><![CDATA[Nr bilhete ]]></text>
|
<text><![CDATA[Nr bilhete ]]></text>
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="2bd47a58-e591-4b32-bdd4-fa43ece0c581" x="824" y="0" width="18" height="12"/>
|
<reportElement uuid="2bd47a58-e591-4b32-bdd4-fa43ece0c581" x="824" y="0" width="21" height="12"/>
|
||||||
<box>
|
<box>
|
||||||
<bottomPen lineWidth="0.75"/>
|
<bottomPen lineWidth="0.75"/>
|
||||||
</box>
|
</box>
|
||||||
|
@ -300,7 +300,7 @@
|
||||||
<text><![CDATA[Status]]></text>
|
<text><![CDATA[Status]]></text>
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="bceca474-7703-4bf0-a0da-d8e15b70aeca" x="627" y="0" width="33" height="12"/>
|
<reportElement uuid="bceca474-7703-4bf0-a0da-d8e15b70aeca" x="628" y="0" width="33" height="12"/>
|
||||||
<box>
|
<box>
|
||||||
<bottomPen lineWidth="0.75"/>
|
<bottomPen lineWidth="0.75"/>
|
||||||
</box>
|
</box>
|
||||||
|
@ -342,7 +342,7 @@
|
||||||
</band>
|
</band>
|
||||||
</columnHeader>
|
</columnHeader>
|
||||||
<detail>
|
<detail>
|
||||||
<band height="12" splitType="Stretch">
|
<band height="13" splitType="Stretch">
|
||||||
<textField>
|
<textField>
|
||||||
<reportElement uuid="b15ada19-a1c0-4feb-9734-3a6c624bbfe6" x="39" y="0" width="51" height="12"/>
|
<reportElement uuid="b15ada19-a1c0-4feb-9734-3a6c624bbfe6" x="39" y="0" width="51" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
|
@ -350,8 +350,8 @@
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField isStretchWithOverflow="true">
|
||||||
<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="90" y="0" width="66" height="12"/>
|
<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" stretchType="RelativeToTallestObject" x="90" y="0" width="66" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -371,8 +371,8 @@
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField isStretchWithOverflow="true">
|
||||||
<reportElement uuid="7265d085-4188-44a0-8e04-e5efdb0d5ccf" x="216" y="0" width="68" height="12"/>
|
<reportElement uuid="7265d085-4188-44a0-8e04-e5efdb0d5ccf" stretchType="RelativeToTallestObject" x="216" y="0" width="68" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -392,7 +392,7 @@
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[$F{tut}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{tut}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField pattern="¤ #,##0.00">
|
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
|
||||||
<reportElement uuid="16461919-04ea-48df-af5c-7f0d7dcb7fab" x="395" y="0" width="41" height="12"/>
|
<reportElement uuid="16461919-04ea-48df-af5c-7f0d7dcb7fab" x="395" y="0" width="41" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
|
@ -407,28 +407,28 @@
|
||||||
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||||
<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="0" width="40" height="12" isPrintWhenDetailOverflows="true"/>
|
<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="0" width="40" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||||
<reportElement uuid="0ecedfc0-febb-40e0-b5ca-168b5a296646" x="516" y="0" width="73" height="12"/>
|
<reportElement uuid="0ecedfc0-febb-40e0-b5ca-168b5a296646" stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" x="516" y="0" width="71" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField>
|
||||||
<reportElement uuid="8229beec-daa6-4357-a4c9-f475d7a873aa" x="589" y="0" width="38" height="12"/>
|
<reportElement uuid="8229beec-daa6-4357-a4c9-f475d7a873aa" x="587" y="0" width="41" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{dataHoraCompra})]]></textFieldExpression>
|
<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{dataHoraCompra})]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||||
<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" x="660" y="0" width="77" height="12"/>
|
<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" stretchType="RelativeToTallestObject" x="661" y="0" width="76" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -442,7 +442,7 @@
|
||||||
<textFieldExpression><![CDATA[$F{nrBilhete}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{nrBilhete}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField>
|
||||||
<reportElement uuid="8d419689-a353-4332-8e39-222dde198168" x="627" y="0" width="33" height="12"/>
|
<reportElement uuid="8d419689-a353-4332-8e39-222dde198168" x="628" y="0" width="33" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -456,7 +456,7 @@
|
||||||
<textFieldExpression><![CDATA[$F{preciobase}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{preciobase}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<textField>
|
<textField>
|
||||||
<reportElement uuid="1f6449f5-835f-41f2-8c41-94eb91e54fa2" x="824" y="0" width="18" height="12"/>
|
<reportElement uuid="1f6449f5-835f-41f2-8c41-94eb91e54fa2" x="824" y="0" width="21" height="12"/>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
|
Loading…
Reference in New Issue