Download as
Browse Code »

Commit 750b9d398ce5e25cae167ea09952baaee7400c13

Authored by thiago.coimbra
2 parents a6c735d2 d5955d08
Exists in master

Merge branch 'tarefa-2359' into adm-1.15.0

Showing 2 changed files with 20 additions and 10 deletions   Show diff stats
cit-adm-materiais-web/src/main/resources/reports/templatePaisagem.jrxml
  Diff comments   View file @750b9d3
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-12T10:58:45 -->
2 4 <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="templatePaisagem" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 5 <property name="ireport.zoom" value="1.5"/>
4 6 <property name="ireport.x" value="61"/>
... ... @@ -26,12 +28,15 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
26 28 <field name="logo" class="java.lang.Object"/>
27 29 <title>
28 30 <band height="130" splitType="Stretch">
29   - <image>
30   - <reportElement positionType="Float" x="23" y="20" width="85" height="60" uuid="21d967cf-a639-41a7-a0af-62fc1f113936"/>
  31 + <image hAlign="Center">
  32 + <reportElement positionType="Float" x="23" y="20" width="140" height="75" uuid="21d967cf-a639-41a7-a0af-62fc1f113936">
  33 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  34 + <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
  35 + </reportElement>
31 36 <imageExpression><![CDATA[new ByteArrayInputStream((byte[])$F{logo})]]></imageExpression>
32 37 </image>
33 38 <textField isBlankWhenNull="true">
34   - <reportElement x="108" y="20" width="677" height="20" uuid="4e1c4a55-25b5-42c3-a656-feaaab3ee44c"/>
  39 + <reportElement x="163" y="20" width="617" height="20" uuid="4e1c4a55-25b5-42c3-a656-feaaab3ee44c"/>
35 40 <box leftPadding="5"/>
36 41 <textElement verticalAlignment="Middle">
37 42 <font size="12" isBold="true"/>
... ... @@ -39,7 +44,7 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
39 44 <textFieldExpression><![CDATA[$F{titulo1}]]></textFieldExpression>
40 45 </textField>
41 46 <textField isBlankWhenNull="true">
42   - <reportElement x="108" y="40" width="677" height="20" uuid="7ce4c085-aea3-4ae6-83ae-0134ef022bd7"/>
  47 + <reportElement x="163" y="40" width="617" height="20" uuid="7ce4c085-aea3-4ae6-83ae-0134ef022bd7"/>
43 48 <box leftPadding="5"/>
44 49 <textElement verticalAlignment="Middle">
45 50 <font size="12" isBold="true"/>
... ... @@ -47,7 +52,7 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
47 52 <textFieldExpression><![CDATA[$F{titulo2}]]></textFieldExpression>
48 53 </textField>
49 54 <textField isBlankWhenNull="true">
50   - <reportElement x="108" y="60" width="677" height="20" uuid="edd46a21-e588-4e52-8438-c70f2ede5324"/>
  55 + <reportElement x="163" y="60" width="617" height="20" uuid="edd46a21-e588-4e52-8438-c70f2ede5324"/>
51 56 <box leftPadding="5"/>
52 57 <textElement verticalAlignment="Middle">
53 58 <font size="12" isBold="true"/>
... ...
cit-adm-materiais-web/src/main/resources/reports/templateRetrato.jrxml
  Diff comments   View file @750b9d3
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-12T10:58:26 -->
2 4 <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="templateRetrato" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 5 <property name="ireport.zoom" value="2.0"/>
4 6 <property name="ireport.x" value="25"/>
... ... @@ -27,7 +29,7 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
27 29 <title>
28 30 <band height="134" splitType="Stretch">
29 31 <textField isBlankWhenNull="true">
30   - <reportElement x="102" y="37" width="453" height="20" uuid="8b7353fa-6d6b-4b7d-bd04-2564491beff4"/>
  32 + <reportElement x="157" y="37" width="398" height="20" uuid="8b7353fa-6d6b-4b7d-bd04-2564491beff4"/>
31 33 <box leftPadding="5"/>
32 34 <textElement verticalAlignment="Middle">
33 35 <font size="12" isBold="true"/>
... ... @@ -35,19 +37,22 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
35 37 <textFieldExpression><![CDATA[$F{titulo2}]]></textFieldExpression>
36 38 </textField>
37 39 <textField isBlankWhenNull="true">
38   - <reportElement x="102" y="17" width="453" height="20" uuid="0c63ef23-5e35-4c22-81ed-dbd9a2fac964"/>
  40 + <reportElement x="157" y="17" width="398" height="20" uuid="0c63ef23-5e35-4c22-81ed-dbd9a2fac964"/>
39 41 <box leftPadding="5"/>
40 42 <textElement verticalAlignment="Middle">
41 43 <font size="12" isBold="true"/>
42 44 </textElement>
43 45 <textFieldExpression><![CDATA[$F{titulo1}]]></textFieldExpression>
44 46 </textField>
45   - <image isUsingCache="true" onErrorType="Icon">
46   - <reportElement positionType="Float" x="17" y="17" width="85" height="60" uuid="d161cd66-d9ef-43e9-b70a-3fb2c8b4eba4"/>
  47 + <image hAlign="Center" isUsingCache="true" onErrorType="Icon">
  48 + <reportElement positionType="Float" x="17" y="17" width="140" height="75" uuid="d161cd66-d9ef-43e9-b70a-3fb2c8b4eba4">
  49 + <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
  50 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  51 + </reportElement>
47 52 <imageExpression><![CDATA[new ByteArrayInputStream((byte[])$F{logo})]]></imageExpression>
48 53 </image>
49 54 <textField isBlankWhenNull="true">
50   - <reportElement x="102" y="57" width="453" height="20" uuid="7fc824c8-633f-40d4-8310-4d81780f2834"/>
  55 + <reportElement x="157" y="57" width="398" height="20" uuid="7fc824c8-633f-40d4-8310-4d81780f2834"/>
51 56 <box leftPadding="5"/>
52 57 <textElement verticalAlignment="Middle">
53 58 <font size="12" isBold="true"/>
... ...