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

fixed bug #7113 - correção para manter seleção após mudar página 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53118 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-02-22 14:02:57 +00:00
parent a5fc2b1d9c
commit 6615e59fed
1 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/SelecionarServicosGerarController.java
View File

@ -5,7 +5,9 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -78,6 +80,15 @@ public class SelecionarServicosGerarController extends MyGenericForwardComposer
private Intbox txtID; private Intbox txtID;
private Intbox txtNumCorrida; private Intbox txtNumCorrida;
private Timebox hora; private Timebox hora;
private Set<EsquemaCorrida> selected;
public Set<EsquemaCorrida> getSelected() {
return selected;
}
public void setSelected(Set<EsquemaCorrida> selected) {
this.selected = selected;
}
public List<ClaseServicio> getLsClase() { public List<ClaseServicio> getLsClase() {
return lsClase; return lsClase;
@ -193,11 +204,13 @@ public class SelecionarServicosGerarController extends MyGenericForwardComposer
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
} }
} }
selected.clear();
} }
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp); super.doAfterCompose(comp);
selected = new HashSet<EsquemaCorrida>();
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
lsMarca = marcaService.buscarMarcaPorEmpresa(UsuarioLogado.getUsuarioLogado().getEmpresa()); lsMarca = marcaService.buscarMarcaPorEmpresa(UsuarioLogado.getUsuarioLogado().getEmpresa());
@ -216,9 +229,8 @@ public class SelecionarServicosGerarController extends MyGenericForwardComposer
} }
public void onClick$btnGerar(Event ev) throws InterruptedException { public void onClick$btnGerar(Event ev) throws InterruptedException {
List<Object> list = esquemaCorridaList.getSelectedsItens();
if (list.isEmpty()) { if (selected.isEmpty()) {
Messagebox.show(Labels.getLabel("selecionarServicosGerarController.MSG.selecioneservicos"), Messagebox.show(Labels.getLabel("selecionarServicosGerarController.MSG.selecioneservicos"),
Labels.getLabel("selecionarServicosGerarController.window.title"), Labels.getLabel("selecionarServicosGerarController.window.title"),
Messagebox.OK, Messagebox.INFORMATION); Messagebox.OK, Messagebox.INFORMATION);
@ -226,9 +238,8 @@ public class SelecionarServicosGerarController extends MyGenericForwardComposer
return; return;
} }
List<EsquemaCorrida> lsEsquemaCorrida = new ArrayList<EsquemaCorrida>(); List<EsquemaCorrida> lsEsquemaCorrida = new ArrayList<EsquemaCorrida>();
for (Object o : list) { for (Object o : selected) {
EsquemaCorrida esquemaCorrida = (EsquemaCorrida) o; EsquemaCorrida esquemaCorrida = (EsquemaCorrida) o;
lsEsquemaCorrida.add(esquemaCorrida); lsEsquemaCorrida.add(esquemaCorrida);
} }
@ -243,18 +254,17 @@ public class SelecionarServicosGerarController extends MyGenericForwardComposer
return; return;
} }
Long cantCorridasGeneradas; Long cantCorridasGeneradas;
try { try {
cantCorridasGeneradas = corridaService.generarCorridasSelecionadas(lsEsquemaCorrida, dataGeracaoInicial, dataGeracaoFinal); cantCorridasGeneradas = corridaService.generarCorridasSelecionadas(lsEsquemaCorrida, dataGeracaoInicial, dataGeracaoFinal);
esquemaCorridaList.setData(new ArrayList<EsquemaCorrida>()); esquemaCorridaList.setData(new ArrayList<EsquemaCorrida>());
Messagebox.show(Labels.getLabel("selecionarServicosGerarController.MSG.operacaoFinalizar", new Object[] { cantCorridasGeneradas}), Messagebox.show(Labels.getLabel("selecionarServicosGerarController.MSG.operacaoFinalizar", new Object[] { cantCorridasGeneradas }),
Labels.getLabel("selecionarServicosGerarController.window.title"), Labels.getLabel("selecionarServicosGerarController.window.title"),
Messagebox.OK, Messagebox.INFORMATION); Messagebox.OK, Messagebox.INFORMATION);
if (ApplicationProperties.getInstance().pafActivo()){ if (ApplicationProperties.getInstance().pafActivo()) {
// log.info("qtdP2=" + fiscalService.gerarRegistroP2_F2(lsEsquemaCorrida, dataGeracaoInicial, dataGeracaoFinal)); // log.info("qtdP2=" + fiscalService.gerarRegistroP2_F2(lsEsquemaCorrida, dataGeracaoInicial, dataGeracaoFinal));
} }
@ -264,6 +274,34 @@ public class SelecionarServicosGerarController extends MyGenericForwardComposer
Messagebox.OK, Messagebox.INFORMATION); Messagebox.OK, Messagebox.INFORMATION);
} }
} }
public void onSelect$esquemaCorridaList() {
int pos = 0;
for (Object o : esquemaCorridaList.getData()) {
EsquemaCorrida e = (EsquemaCorrida) o;
if (esquemaCorridaList.getItemAtIndex(pos).isSelected()) {
if (!selected.contains(e)) {
selected.add(e);
}
} else {
selected.remove(e);
}
pos++;
}
}
public void onAfterRender$esquemaCorridaList() {
if (esquemaCorridaList.getData() != null) {
int pos = 0;
for (Object o : esquemaCorridaList.getData()) {
EsquemaCorrida e = (EsquemaCorrida) o;
if (selected.contains(e)) {
esquemaCorridaList.addItemToSelection(esquemaCorridaList.getItemAtIndex(pos));
}
pos++;
}
}
}
} }