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

fixes bug #7663 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57748 d1611594-4594-4d17-8e1d-87c2c4800839
master
edgar 2016-07-08 13:04:40 +00:00
parent 35495b4aa2
commit 85791b86b0
9 changed files with 110 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java
View File

@ -6,12 +6,11 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.time.DateUtils; import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.entidad.Empleado; import com.rjconsultores.ventaboletos.entidad.Empleado;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
@ -52,6 +51,8 @@ public class RelatorioTripulacao extends Relatorio {
} }
private List<RelatorioTripulacaoBean> executeStatement(Short tipoTripulacao) throws SQLException, ParseException { private List<RelatorioTripulacaoBean> executeStatement(Short tipoTripulacao) throws SQLException, ParseException {
String tipoEmpleadoTramo;
Map<String, Object> parametros = this.getParametros(); Map<String, Object> parametros = this.getParametros();
Empresa empresa = (Empresa) parametros.get("empresa"); Empresa empresa = (Empresa) parametros.get("empresa");
Empleado empleado = (Empleado) parametros.get("empleado"); Empleado empleado = (Empleado) parametros.get("empleado");
@ -65,15 +66,19 @@ public class RelatorioTripulacao extends Relatorio {
switch (tipoTripulacao) { switch (tipoTripulacao) {
case CONDUCTOR1: case CONDUCTOR1:
sql.append(getSqlConductor1()); sql.append(getSqlConductor1());
tipoEmpleadoTramo = Labels.getLabel("relatorioTripulacao.conductor1");
break; break;
case CONDUCTOR2: case CONDUCTOR2:
sql.append(getSqlConductor2()); sql.append(getSqlConductor2());
tipoEmpleadoTramo = Labels.getLabel("relatorioTripulacao.conductor2");
break; break;
case GUARDIA1: case GUARDIA1:
sql.append(getSqlGuardian1()); sql.append(getSqlGuardian1());
tipoEmpleadoTramo = Labels.getLabel("relatorioTripulacao.guardia1");
break; break;
default: default:
sql.append(getSqlGuardian2()); sql.append(getSqlGuardian2());
tipoEmpleadoTramo = Labels.getLabel("relatorioTripulacao.guardia2");
break; break;
} }
@ -89,18 +94,30 @@ public class RelatorioTripulacao extends Relatorio {
System.out.println(sql.toString()); System.out.println(sql.toString());
return getDataFromResultSet(stmt.executeQuery()); return getDataFromResultSet(stmt.executeQuery(), tipoEmpleadoTramo);
} }
private List<RelatorioTripulacaoBean> getDataFromResultSet(ResultSet result) throws SQLException { private List<RelatorioTripulacaoBean> getDataFromResultSet(ResultSet result, String tipoEmpleadoTramo) throws SQLException {
List<RelatorioTripulacaoBean> lsDadosRelatorio = new ArrayList<RelatorioTripulacaoBean>(); List<RelatorioTripulacaoBean> lsDadosRelatorio = new ArrayList<RelatorioTripulacaoBean>();
RelatorioTripulacaoBean relatorioTripulacaoBean; RelatorioTripulacaoBean relatorioTripulacaoBean = null;
RelatorioTripulacaoBean relatorioTripulacaoBeanAnterior = null;
while (result.next()) { while (result.next()) {
if (relatorioTripulacaoBeanAnterior != null
&& relatorioTripulacaoBeanAnterior.getIdEmpleado().equals(result.getLong("empleadoId"))
&& relatorioTripulacaoBeanAnterior.getCorridaId().equals(result.getLong("corridaId"))) {
Double distancia = relatorioTripulacaoBean.getDistanciaKm();
distancia += result.getDouble("distanciaKm");
relatorioTripulacaoBean.setDistanciaKm(distancia);
relatorioTripulacaoBean.setNomeDestino(result.getString("nomeDestino"));
} else {
relatorioTripulacaoBean = new RelatorioTripulacaoBean(); relatorioTripulacaoBean = new RelatorioTripulacaoBean();
relatorioTripulacaoBean.setTipoEmpleadoTramo(tipoEmpleadoTramo);
relatorioTripulacaoBean.setIdEmpleado(result.getLong("empleadoId")); relatorioTripulacaoBean.setIdEmpleado(result.getLong("empleadoId"));
relatorioTripulacaoBean.setCorridaId(result.getLong("corridaId"));
relatorioTripulacaoBean.setNomeEmpleado(result.getString("nomeEmpleado")); relatorioTripulacaoBean.setNomeEmpleado(result.getString("nomeEmpleado"));
relatorioTripulacaoBean.setTipoEmpleado(result.getString("tipoEmpleado")); relatorioTripulacaoBean.setTipoEmpleado(result.getString("tipoEmpleado"));
relatorioTripulacaoBean.setCorridaId(result.getLong("corridaId"));
relatorioTripulacaoBean.setFecha(result.getDate("fecha")); relatorioTripulacaoBean.setFecha(result.getDate("fecha"));
relatorioTripulacaoBean.setNomeOrigem(result.getString("nomeOrigem")); relatorioTripulacaoBean.setNomeOrigem(result.getString("nomeOrigem"));
relatorioTripulacaoBean.setNomeDestino(result.getString("nomeDestino")); relatorioTripulacaoBean.setNomeDestino(result.getString("nomeDestino"));
@ -108,9 +125,13 @@ public class RelatorioTripulacao extends Relatorio {
relatorioTripulacaoBean.setNumSequencia(result.getLong("numSequencia")); relatorioTripulacaoBean.setNumSequencia(result.getLong("numSequencia"));
relatorioTripulacaoBean.setIdCorridaTramo(result.getLong("idCorridaTramo")); relatorioTripulacaoBean.setIdCorridaTramo(result.getLong("idCorridaTramo"));
relatorioTripulacaoBean.setHora(result.getString("hora")); relatorioTripulacaoBean.setHora(result.getString("hora"));
relatorioTripulacaoBeanAnterior = relatorioTripulacaoBean;
lsDadosRelatorio.add(relatorioTripulacaoBean); lsDadosRelatorio.add(relatorioTripulacaoBean);
} }
}
return lsDadosRelatorio; return lsDadosRelatorio;
} }
private void setDadosRelatorio(Collection collection) { private void setDadosRelatorio(Collection collection) {
@ -143,7 +164,7 @@ public class RelatorioTripulacao extends Relatorio {
+ " AND (:tipoEmpleado IS NULL OR tipo.DESCTIPO = :tipoEmpleado)" + " AND (:tipoEmpleado IS NULL OR tipo.DESCTIPO = :tipoEmpleado)"
+ " AND(:empleadoId =0 or emp.EMPLEADO_ID=:empleadoId)" + " AND(:empleadoId =0 or emp.EMPLEADO_ID=:empleadoId)"
+ " AND (:empresaId =0 OR (emp.EMPLEADO_ID IS NULL OR emp.EMPRESA_ID =:empresaId))" + " AND (:empresaId =0 OR (emp.EMPLEADO_ID IS NULL OR emp.EMPRESA_ID =:empresaId))"
+ " ORDER BY NOMBEMPLEADO, corridaId, hora "; + " ORDER BY NOMBEMPLEADO, corridaId, corridaTramo.FECCORRIDA, hora ";
} }
private String getSqlGuardian1() { private String getSqlGuardian1() {
@ -187,4 +208,5 @@ public class RelatorioTripulacao extends Relatorio {
+ " INNER JOIN EMPLEADO emp ON emp.EMPLEADO_ID = cond.EMPLEADO_ID" + " INNER JOIN EMPLEADO emp ON emp.EMPLEADO_ID = cond.EMPLEADO_ID"
+ " INNER JOIN TIPO_EMPLEADO tipo ON tipo.TIPOEMPLEADO_ID = emp.TIPOEMPLEADO_ID "; + " INNER JOIN TIPO_EMPLEADO tipo ON tipo.TIPOEMPLEADO_ID = emp.TIPOEMPLEADO_ID ";
} }
} }

7
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties
View File

@ -1,13 +1,14 @@
#geral #geral
label.noData=No se pudo obtener datos con los parâmetros reportados. label.noData=No se pudo obtener datos con los parâmetros reportados.
label.tipoEmpleadoTramo=Functi\u00F3n Ejercido
msg.a=a msg.a=a
#Labels header #Labels header
header.pagina=Página\: header.pagina=Página\:
header.data.hora=Data/Hora\: header.data.hora=Data/Hora\:
label.empleadoId=Empleado label.empleadoId=Empleado\:
label.empleadoNome=Nombre label.empleadoNome=Nombre\:
label.tipoEmpregado=Tipo label.tipoEmpregado=Tipo\:
#Labels detail #Labels detail
detail.fecha=Fecha detail.fecha=Fecha

7
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_pt.properties
View File

@ -1,13 +1,14 @@
#geral #geral
label.noData=Não há dados a serem apresentados para os filtros selecionados. label.noData=Não há dados a serem apresentados para os filtros selecionados.
label.tipoEmpleadoTramo=Fun\u00E7\u00E3o Exercida
msg.a=a msg.a=a
#Labels header #Labels header
header.pagina=Página\: header.pagina=Página\:
header.data.hora=Data/Hora\: header.data.hora=Data/Hora\:
label.empleadoId=Empregado label.empleadoId=Empregado\:
label.empleadoNome=Nome label.empleadoNome=Nome\:
label.tipoEmpregado=Tipo label.tipoEmpregado=Tipo\:
#Labels detail #Labels detail
detail.fecha=Data detail.fecha=Data

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

Binary file not shown.

104
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml
View File

@ -1,6 +1,6 @@
<?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="RelatorioTripulacao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d5ad1cbf-3b72-40fa-b0c7-0dd4a3aac974"> <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="RelatorioTripulacao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d5ad1cbf-3b72-40fa-b0c7-0dd4a3aac974">
<property name="ireport.zoom" value="1.7715610000000075"/> <property name="ireport.zoom" value="2.143588810000011"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<parameter name="titulo" class="java.lang.String" isForPrompting="false"> <parameter name="titulo" class="java.lang.String" isForPrompting="false">
@ -20,58 +20,73 @@
<field name="idEmpleado" class="java.lang.Long"/> <field name="idEmpleado" class="java.lang.Long"/>
<field name="corridaId" class="java.lang.Long"/> <field name="corridaId" class="java.lang.Long"/>
<field name="hora" class="java.lang.String"/> <field name="hora" class="java.lang.String"/>
<field name="tipoEmpleadoTramo" class="java.lang.String"/>
<variable name="totalKM" class="java.lang.Double" resetType="Group" resetGroup="empleado" calculation="Sum"> <variable name="totalKM" class="java.lang.Double" resetType="Group" resetGroup="empleado" calculation="Sum">
<variableExpression><![CDATA[$F{distanciaKm}]]></variableExpression> <variableExpression><![CDATA[$F{distanciaKm}]]></variableExpression>
<initialValueExpression><![CDATA[0.0]]></initialValueExpression> <initialValueExpression><![CDATA[0.0]]></initialValueExpression>
</variable> </variable>
<group name="tipoEmpleadoTramo">
<groupExpression><![CDATA[$F{tipoEmpleadoTramo}]]></groupExpression>
<groupHeader>
<band height="20">
<textField>
<reportElement uuid="4089971f-a6c6-43b7-adfb-1d1427a9e570" x="0" y="0" width="120" height="16"/>
<textElement>
<font size="12" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipoEmpleadoTramo}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
</group>
<group name="empleado"> <group name="empleado">
<groupExpression><![CDATA[$F{idEmpleado}]]></groupExpression> <groupExpression><![CDATA[$F{idEmpleado}]]></groupExpression>
<groupHeader> <groupHeader>
<band height="49"> <band height="33">
<textField> <textField>
<reportElement uuid="e148679a-25dc-4c96-9497-e872e126abd3" x="0" y="35" width="100" height="14"/> <reportElement uuid="e148679a-25dc-4c96-9497-e872e126abd3" x="13" y="18" width="100" height="14"/>
<textElement markup="none"> <textElement markup="none">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.corridaId}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.corridaId}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="a9bd4432-bc5f-459b-976a-d7a8f6dfd9a2" x="100" y="35" width="100" height="14"/> <reportElement uuid="a9bd4432-bc5f-459b-976a-d7a8f6dfd9a2" x="113" y="18" width="100" height="14"/>
<textElement markup="none"> <textElement markup="none">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.fecha}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.fecha}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="703ec7e6-40ca-4cbf-a0a1-295218e08434" x="300" y="35" width="100" height="14"/> <reportElement uuid="703ec7e6-40ca-4cbf-a0a1-295218e08434" x="313" y="18" width="100" height="14"/>
<textElement markup="none"> <textElement markup="none">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.nomeOrigem}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.nomeOrigem}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="3b5a4c87-70ca-4614-bf08-55847461064c" x="400" y="35" width="100" height="14"/> <reportElement uuid="3b5a4c87-70ca-4614-bf08-55847461064c" x="413" y="18" width="87" height="14"/>
<textElement markup="none"> <textElement markup="none">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.nomeDestino}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.nomeDestino}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="24f31a18-4f1a-4371-af7f-fa2b2e5d8d96" x="200" y="35" width="100" height="14"/> <reportElement uuid="24f31a18-4f1a-4371-af7f-fa2b2e5d8d96" x="213" y="18" width="100" height="14"/>
<textElement markup="none"> <textElement markup="none">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="6b84c912-0932-4851-aa4c-e1be076ffc6a" x="500" y="35" width="55" height="14"/> <reportElement uuid="6b84c912-0932-4851-aa4c-e1be076ffc6a" x="500" y="18" width="55" height="14"/>
<textElement textAlignment="Right" markup="none"> <textElement textAlignment="Right" markup="none">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{detail.distanciaKm}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.distanciaKm}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="560ecce1-2a4a-42b2-b2da-ef04ae8b2363" x="100" y="16" width="328" height="14"/> <reportElement uuid="560ecce1-2a4a-42b2-b2da-ef04ae8b2363" mode="Opaque" x="239" y="0" width="161" height="16" backcolor="#CCCCCC"/>
<textElement> <textElement>
<font size="10"/> <font size="10"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
@ -79,37 +94,37 @@
<textFieldExpression><![CDATA[$F{nomeEmpleado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeEmpleado}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="89628efb-c65d-4fc7-98ab-af7c1e3c9fa5" x="100" y="0" width="328" height="16"/> <reportElement uuid="89628efb-c65d-4fc7-98ab-af7c1e3c9fa5" mode="Opaque" x="155" y="0" width="84" height="16" backcolor="#CCCCCC"/>
<textElement markup="none"> <textElement markup="none">
<font size="12" isBold="true"/> <font size="10" isBold="true"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.empleadoNome}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.empleadoNome}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="cbdbd675-769a-4cac-af77-0f5876f60864" x="0" y="16" width="100" height="14"/> <reportElement uuid="cbdbd675-769a-4cac-af77-0f5876f60864" mode="Opaque" x="85" y="0" width="70" height="16" backcolor="#CCCCCC"/>
<textElement> <textElement>
<font size="10"/> <font size="10"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="cf168ea7-9011-4c9f-a86c-d0dc486b0db1" x="0" y="0" width="100" height="16"/> <reportElement uuid="cf168ea7-9011-4c9f-a86c-d0dc486b0db1" mode="Opaque" x="13" y="0" width="72" height="16" backcolor="#CCCCCC"/>
<textElement markup="none"> <textElement markup="none">
<font size="12" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.empleadoId}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.empleadoId}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="b24836bc-6214-4733-9851-243510f3eb7a" x="428" y="0" width="126" height="16"/> <reportElement uuid="b24836bc-6214-4733-9851-243510f3eb7a" mode="Opaque" x="400" y="0" width="80" height="16" backcolor="#CCCCCC"/>
<textElement markup="none"> <textElement markup="none">
<font size="12" isBold="true"/> <font size="11" isBold="true"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.tipoEmpregado}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.tipoEmpregado}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="7581d921-a9a6-4941-a02b-aa00d47cdff2" x="428" y="16" width="126" height="14"/> <reportElement uuid="7581d921-a9a6-4941-a02b-aa00d47cdff2" mode="Opaque" x="480" y="0" width="75" height="16" backcolor="#CCCCCC"/>
<textElement> <textElement>
<font size="10"/> <font size="10"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
@ -118,29 +133,12 @@
</textField> </textField>
</band> </band>
</groupHeader> </groupHeader>
<groupFooter>
<band height="25">
<textField pattern="###0.00;-###0.00">
<reportElement uuid="5e0eb385-d270-4f18-9d62-5eca221ec6a3" x="499" y="3" width="55" height="16"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$V{totalKM}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="92e7be05-350b-44fc-85da-1e7b1f583cfa" x="428" y="3" width="71" height="16"/>
<textElement textAlignment="Right"/>
<text><![CDATA[Total Km :]]></text>
</staticText>
<line>
<reportElement uuid="28bd3ea7-625a-426b-bc9a-540ab2fc269e" x="0" y="2" width="554" height="1"/>
</line>
</band>
</groupFooter>
</group> </group>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
</background> </background>
<title> <title>
<band height="36" splitType="Stretch"> <band height="40" splitType="Stretch">
<textField> <textField>
<reportElement uuid="f6832783-9c29-4cad-9f22-9720cfacf1b6" x="400" y="0" width="56" height="20"/> <reportElement uuid="f6832783-9c29-4cad-9f22-9720cfacf1b6" x="400" y="0" width="56" height="20"/>
<textElement/> <textElement/>
@ -223,50 +221,31 @@
</textField> </textField>
</band> </band>
</title> </title>
<pageHeader>
<band height="14">
<textField>
<reportElement uuid="593bd9bd-e7d6-4e3d-82c2-a96721d36a6d" x="446" y="0" width="77" height="12"/>
<textElement textAlignment="Right">
<font size="8"/>
<paragraph rightIndent="2"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" de "]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
<reportElement uuid="cff5acfb-b00b-497f-bcba-0b6b0a9790c1" x="523" y="0" width="32" height="12"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band>
</pageHeader>
<detail> <detail>
<band height="14"> <band height="20">
<textField pattern="dd/MM/yyyy"> <textField pattern="dd/MM/yyyy">
<reportElement uuid="86264348-3c96-4e1c-bfcf-6ae99678ad58" x="100" y="0" width="100" height="12"/> <reportElement uuid="86264348-3c96-4e1c-bfcf-6ae99678ad58" x="113" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{fecha}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{fecha}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="e29b00a0-9cec-4ab5-af59-7eb97369cfa2" x="300" y="0" width="100" height="12"/> <reportElement uuid="e29b00a0-9cec-4ab5-af59-7eb97369cfa2" x="313" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nomeOrigem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeOrigem}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="cf818fc9-459e-4a3f-9c56-48105b3f21ef" x="200" y="0" width="100" height="12"/> <reportElement uuid="cf818fc9-459e-4a3f-9c56-48105b3f21ef" x="213" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="914fa266-37c9-49d2-8b33-c34c306ea8fd" x="400" y="0" width="100" height="12"/> <reportElement uuid="914fa266-37c9-49d2-8b33-c34c306ea8fd" x="413" y="0" width="87" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
@ -280,19 +259,20 @@
<textFieldExpression><![CDATA[$F{distanciaKm}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{distanciaKm}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="57fc4cf8-8a8e-4112-b017-c5a1fc388b9a" x="0" y="0" width="100" height="12"/> <reportElement uuid="57fc4cf8-8a8e-4112-b017-c5a1fc388b9a" x="13" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
<paragraph leftIndent="4"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
</textField> </textField>
</band> </band>
</detail> </detail>
<noData> <noData>
<band height="19"> <band height="17">
<textField> <textField>
<reportElement uuid="46c91d61-62ce-4350-8ea5-19fb20d611bd" x="0" y="0" width="554" height="15"/> <reportElement uuid="46c91d61-62ce-4350-8ea5-19fb20d611bd" x="0" y="0" width="554" height="15"/>
<textElement/> <textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$R{label.noData}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.noData}]]></textFieldExpression>
</textField> </textField>
</band> </band>

8
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioTripulacaoBean.java
View File

@ -14,6 +14,7 @@ public class RelatorioTripulacaoBean {
private Double distanciaKm; private Double distanciaKm;
private Long numSequencia; private Long numSequencia;
private Long idCorridaTramo; private Long idCorridaTramo;
private String tipoEmpleadoTramo;
public Long getIdEmpleado() { public Long getIdEmpleado() {
return idEmpleado; return idEmpleado;
@ -84,4 +85,11 @@ public class RelatorioTripulacaoBean {
public void setIdCorridaTramo(Long idCorridaTramo) { public void setIdCorridaTramo(Long idCorridaTramo) {
this.idCorridaTramo = idCorridaTramo; this.idCorridaTramo = idCorridaTramo;
} }
public String getTipoEmpleadoTramo() {
return tipoEmpleadoTramo;
}
public void setTipoEmpleadoTramo(String tipoEmpleadoTramo) {
this.tipoEmpleadoTramo = tipoEmpleadoTramo;
}
} }

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarUsuarioController.java
View File

@ -524,10 +524,10 @@ public class EditarUsuarioController extends MyGenericForwardComposer {
} }
public void onChange$cmbParada() { public void onChange$cmbParada() {
Comboitem cbiParada = cmbParada.getSelectedItem(); Comboitem paradaComboItem = cmbParada.getSelectedItem();
if (cbiParada != null) { if (paradaComboItem != null) {
lsPuntoVenta = puntoVentaService.buscaPuntoVentaParada((Parada) cmbParada.getSelectedItem().getValue()); lsPuntoVenta = puntoVentaService.buscaPuntoVentaParada((Parada)paradaComboItem.getValue());
cmbPuntoVenta.setModel(new ListModelList(lsPuntoVenta)); cmbPuntoVenta.setModel(new ListModelList(lsPuntoVenta));
if (lsPuntoVenta.isEmpty()) { if (lsPuntoVenta.isEmpty()) {
cmbPuntoVenta.setText((String) null); cmbPuntoVenta.setText((String) null);

4
web/WEB-INF/i3-label_es_MX.label
View File

@ -590,6 +590,10 @@ relatorioTripulacaoController.radioCondutor=Conductor
relatorioTripulacaoController.radioGuarda=Guardia relatorioTripulacaoController.radioGuarda=Guardia
relatorioTripulacaoController.radioTodos=Todos relatorioTripulacaoController.radioTodos=Todos
relatorioTripulacaoController.lbTipoTripulacao=Función relatorioTripulacaoController.lbTipoTripulacao=Función
relatorioTripulacao.conductor1=Conductor1
relatorioTripulacao.conductor2=Conductor2
relatorioTripulacao.guardia1=Guarda1
relatorioTripulacao.guardia2=Guarda2
# Pantalla Editar clase # Pantalla Editar clase
editarClaseServicioController.window.title = Clase de servicio editarClaseServicioController.window.title = Clase de servicio

4
web/WEB-INF/i3-label_pt_BR.label
View File

@ -470,6 +470,10 @@ relatorioTripulacaoController.radioCondutor=Condutor
relatorioTripulacaoController.radioGuarda=Guarda relatorioTripulacaoController.radioGuarda=Guarda
relatorioTripulacaoController.radioTodos=Todos relatorioTripulacaoController.radioTodos=Todos
relatorioTripulacaoController.lbTipoTripulacao=Função relatorioTripulacaoController.lbTipoTripulacao=Função
relatorioTripulacao.conductor1=Condutor1
relatorioTripulacao.conductor2=Condutor2
relatorioTripulacao.guardia1=Guarda1
relatorioTripulacao.guardia2=Guarda2
#Receita Diária por Agência #Receita Diária por Agência
relatorioReceitaDiariaAgenciaController.window.title = Relatório de Receita Diária por Agência relatorioReceitaDiariaAgenciaController.window.title = Relatório de Receita Diária por Agência