diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 2b6d73514..7a936e47e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -37,16 +37,19 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("tarifa", rset.getBigDecimal("tarifa")); dataResult.put("pedagio", rset.getBigDecimal("pedagio")); dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque")); - dataResult.put("seguro", rset.getBigDecimal("seguro")); + dataResult.put("seguroOpcional", rset.getBigDecimal("valorSegOpcional")); dataResult.put("outros", rset.getBigDecimal("outros")); dataResult.put("tipoClasse", rset.getString("tipoClasse")); - dataResult.put("linha", rset.getString("linha")); dataResult.put("empresa", rset.getString("empresa")); - dataResult.put("dataVigenciaInicial", rset.getDate("dataVigenciaInicial")); - dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); - dataResult.put("idLinha", rset.getInt("idLinha")); - dataResult.put("idVigencia", rset.getInt("idVigencia")); + if (!isLayoutArtesp) { + dataResult.put("seguro", rset.getBigDecimal("seguro")); + dataResult.put("linha", rset.getString("linha")); + dataResult.put("dataVigenciaInicial", rset.getDate("dataVigenciaInicial")); + dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); + dataResult.put("idLinha", rset.getInt("idLinha")); + dataResult.put("idVigencia", rset.getInt("idVigencia")); + } this.dados.add(dataResult); } @@ -62,12 +65,16 @@ public class RelatorioTabelaPreco extends Relatorio { private String getSql() { StringBuilder sql = new StringBuilder(); - sql.append("SELECT pOrigem.DESCPARADA as origem, "); + if (isLayoutArtesp) { + sql.append("SELECT DISTINCT origem,destino,tarifa,pedagio,taxaEmbarque,valorSegOpcional,outros,tipoClasse,empresa FROM ("); + } + sql.append(" SELECT pOrigem.DESCPARADA as origem, "); sql.append(" pDestino.DESCPARADA as destino, "); sql.append(" COALESCE(t.precio,0) as tarifa, "); sql.append(" COALESCE(t.IMPORTEPEDAGIO, 0) as pedagio, "); sql.append(" COALESCE(t.IMPORTETAXAEMBARQUE, 0) as taxaEmbarque, "); sql.append(" COALESCE(t.IMPORTESEGURO, 0) as seguro, "); + sql.append(" COALESCE(segop.VALOR, 0) as valorSegOpcional, "); sql.append(" COALESCE(t.IMPORTEOUTROS, 0) as outros, "); sql.append(" cs.DESCCLASE as tipoClasse, "); sql.append(" r.DESCRUTA as linha, "); @@ -88,6 +95,8 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append("INNER JOIN RUTA_COMBINACION rc ON rc.RUTA_ID = r.RUTA_ID "); sql.append("INNER JOIN TRAMO tr ON tr.TRAMO_ID = rc.TRAMO_ID "); sql.append("INNER JOIN ORGAO_CONCEDENTE o ON o.ORGAOCONCEDENTE_ID = r.ORGAOCONCEDENTE_ID "); + sql.append("INNER JOIN SEGURADORA_EMPRESA se on se.EMPRESA_ID=e.EMPRESA_ID "); + sql.append("LEFT JOIN SEGVKM segOp on segOp.KM=tr.CANTKMREAL and segOp.SERIE=se.SERIESEGURADORA "); sql.append("WHERE rc.INDVENTA = 1 "); sql.append("AND rc.ACTIVO = 1 "); sql.append("AND tr.ACTIVO = 1 "); @@ -113,7 +122,11 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" AND tr.DESTINO_ID= " + parametros.get("destinoId")); } - sql.append(" ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA "); + sql.append(" ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA"); + + if (isLayoutArtesp) { + sql.append(") ORDER BY destino"); + } return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties index a66115839..ce4609ed3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties @@ -6,7 +6,7 @@ label.origem=Origem label.destino=Destino label.tarifa=Tarifa label.pedagio=Pedágio -label.taxaEmbarque=Taxa +label.taxaEmbarque=Taxa de Embarque label.seguro=Seguro label.outros=Outros label.tipoClasse=Classe @@ -17,6 +17,6 @@ label.total=Total label.orgacaoConcedente=Orgão Concedente label.totalSemSeguro=Total Sem Seguro Facultativo -label.totalComSeguro=Total Com Seguro Facultativo +label.totalComSeguro=Total Com Seguro Facultativo (Opcional) label.valorSeguro=Valor do Seguro Facultativo label.msgAviso=A CONTRATAÇÃO DO SEGURO DE ACIDENTES PESSOAIS É FACULTATIVA \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper index 7730cd8ce..d366cadae 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml index a2d8365f2..27ee89b30 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml @@ -1,6 +1,6 @@ - - + + @@ -9,6 +9,7 @@ + @@ -26,25 +27,25 @@ ++$F{taxaEmbarque}.doubleValue() ++$F{seguroOpcional}.doubleValue()]]> - <band height="30" splitType="Stretch"> + <band height="36" splitType="Stretch"> <textField> - <reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="264" height="29" backcolor="#FFFF66"/> + <reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="321" height="33" backcolor="#FFFF66"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <font fontName="Arial" size="20" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="264" y="0" width="538" height="29"/> + <reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="321" y="0" width="539" height="33"/> <textElement verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <font fontName="Arial" size="14" isBold="true"/> <paragraph leftIndent="4"/> </textElement> <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> @@ -54,16 +55,18 @@ <pageHeader> <band height="20" splitType="Stretch"> <staticText> - <reportElement uuid="325e439b-ecaf-48cb-9c09-387c0649e47b" x="0" y="0" width="802" height="20"/> - <textElement textAlignment="Center"/> + <reportElement uuid="325e439b-ecaf-48cb-9c09-387c0649e47b" x="0" y="0" width="860" height="20"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="12" isBold="true"/> + </textElement> <text><![CDATA[Tabela de Preços R$]]></text> </staticText> </band> </pageHeader> <columnHeader> - <band height="25" splitType="Stretch"> + <band height="29" splitType="Stretch"> <textField> - <reportElement uuid="2bc93d5d-8e74-4b8b-8808-080060e8cad1" mode="Opaque" x="0" y="0" width="321" height="24" forecolor="#000000" backcolor="#FFFF66"/> + <reportElement uuid="2bc93d5d-8e74-4b8b-8808-080060e8cad1" mode="Opaque" x="0" y="0" width="321" height="28" forecolor="#000000" backcolor="#FFFF66"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -72,12 +75,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="10" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="74398eb5-f168-4dff-a38d-b23b11361b96" mode="Opaque" x="321" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="74398eb5-f168-4dff-a38d-b23b11361b96" mode="Opaque" x="321" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -86,12 +89,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.tarifa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="571d26cc-b563-4f10-8d8a-1ee49678088a" mode="Opaque" x="401" y="1" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="571d26cc-b563-4f10-8d8a-1ee49678088a" mode="Opaque" x="407" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -100,12 +103,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.pedagio}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="78aa7d0c-aa5e-43b0-a7eb-5de12d80db4f" mode="Opaque" x="481" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="78aa7d0c-aa5e-43b0-a7eb-5de12d80db4f" mode="Opaque" x="493" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -114,12 +117,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.taxaEmbarque}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="4a9bdb71-945e-48ce-a495-fdd4eee1b1e2" mode="Opaque" x="561" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="4a9bdb71-945e-48ce-a495-fdd4eee1b1e2" mode="Opaque" x="579" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -128,12 +131,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.totalSemSeguro}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="50b8dc32-c117-444f-b819-9b4c2ff954bd" mode="Opaque" x="722" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="50b8dc32-c117-444f-b819-9b4c2ff954bd" mode="Opaque" x="752" y="0" width="108" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -142,12 +145,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.totalComSeguro}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a08041c7-23de-4505-86bc-f009082b2faf" mode="Opaque" x="641" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="a08041c7-23de-4505-86bc-f009082b2faf" mode="Opaque" x="665" y="0" width="87" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -156,15 +159,15 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorSeguro}]]></textFieldExpression> </textField> </band> </columnHeader> <detail> - <band height="20" splitType="Stretch"> - <textField> + <band height="22" splitType="Stretch"> + <textField pattern=""> <reportElement uuid="a36a0fa9-3f68-416b-ba5b-3221bb3b6353" x="0" y="0" width="321" height="20"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -174,13 +177,13 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement> - <font size="10" isBold="true"/> + <font fontName="Arial" size="12" isBold="true"/> <paragraph leftIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{destino}+" ("+$F{tipoClasse}+")"]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="fefa6e89-eec1-424e-bc72-bec86ee9eb1b" x="322" y="0" width="80" height="20"/> + <reportElement uuid="fefa6e89-eec1-424e-bc72-bec86ee9eb1b" x="321" y="0" width="86" height="20" forecolor="#333333"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -188,14 +191,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="10" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="8452d6c9-7348-4c6a-965f-e127b5fd9830" x="721" y="0" width="80" height="20"/> + <reportElement uuid="8452d6c9-7348-4c6a-965f-e127b5fd9830" x="752" y="0" width="108" height="20"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -203,14 +206,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="12" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$V{totalSeguro}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="4d222ca8-11b3-4979-8928-71b2995e3bdf" x="641" y="0" width="80" height="20"/> + <reportElement uuid="a7c2dd13-c0c0-4a7e-9782-b758b6176b1c" x="579" y="0" width="86" height="20"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -218,29 +221,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> - <paragraph rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression> - </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="a7c2dd13-c0c0-4a7e-9782-b758b6176b1c" x="561" y="0" width="80" height="20"/> - <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> - <pen lineWidth="0.25" lineColor="#CCCCCC"/> - <topPen lineWidth="0.25" lineColor="#CCCCCC"/> - <leftPen lineWidth="0.25" lineColor="#CCCCCC"/> - <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> - <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> - </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="12" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$V{total}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="61b08629-ac62-475b-96c8-d88aedcf87ef" x="481" y="0" width="80" height="20"/> + <reportElement uuid="61b08629-ac62-475b-96c8-d88aedcf87ef" x="493" y="0" width="86" height="20" forecolor="#333333"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -248,14 +236,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="10" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{taxaEmbarque}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="4233bd79-2a8d-4b1b-88b7-a235f79b1227" x="402" y="0" width="80" height="20"/> + <reportElement uuid="4233bd79-2a8d-4b1b-88b7-a235f79b1227" x="407" y="0" width="86" height="20" forecolor="#333333"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -263,12 +251,26 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="10" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression> </textField> + <textField pattern="###0.00;-###0.00"> + <reportElement uuid="9a062a18-ecb7-4297-9c1b-b6397f1844a1" x="665" y="0" width="87" height="20" forecolor="#333333"/> + <box leftPadding="1" rightPadding="1"> + <pen lineWidth="0.25" lineColor="#CCCCCC"/> + <topPen lineWidth="0.25" lineColor="#CCCCCC"/> + <leftPen lineWidth="0.25" lineColor="#CCCCCC"/> + <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> + <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> + </box> + <textElement textAlignment="Center"> + <font fontName="Arial" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{seguroOpcional}]]></textFieldExpression> + </textField> </band> </detail> <pageFooter> @@ -280,9 +282,9 @@ </graphicElement> </rectangle> <textField> - <reportElement uuid="b7957c63-89ec-4009-b196-373a274b59e1" mode="Opaque" x="172" y="15" width="630" height="29" backcolor="#CCCCCC"/> - <textElement verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <reportElement uuid="b7957c63-89ec-4009-b196-373a274b59e1" mode="Opaque" x="0" y="15" width="860" height="29" backcolor="#CCCCCC"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="Arial" size="10" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.msgAviso}]]></textFieldExpression> </textField> @@ -295,9 +297,9 @@ <noData> <band height="27"> <textField> - <reportElement uuid="5954ac3d-3873-40e1-b643-cd910fa11ef2" x="0" y="1" width="801" height="26"/> + <reportElement uuid="5954ac3d-3873-40e1-b643-cd910fa11ef2" x="0" y="1" width="860" height="26"/> <textElement textAlignment="Center" markup="none"> - <font size="11" isBold="true"/> + <font fontName="Arial" size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> </textField>