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

fixes bug 0010024 - commit Trunk 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76035 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno.neves 2017-11-06 12:04:18 +00:00
parent d0ed82b904
commit 4687a841f7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,6 +389,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
Labels.getLabel("informeIrregularidadeController.window.title"), args); Labels.getLabel("informeIrregularidadeController.window.title"), args);
} }
}); });
} }
private void ajustarListsBilhetes() { private void ajustarListsBilhetes() {
@ -438,12 +439,15 @@ public class ConferenciaController extends MyGenericForwardComposer {
List<Component> com = lstm.getChildren(); List<Component> com = lstm.getChildren();
for (Component component : com) { for (Component component : com) {
Listcell listCell = (Listcell) component; Listcell listCell = (Listcell) component;
Boolean tes = listCell.getFirstChild() instanceof Checkbox;
if (listCell.getFirstChild() instanceof Checkbox) { if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild(); Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia())); if (boletoComissao.isConferido() && boletoComissao.getLogconferenciaId() == null) {
if (!jaPassou) { gravarLogConferenciaBilhete(bilhetesList, boletoComissao, tabBilhetesVenda, "conferenciaController.tab.bilhetes");
chk.setChecked(getCheckedVenta(boletoComissao)); //chk.setChecked(getCheckedVenta(boletoComissao));
} }
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.addEventListener("onCheck", new EventListener() { chk.addEventListener("onCheck", new EventListener() {
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
@ -455,6 +459,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
} }
}); });
} }
} }
jaPassou = true; jaPassou = true;
@ -779,6 +784,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
private void carregarBilhetesVendidos(List<BoletoComissao> boletosComissaos, boolean carregarDadosFaltantes) throws BusinessException { private void carregarBilhetesVendidos(List<BoletoComissao> boletosComissaos, boolean carregarDadosFaltantes) throws BusinessException {
jaPassou = false;
if (isPeriodo) { if (isPeriodo) {
lsBilhetes = conferenciaComissaoService.carregarBilhetesComissao(boletosComissaos, conferencias, BoletoStatusComissao.BOLETOS_VENDIDOS, carregarDadosFaltantes); lsBilhetes = conferenciaComissaoService.carregarBilhetesComissao(boletosComissaos, conferencias, BoletoStatusComissao.BOLETOS_VENDIDOS, carregarDadosFaltantes);
} else { } else {

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java
View File

@ -21,7 +21,7 @@ public class RenderBoletoComissao implements ListitemRenderer {
@Override @Override
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
BoletoComissao boletoComissao = (BoletoComissao) o; BoletoComissao boletoComissao = (BoletoComissao) o;
boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null); // boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null);
Listcell lc = new Listcell(); Listcell lc = new Listcell();
if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) { if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {