diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jasper index 08ea98082..6e499d10e 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jrxml index 58a1c9e39..13f8e55bd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDiario.jrxml @@ -1,10 +1,14 @@ - + - + + + + + @@ -54,61 +58,52 @@ - <band height="70" splitType="Stretch"> + <band height="25" splitType="Stretch"> <staticText> - <reportElement uuid="f81d2d9f-20d9-41f1-93a1-78cec7136628" key="staticText-19" x="161" y="23" width="493" height="25"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font fontName="SansSerif" size="12" isBold="true" pdfFontName="Helvetica-Bold"/> + <reportElement key="staticText-19" x="0" y="0" width="826" height="25" uuid="f81d2d9f-20d9-41f1-93a1-78cec7136628"/> + <textElement textAlignment="Left" verticalAlignment="Top"> + <font fontName="SansSerif" size="14" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <text><![CDATA[CONSULTA ESTATÍSTICA OPERACIONAL DE OCUPAÇÃO POR HORÁRIO ]]></text> </staticText> - <line> - <reportElement uuid="adbc5237-fbf6-4aea-8a12-0551540eea89" key="line-1" x="5" y="3" width="865" height="1"/> - </line> - <line> - <reportElement uuid="1473fee7-65f0-4b9c-a05b-8730be0cb4ad" key="line-2" x="5" y="67" width="864" height="1"/> - </line> - <textField pattern="dd/MM/yyyy" isBlankWhenNull="false"> - <reportElement uuid="49fb0075-804d-4f45-a200-8b01915e4f4c" key="textField-3" x="782" y="48" width="83" height="17"/> - <textElement textAlignment="Right"> - <font fontName="SansSerif"/> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement x="826" y="0" width="164" height="25" uuid="49885dbe-d70d-443f-aeb2-e9eb1f7450e8"/> + <textElement textAlignment="Right" verticalAlignment="Top"> + <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> </band> - - - - + + + + - - - - - - - - - - - - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + @@ -122,113 +117,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + - - - - - - - - - - + + + + + + + + - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + @@ -236,26 +164,21 @@ - - + + + + - + - - - - - - - - - + + @@ -263,7 +186,7 @@ - + @@ -272,47 +195,27 @@ - + - - - - - + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -320,124 +223,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - - + + + + - + + + + + + + + + + + + @@ -446,69 +262,40 @@ - + + + + - - - - - - - - - - + + + - - + + - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -519,54 +306,57 @@ + + + - + - + - + - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java index f708ce407..58aa2ace8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java @@ -44,6 +44,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; */ @Controller("relatorioDemandasController") @Scope("prototype") +@SuppressWarnings({ "rawtypes", "unchecked", "unused" }) public class RelatorioDemandasController extends MyGenericForwardComposer { /** @@ -154,13 +155,12 @@ public class RelatorioDemandasController extends MyGenericForwardComposer { * @throws Exception * */ - @SuppressWarnings({ "rawtypes", "unchecked" }) private void executarRelatorio() throws Exception { Relatorio relatorio; Map parametros = new HashMap(); StringBuilder filtro = new StringBuilder(); - filtro.append("Empresa: "); + filtro.append(" Empresa: "); Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); if (itemEmpresa != null) { Empresa empresa = (Empresa) itemEmpresa.getValue(); @@ -171,7 +171,7 @@ public class RelatorioDemandasController extends MyGenericForwardComposer { filtro.append(" Todas;"); } - filtro.append("Linha: "); + filtro.append(" Linha: "); Comboitem itemLinha = cmbLinha.getSelectedItem(); if (itemLinha != null) { Ruta linha = (Ruta) itemLinha.getValue(); @@ -182,7 +182,7 @@ public class RelatorioDemandasController extends MyGenericForwardComposer { filtro.append(" Todas;"); } - filtro.append("Origem: "); + filtro.append(" Origem: "); Comboitem itemOrigem = cmbOrigem.getSelectedItem(); if (itemOrigem != null) { Parada origem = (Parada) itemOrigem.getValue(); @@ -204,7 +204,7 @@ public class RelatorioDemandasController extends MyGenericForwardComposer { parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); - filtro.append("Tipo de Servio: "); + filtro.append(" Tipo de Servio: "); if (!todos.isChecked()) { if (normal.isChecked()) { parametros.put("TIPO_SERVICO", Integer.valueOf(normal.getValue())); @@ -218,7 +218,7 @@ public class RelatorioDemandasController extends MyGenericForwardComposer { } SimpleDateFormat formatDate = new SimpleDateFormat("hh:mm"); - filtro.append("Hora de Sada: "); + filtro.append(" Hora de Sada: "); if(horaInicial.getValue()!= null){ filtro.append("De ");