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

fixes bug #9064 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69879 d1611594-4594-4d17-8e1d-87c2c4800839
master
eduardo.dicarde 2017-06-13 14:30:26 +00:00
parent d9d785496f
commit d8eb1b275d
9 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,4 +25,5 @@ label.preco=Valor
label.debitoCredito=D/C
label.fecmodif=Dt. Alt.
label.tipoventa=Tipo Venda
label.tipo=Tipo
label.tipo=Tipo
label.numpendencia=Nº Pendência

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

Binary file not shown.

32
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jrxml
View File

@ -26,6 +26,7 @@
<field name="fecmodif" class="java.util.Date"/>
<field name="descricaoTipoventa" class="java.lang.String"/>
<field name="tipoDescricao" class="java.lang.String"/>
<field name="pendenciaId" class="java.lang.Integer"/>
<group name="punto venta">
<groupExpression><![CDATA[$F{nombpuntoventa}]]></groupExpression>
<groupHeader>
@ -38,7 +39,7 @@
<textFieldExpression><![CDATA[$R{label.puntoventa}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="dbbded57-3522-4d36-9199-d4c516687979" mode="Opaque" x="76" y="16" width="80" height="14" backcolor="#CCCCCC"/>
<reportElement uuid="dbbded57-3522-4d36-9199-d4c516687979" mode="Opaque" x="182" y="16" width="80" height="14" backcolor="#CCCCCC"/>
<textElement verticalAlignment="Middle">
<font size="11" isBold="true"/>
</textElement>
@ -52,7 +53,7 @@
<textFieldExpression><![CDATA[$R{label.statusDescricao}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="070180f3-95a3-49f0-8a58-d2fd75d60f72" mode="Opaque" x="277" y="16" width="81" height="14" backcolor="#CCCCCC"/>
<reportElement uuid="070180f3-95a3-49f0-8a58-d2fd75d60f72" mode="Opaque" x="324" y="16" width="81" height="14" backcolor="#CCCCCC"/>
<textElement verticalAlignment="Middle">
<font size="11" isBold="true"/>
</textElement>
@ -80,7 +81,7 @@
<textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="97236380-537f-4946-a32f-0b7f551f3fa2" mode="Opaque" x="358" y="16" width="136" height="14" backcolor="#CCCCCC"/>
<reportElement uuid="97236380-537f-4946-a32f-0b7f551f3fa2" mode="Opaque" x="405" y="16" width="89" height="14" backcolor="#CCCCCC"/>
<textElement verticalAlignment="Middle">
<font size="11" isBold="true"/>
</textElement>
@ -94,7 +95,7 @@
<textFieldExpression><![CDATA[$R{label.fecmodif}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="ea3ae2af-f9f3-41a3-9b09-ae4fc2e5b6f8" mode="Opaque" x="156" y="16" width="121" height="14" backcolor="#CCCCCC"/>
<reportElement uuid="ea3ae2af-f9f3-41a3-9b09-ae4fc2e5b6f8" mode="Opaque" x="262" y="16" width="62" height="14" backcolor="#CCCCCC"/>
<textElement verticalAlignment="Middle">
<font size="11" isBold="true"/>
</textElement>
@ -122,6 +123,13 @@
</textElement>
<textFieldExpression><![CDATA[$R{label.observacao}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="a7544a97-4563-4f81-bc97-756647e66d63" mode="Opaque" x="76" y="16" width="106" height="14" backcolor="#CCCCCC"/>
<textElement verticalAlignment="Middle" rotation="None">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.numpendencia}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
</group>
@ -184,7 +192,7 @@
<detail>
<band height="12">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="7522ad78-b626-48f1-9f4d-527ee669e543" stretchType="RelativeToTallestObject" x="358" y="0" width="136" height="12"/>
<reportElement uuid="7522ad78-b626-48f1-9f4d-527ee669e543" stretchType="RelativeToTallestObject" x="405" y="0" width="89" height="12"/>
<textElement verticalAlignment="Middle">
<font size="9" isBold="false"/>
</textElement>
@ -205,7 +213,7 @@
<textFieldExpression><![CDATA[$F{nombusuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="f411db37-6c4a-4f34-ab06-2480245395c0" stretchType="RelativeToTallestObject" x="76" y="0" width="80" height="12"/>
<reportElement uuid="f411db37-6c4a-4f34-ab06-2480245395c0" stretchType="RelativeToTallestObject" x="182" y="0" width="80" height="12"/>
<textElement verticalAlignment="Middle">
<font size="9" isBold="false"/>
</textElement>
@ -226,7 +234,7 @@
<textFieldExpression><![CDATA[$F{observacao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="1cd47c3e-cf69-4937-bb6c-a2cb26aac0d6" stretchType="RelativeToTallestObject" x="277" y="0" width="81" height="12"/>
<reportElement uuid="1cd47c3e-cf69-4937-bb6c-a2cb26aac0d6" stretchType="RelativeToTallestObject" x="324" y="0" width="81" height="12"/>
<textElement verticalAlignment="Middle">
<font size="9" isBold="false"/>
</textElement>
@ -248,7 +256,7 @@
<textFieldExpression><![CDATA[$F{statusDescricao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="3f72b9eb-7e6b-42b8-8cc6-d3e21912b976" stretchType="RelativeToTallestObject" x="156" y="0" width="121" height="12"/>
<reportElement uuid="3f72b9eb-7e6b-42b8-8cc6-d3e21912b976" stretchType="RelativeToTallestObject" x="262" y="0" width="62" height="12"/>
<textElement verticalAlignment="Middle">
<font size="9" isBold="false"/>
</textElement>
@ -261,6 +269,14 @@
</textElement>
<textFieldExpression><![CDATA[$F{tipoDescricao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b98f0689-fcb3-4aea-828d-50f8b331b364" stretchType="RelativeToTallestObject" x="76" y="0" width="106" height="12"/>
<textElement verticalAlignment="Middle">
<font size="9" isBold="false"/>
<paragraph leftIndent="3"/>
</textElement>
<textFieldExpression><![CDATA[$F{pendenciaId}]]></textFieldExpression>
</textField>
</band>
</detail>
<pageFooter>

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -988,10 +988,13 @@ public class ConferenciaController extends MyGenericForwardComposer {
if (rInformativo.isSelected() && cmbTipoInformativo.getValue() == null) {
return false;
}
//validação do campo com o getValue, se tentar recuperar o valor em string é lançada exceção
txtObservacaoLog.getValue();
} catch (Exception e) {
Messagebox.show(Labels.getLabel("conferenciaController.MSG.tipoInfomativoObrigatorio"),
Messagebox.show(Labels.getLabel("conferenciaController.MSG.observacaoObrigatorio"),
Labels.getLabel("conferenciaController.window.title"),
Messagebox.OK, Messagebox.ERROR);
Messagebox.OK,Messagebox.INFORMATION);
return false;
}
@ -1288,6 +1291,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
logConferenciaVO.setStatus(logConferencia.getStatus().getValue());
logConferenciaVO.setTipo(logConferencia.getTipo().getValue());
logConferenciaVO.setIndcredito(logConferencia.getIndcredito());
logConferenciaVO.setLogconferenciaId(logConferencia.getLogconferenciaId());
logsConferenciaList.updateItem(logConferenciaVO);
lsLogsConferencia.add(logConferenciaVO);
}

14
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java
View File

@ -16,6 +16,8 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Radiogroup;
import org.zkoss.zul.Row;
import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@ -42,11 +44,15 @@ public class RelatorioObservacaoConferenciaMovimentoController extends MyGeneric
private PuntoVenta puntoVenta;
private Empresa empresa;
private Textbox txtNumPendencia;
private Checkbox chkPendencia;
private Checkbox chkTaxaEmbarque;
private Checkbox chkOutros;
private Radiogroup rdCreditoDebito;
private Row rwNumPendencia;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
@ -70,6 +76,7 @@ public class RelatorioObservacaoConferenciaMovimentoController extends MyGeneric
parametros.put("puntoventa", "Todos");
}
parametros.put("pendenciaId", txtNumPendencia.getValue());
parametros.put("pendencia", chkPendencia.isChecked());
parametros.put("taxaEmbarque", chkTaxaEmbarque.isChecked());
parametros.put("credito", rdCreditoDebito.getSelectedItem()!= null ? rdCreditoDebito.getSelectedItem().getLabel().equals(
@ -87,6 +94,13 @@ public class RelatorioObservacaoConferenciaMovimentoController extends MyGeneric
log.error(e.getMessage(), e);
}
}
public void onCheck$chkPendencia(Event ev) {
//se o check estiver selecionado a linha (row) é exibida, caso contrário a linha é ocultada
rwNumPendencia.setVisible(chkPendencia.isChecked());
//O campo Num Pendência ganha o foco se e apenas se a linha num pendencia for exibida na tela
txtNumPendencia.setFocus(rwNumPendencia.isVisible());
}
public PuntoVenta getPuntoVenta() {
return puntoVenta;

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java
View File

@ -42,6 +42,9 @@ public class RenderLogConferencia implements ListitemRenderer {
lc = new Listcell(logConferencia.getTipoDescricao());
lc.setParent(lstm);
lc = new Listcell(String.valueOf(logConferencia.getPendenciaId()));
lc.setParent(lstm);
lc = new Listcell(logConferencia.getDescpendencia());
lc.setParent(lstm);

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

@ -6931,7 +6931,7 @@ conferenciaController.lhConferido.value = Conferido
conferenciaController.lhNumoperacionBilhete.value = Localizador
conferenciaController.lhFeccorridaServico.value = DT-Serv
conferenciaController.lhConferenciaPendencia.value = Pendência
conferenciaController.lhNumeracaoPendencia.value = Nº Pendência
conferenciaController.lhNumeracaoPendencia.label = Nº Pendência
conferenciaController.lblNumSerieECF= Número de série
conferenciaController.lbImpressorasFiscais=Impressoras ficais
conferenciaController.MSG.nenhumaNumeroSerieEcfSelecionado= Selecione o numero de serie de uma ecf para informar a irregularidade!

3
web/gui/comissao/conferencia.zul
View File

@ -1093,6 +1093,9 @@
<listheader image="/gui/img/builder.gif"
label="${c:l('conferenciaController.lhTipoLog.value')}"
sort="auto(tipoDescricao)" />
<listheader image="/gui/img/builder.gif"
label="${c:l('conferenciaController.lhNumeracaoPendencia.label')}"
sort="auto(pendenciaId)" />
<listheader image="/gui/img/builder.gif"
label="${c:l('conferenciaController.lhConferenciaPendencia.value')}"
sort="auto(descpendencia)" />

8
web/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul
View File

@ -9,7 +9,7 @@
title="${c:l('relatorioObservacaoConferenciaMovimentoController.window.title')}"
apply="${relatorioObservacaoConferenciaMovimentoController}"
contentStyle="overflow:auto"
height="215px"
height="315px"
width="500px"
border="normal" >
<toolbar>
@ -63,6 +63,12 @@
width="90%"
selectedItem="@{winRelatorioObservacaoConferenciaMovimento$composer.puntoVenta}" />
</row>
<row spans="1,4" id="rwNumPendencia" visible="false">
<label value="${c:l('conferenciaController.lhNumeracaoPendencia.label')}" />
<textbox id="txtNumPendencia" maxlength="10" width="100px" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
</row>
<row>
<cell>
<checkbox id="chkPendencia"