fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#23182 

dev: Aristides
qua:



git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108662 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2021-09-09 19:51:44 +00:00
parent a3dfdb0072
commit 85deb5d854
6 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java
View File

@ -92,6 +92,7 @@ public class RelatorioEncerramentoCheckin extends Relatorio {
bean.setLocalidade(rs.getString("localidade"));
bean.setDataEncerramento(formatadorDataHora.format(rs.getDate("data_encerramento")));
bean.setUsuario(rs.getString("usuario"));
bean.setImei(rs.getString("imei"));
lsDadosRelatorio.add(bean);
}
@ -125,9 +126,10 @@ public class RelatorioEncerramentoCheckin extends Relatorio {
sb.append("cc.feccorrida as data_servico, ");
sb.append("p.cveparada || ' - ' || p.descparada as localidade, ");
sb.append("cc.fechorcerrado as data_encerramento, ");
sb.append("u.nombusuario as usuario ");
sb.append("u.nombusuario as usuario, ");
sb.append("cc.imei_embarcada as imei ");
sb.append("from checkin_cerrado cc ");
sb.append("join corrida c on c.corrida_id = cc.corrida_id ");
sb.append("join corrida c on c.corrida_id = cc.corrida_id and c.feccorrida = cc.feccorrida ");
sb.append("join parada p on p.parada_id = cc.origen_id ");
sb.append("join usuario u on u.usuario_id = cc.usuario_id ");

3
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties
View File

@ -14,4 +14,5 @@ detail.servico=Servi
detail.data.servico=Data Serviço
detail.localidade=Localidade
detail.data.encerramento=Data Encerramento
detail.usuario.operacao=Usuário da Operação
detail.usuario.operacao=Usuário da Operação
detail.imei=Dispositivo

3
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties
View File

@ -14,4 +14,5 @@ detail.servico=Servi
detail.data.servico=Data Serviço
detail.localidade=Localidade
detail.data.encerramento=Data Encerramento
detail.usuario.operacao=Usuário da Operação
detail.usuario.operacao=Usuário da Operação
detail.imei=Dispositivo

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jasper
View File

Binary file not shown.

33
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jrxml
View File

@ -1,7 +1,7 @@
<?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="RelatorioEncerramentoCheckin" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0e8aff42-5ba8-48ac-9950-da8178561888">
<property name="ireport.zoom" value="1.6105100000000014"/>
<property name="ireport.x" value="0"/>
<property name="ireport.zoom" value="1.7715610000000017"/>
<property name="ireport.x" value="358"/>
<property name="ireport.y" value="0"/>
<parameter name="TITULO" class="java.lang.String"/>
<parameter name="PERIODO_SERVICO" class="java.lang.String"/>
@ -12,6 +12,7 @@
<field name="localidade" class="java.lang.String"/>
<field name="dataEncerramento" class="java.lang.String"/>
<field name="usuario" class="java.lang.String"/>
<field name="imei" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
</background>
@ -24,7 +25,7 @@
<reportElement uuid="481b2107-ee62-4815-8a89-8435d34384c8" x="0" y="76" width="555" height="1"/>
</line>
<textField isBlankWhenNull="true">
<reportElement uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2" x="111" y="40" width="221" height="15"/>
<reportElement uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2" x="111" y="40" width="444" height="15"/>
<textElement verticalAlignment="Middle">
<font size="9"/>
</textElement>
@ -55,21 +56,21 @@
<textFieldExpression><![CDATA[$R{header.pagina} + "" + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="48f1a994-4bbe-4b8e-948f-81542fa792c3" x="111" y="56" width="433" height="15"/>
<reportElement uuid="48f1a994-4bbe-4b8e-948f-81542fa792c3" x="111" y="56" width="444" height="15"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="9"/>
</textElement>
<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0" x="111" y="24" width="221" height="15"/>
<reportElement uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0" x="111" y="24" width="444" height="15"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="9"/>
</textElement>
<textFieldExpression><![CDATA[$P{PERIODO_SERVICO}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy">
<reportElement uuid="9bc31956-04ad-43d0-bcee-08f7b5bf1145" x="0" y="0" width="343" height="20"/>
<reportElement uuid="9bc31956-04ad-43d0-bcee-08f7b5bf1145" x="0" y="0" width="454" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Top">
<font size="14" isBold="true"/>
</textElement>
@ -130,16 +131,23 @@
<textFieldExpression><![CDATA[$R{detail.data.encerramento}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="f5383c8e-7e57-4874-ab94-4e96f2840645" x="389" y="0" width="166" height="12"/>
<reportElement uuid="f5383c8e-7e57-4874-ab94-4e96f2840645" x="389" y="0" width="93" height="12"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.usuario.operacao}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="4a677987-fddd-4fa9-9da5-921d98b6c732" x="482" y="0" width="73" height="12"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.imei}]]></textFieldExpression>
</textField>
</band>
</columnHeader>
<detail>
<band height="18" splitType="Stretch">
<band height="11" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="6ef05dfb-fea9-451c-a45a-1dc3f766af84" stretchType="RelativeToBandHeight" x="0" y="0" width="54" height="10"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
@ -169,12 +177,19 @@
<textFieldExpression><![CDATA[$F{dataEncerramento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="129d8b3b-6977-471f-b9d1-025267746e7d" stretchType="RelativeToBandHeight" x="389" y="0" width="166" height="10"/>
<reportElement uuid="129d8b3b-6977-471f-b9d1-025267746e7d" stretchType="RelativeToBandHeight" x="389" y="0" width="93" height="10"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{usuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="6ed97cc2-d6ef-4878-9740-5d35536f4371" stretchType="RelativeToBandHeight" x="482" y="0" width="73" height="10"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{imei}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>

9
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java
View File

@ -7,6 +7,7 @@ public class RelatorioEncerramentoCheckinBean {
private String localidade;
private String dataEncerramento;
private String usuario;
private String imei;
public Integer getServico() {
return servico;
@ -47,4 +48,12 @@ public class RelatorioEncerramentoCheckinBean {
public void setUsuario(String usuario) {
this.usuario = usuario;
}
public String getImei() {
return imei;
}
public void setImei(String imei) {
this.imei = imei;
}
}