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

fixes bug#23201 

dev: Wallace
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109933 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2021-12-07 20:30:00 +00:00
parent e4af955466
commit d498ef6cdb
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

10
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jrxml
View File

@ -112,7 +112,11 @@
<textField> <textField>
<reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="82" y="37" width="695" height="20"/> <reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="82" y="37" width="695" height="20"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression> <textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) :
(
$P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : ""
)
)]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="31b4831f-a97b-44a1-a30f-ba93c667fa81" x="82" y="57" width="695" height="20" isRemoveLineWhenBlank="true"/> <reportElement uuid="31b4831f-a97b-44a1-a30f-ba93c667fa81" x="82" y="57" width="695" height="20" isRemoveLineWhenBlank="true"/>
@ -279,7 +283,7 @@
<textElement textAlignment="Center"/> <textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="82cfcbd9-ad4a-47e8-a166-e0a48c207387" stretchType="RelativeToTallestObject" x="319" y="0" width="82" height="16" isPrintWhenDetailOverflows="true"/> <reportElement uuid="82cfcbd9-ad4a-47e8-a166-e0a48c207387" stretchType="RelativeToTallestObject" x="319" y="0" width="82" height="16" isPrintWhenDetailOverflows="true"/>
<box> <box>
<bottomPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/>
@ -319,7 +323,7 @@
<textElement textAlignment="Center"/> <textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{descOrigem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descOrigem}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="HH:mm" isBlankWhenNull="true">
<reportElement uuid="ab7a3319-6e43-4ed9-bb0e-114f3d072da8" stretchType="RelativeToTallestObject" x="401" y="0" width="82" height="16" isPrintWhenDetailOverflows="true"/> <reportElement uuid="ab7a3319-6e43-4ed9-bb0e-114f3d072da8" stretchType="RelativeToTallestObject" x="401" y="0" width="82" height="16" isPrintWhenDetailOverflows="true"/>
<box> <box>
<bottomPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/>

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGRController.java
View File

@ -250,8 +250,9 @@ public class RelatorioGratuidadeAGRController extends MyGenericForwardComposer {
if(txtCliente.getValue() != null && !txtCliente.getValue().equals("") ){ if(txtCliente.getValue() != null && !txtCliente.getValue().equals("") ){
Filter filterNome = new Filter("nombcliente", txtCliente.getValue() + "%", Filter.OP_ILIKE); Filter filterNome = new Filter("nombcliente", txtCliente.getValue() + "%", Filter.OP_ILIKE);
Filter filterCpf = new Filter("numIdentificaUno", txtCliente.getValue() + "%", Filter.OP_ILIKE); Filter filterCpf = new Filter("numIdentificaUno", txtCliente.getValue() + "%", Filter.OP_ILIKE);
Filter filterCpf2 = new Filter("numIdentificaDos", txtCliente.getValue() + "%", Filter.OP_ILIKE);
clienteBusqueda.addFilterOr( filterNome, filterCpf ); clienteBusqueda.addFilterOr( filterNome, filterCpf, filterCpf2 );
clienteBusqueda.addFilterEqual("activo", Boolean.TRUE); clienteBusqueda.addFilterEqual("activo", Boolean.TRUE);
clienteBusqueda.addSortAsc("nombcliente"); clienteBusqueda.addSortAsc("nombcliente");