From d8eb1b275d5036a76ddf4ca7cf8aec6e15df3eea Mon Sep 17 00:00:00 2001 From: "eduardo.dicarde" Date: Tue, 13 Jun 2017 14:30:26 +0000 Subject: [PATCH] fixes bug #9064 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69879 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...vacaoConferenciaMovimento_pt_BR.properties | 3 +- ...torioObservacaoConferenciaMovimento.jasper | Bin 39456 -> 40589 bytes ...atorioObservacaoConferenciaMovimento.jrxml | 32 +++++++++++++----- .../comissao/ConferenciaController.java | 8 +++-- ...ervacaoConferenciaMovimentoController.java | 14 ++++++++ .../render/RenderLogConferencia.java | 3 ++ web/WEB-INF/i3-label_pt_BR.label | 2 +- web/gui/comissao/conferencia.zul | 3 ++ ...elatorioObservacaoConferenciaMovimento.zul | 8 ++++- 9 files changed, 60 insertions(+), 13 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioObservacaoConferenciaMovimento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioObservacaoConferenciaMovimento_pt_BR.properties index ea7e09283..20824048f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioObservacaoConferenciaMovimento_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioObservacaoConferenciaMovimento_pt_BR.properties @@ -25,4 +25,5 @@ label.preco=Valor label.debitoCredito=D/C label.fecmodif=Dt. Alt. label.tipoventa=Tipo Venda -label.tipo=Tipo \ No newline at end of file +label.tipo=Tipo +label.numpendencia=Nº Pendência \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jasper index 8ad39ae65dd4c5e61fd66295474d3551a9a951ec..3a3faed8594a71f478fa3fcb21ef21ac69e15bf5 100644 GIT binary patch literal 40589 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 delta 12393 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jrxml index 2a81f468f..1d1dfa687 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jrxml @@ -26,6 +26,7 @@ + @@ -38,7 +39,7 @@ - + @@ -52,7 +53,7 @@ - + @@ -80,7 +81,7 @@ - + @@ -94,7 +95,7 @@ - + @@ -122,6 +123,13 @@ + + + + + + + @@ -184,7 +192,7 @@ - + @@ -205,7 +213,7 @@ - + @@ -226,7 +234,7 @@ - + @@ -248,7 +256,7 @@ - + @@ -261,6 +269,14 @@ + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java index c6dec6bcd..adb3874c8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java @@ -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); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java index 1e394f6a8..813f5b780 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java @@ -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; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java index fcf4065d3..efc3056eb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java @@ -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); diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 7e8dc8f16..a2b192686 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -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! diff --git a/web/gui/comissao/conferencia.zul b/web/gui/comissao/conferencia.zul index 0450bb4f9..c2f5c50e7 100644 --- a/web/gui/comissao/conferencia.zul +++ b/web/gui/comissao/conferencia.zul @@ -1093,6 +1093,9 @@ + diff --git a/web/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul b/web/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul index bd20b5a8b..a4f5c58e1 100644 --- a/web/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul +++ b/web/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul @@ -9,7 +9,7 @@ title="${c:l('relatorioObservacaoConferenciaMovimentoController.window.title')}" apply="${relatorioObservacaoConferenciaMovimentoController}" contentStyle="overflow:auto" - height="215px" + height="315px" width="500px" border="normal" > @@ -63,6 +63,12 @@ width="90%" selectedItem="@{winRelatorioObservacaoConferenciaMovimento$composer.puntoVenta}" /> + + + +