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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29915 d1611594-4594-4d17-8e1d-87c2c4800839

master
rodrigo 2013-08-14 20:12:10 +00:00
parent 0c31402426
commit 041b97d081
5 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
View File

@ -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 ");

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

Binary file not shown.

18
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
View File

@ -73,20 +73,10 @@
<textElement/>
<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy">
<reportElement uuid="1b08c6ad-b995-4fec-aab0-88534f3a3f13" x="49" y="40" width="53" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{DATA_INICIO}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="eac5ed08-4a34-42e5-807e-2d40be1cc0f5" x="102" y="40" width="24" height="20"/>
<reportElement uuid="eac5ed08-4a34-42e5-807e-2d40be1cc0f5" x="49" y="40" width="182" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[" à"]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy">
<reportElement uuid="caf9beb2-d99f-4fa1-8558-18cf2fe17085" x="126" y="40" width="55" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIO}) + " à " + new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL})]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="77235663-6b8a-411f-89be-24b315b65adb" x="648" y="0" width="56" height="20"/>
@ -98,9 +88,9 @@
<textElement/>
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm:ss">
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement uuid="efdae9bf-3550-4620-acd0-20c9c7b0e3b1" x="704" y="0" width="98" height="20"/>
<textElement textAlignment="Right"/>
<textElement textAlignment="Left"/>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>

11
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
View File

@ -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<Corrida> plwServico;
private MyListbox servicoList;
private MyListbox servicoListSelList;
private Textbox txtCorridaId;
private Intbox txtCorridaId;
private ArrayList<Corrida> lsNumServico = new ArrayList<Corrida>();
@ -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<Corrida>());
lsNumServico.clear();
}

2
web/gui/relatorios/filtroRelatorioLinhasHorario.zul
View File

@ -50,7 +50,7 @@
<bandpopup>
<vbox>
<hbox>
<textbox id="txtCorridaId" />
<intbox id="txtCorridaId" />
<button id="btnPesquisaServico"
image="/gui/img/find.png"
label="${c:l('relatorioLinhasHorarioController.btnPesquisa.label')}" />