diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
index 4095e2421..c27f3badc 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
@@ -274,7 +274,7 @@ public class RelatorioLinhasHorario extends Relatorio {
StringBuffer sql = new StringBuffer();
sql.append(" SELECT ");
- sql.append(" NVL(GR.DESCGRUPO, 'Não Informado') AS GRUPO_RUTA, ");
+ sql.append(" NVL(GR.DESCGRUPO, 'Não Informado') AS GRUPO_RUTA, ");
sql.append(" TO_CHAR(CJ.FECHORVIAJE, 'HH24:MI') AS HORA, ");
sql.append(" C.CORRIDA_ID AS SERVICO, ");
sql.append(" R.INDSENTIDOIDA AS SENTIDO, ");
@@ -286,8 +286,8 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" ORIGEM.CVEPARADA AS ORIGEM, ");
sql.append(" DESTINO.CVEPARADA AS DESTINO, ");
sql.append(" SUM(NVL(EE.IMPINGRESO, 0)) AS BAGAGENS, ");
- sql.append(" SUM(NVL(CJ.PRECIOBASE, 0)) AS PASSAGENS, ");
- sql.append(" SUM(NVL(CJ.IMPORTETAXAEMBARQUE, 0)) AS SEGURO, ");
+ sql.append(" SUM(NVL(CJ.PRECIOPAGADO, 0)) AS PASSAGENS, ");
+ sql.append(" SUM(NVL(CJ.IMPORTESEGURO, 0)) AS SEGURO, ");
sql.append(" ORD, ");
sql.append(" EXTRA, ");
@@ -297,8 +297,8 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" FROM (SELECT RS.RUTA_ID, ");
sql.append(" SUM(NVL(T.CANTKMREAL, 0)) AS EXTENSAO ");
sql.append(" FROM RUTA_SECUENCIA RS ");
- sql.append(" LEFT JOIN TRAMO T ");
- sql.append(" ON ( RS.TRAMO_ID = T.TRAMO_ID ) ");
+ sql.append(" INNER JOIN TRAMO T ON (RS.TRAMO_ID = T.TRAMO_ID) ");
+ sql.append(" WHERE RS.ACTIVO=1 AND T.ACTIVO=1 ");
sql.append(" GROUP BY RS.RUTA_ID) TB1, ");
sql.append(" (SELECT C.CORRIDA_ID, ");
@@ -342,7 +342,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" ON ( EE.CORRIDA_ID = C.CORRIDA_ID ");
sql.append(" AND EE.FECCORRIDA = C.FECCORRIDA ");
sql.append(" AND EE.TIPOEVENTOEXTRA_ID = 1 ) ");
- sql.append(" WHERE CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
+ sql.append(" WHERE CJ.MOTIVOCANCELACION_ID IS NULL AND CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
sql.append(" AND TB1.RUTA_ID = C.RUTA_ID ");
sql.append(" AND TB2.CORRIDA_ID = C.CORRIDA_ID ");
sql.append(" AND TB3.CORRIDA_ID = C.CORRIDA_ID ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper
index 0fe981fe6..ffdde2e83 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
index 2bd458714..b537c88f3 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
@@ -73,20 +73,10 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
+
@@ -98,9 +88,9 @@
-
+
-
+
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
index 40117db93..ef4a17621 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
@@ -21,6 +21,7 @@ import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Datebox;
+import org.zkoss.zul.Intbox;
import org.zkoss.zul.Paging;
import org.zkoss.zul.Radio;
import org.zkoss.zul.Textbox;
@@ -75,7 +76,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
private transient PagedListWrapper plwServico;
private MyListbox servicoList;
private MyListbox servicoListSelList;
- private Textbox txtCorridaId;
+ private Intbox txtCorridaId;
private ArrayList lsNumServico = new ArrayList();
@@ -248,12 +249,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
private void executarPesquisaServico() {
- Integer corridaId = 0;
- try {
- corridaId = Integer.parseInt(txtCorridaId.getValue());
- } catch (Exception e) {
- log.debug(e.getMessage());
- }
+ Integer corridaId = txtCorridaId.getValue();
servicoList.setData(corridaService.buscarGroupCorrridaId(corridaId, datInicial.getValue(), datFinal.getValue()));
@@ -269,6 +265,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
public void onClick$btnLimparServico(Event ev) {
servicoList.clearSelection();
+ servicoList.setData(new ArrayList());
lsNumServico.clear();
}
diff --git a/web/gui/relatorios/filtroRelatorioLinhasHorario.zul b/web/gui/relatorios/filtroRelatorioLinhasHorario.zul
index 7e32b7f6a..3642466d9 100644
--- a/web/gui/relatorios/filtroRelatorioLinhasHorario.zul
+++ b/web/gui/relatorios/filtroRelatorioLinhasHorario.zul
@@ -50,7 +50,7 @@
-
+