rafael 2012-10-17 21:30:36 +00:00
parent e182fbc9d3
commit cb17041e30
1 changed files with 1432 additions and 1423 deletions

View File

@ -106,7 +106,6 @@ public class EditarCorridaController extends MyGenericForwardComposer {
@Autowired
private RolOperativoService rolOperativoService;
@Autowired
private BusquedaCorridaController busquedaCorridaController;
private DivisionService divisionService;
private List<Division> lsDivision;
@ -203,7 +202,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
cmbEmpresaCorrida.setDisabled(Boolean.TRUE);
cmbEmpresaIngresso.setDisabled(Boolean.TRUE);
txtNumCorrida.setDisabled(Boolean.TRUE);
txtNumCorridaPisoExtra.setDisabled(Boolean.TRUE);
if (esquemaCorrida.getPisoExtra() != null && esquemaCorrida.getPisoExtra()) {
chkDoblePiso.setChecked(true);
@ -215,7 +214,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
cmbClaseDoblePiso.setVisible(true);
cmbRolOperativoDoblePiso.setConstraint("no empty");
cmbClaseDoblePiso.setConstraint("no empty");
txtNumCorridaPisoExtra.setDisabled(Boolean.TRUE);
}
}
@ -385,17 +384,13 @@ public class EditarCorridaController extends MyGenericForwardComposer {
esquemaTramoList.setData(lsParadaEsquema);
}
public void onClick$btnSalvar(Event ev) throws InterruptedException {
Date dataDe = fecniciovigencia.getValue();
Date dataAte = fecfinvigencia.getValue();
txtNumCorrida.getValue();
if (chkDoblePiso.isChecked()) {
txtNumCorridaPisoExtra.getValue();
}
try {
Comboitem ciRuta = cmbRuta.getSelectedItem();
@ -460,6 +455,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
horasalida.getValue();
}
esquemaCorrida.setNumCorrida(txtNumCorrida.getValue());
esquemaCorrida.setActivo(Boolean.TRUE);
esquemaCorrida.setFecmodif(Calendar.getInstance().getTime());
esquemaCorrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
@ -516,13 +512,20 @@ public class EditarCorridaController extends MyGenericForwardComposer {
Messagebox.EXCLAMATION);
} else {
if (lsEC.isEmpty()) {
Boolean existeNumCorrida = esquemaCorridaService.buscarNumCorrida(esquemaCorrida.getNumCorrida(), esquemaCorrida.getNumCorridaPisoExtra());
Boolean existeNumCorrida = true;
if (chkDoblePiso.isChecked()) {
existeNumCorrida = esquemaCorridaService.buscarNumCorrida(esquemaCorrida.getNumCorrida(), esquemaCorrida.getNumCorridaPisoExtra());
} else {
existeNumCorrida = esquemaCorridaService.buscarNumCorrida(esquemaCorrida.getNumCorrida(), 9999);
}
if ((!existeNumCorrida) && !(esquemaCorrida.getNumCorrida().equals(esquemaCorrida.getNumCorridaPisoExtra()))) {
if (porBloq.isChecked()) {
Date des = de.getValue();
Date has = hasta.getValue();
has.setSeconds(1);
EsquemaOperacional eo = new EsquemaOperacional();
Integer numCorrida = esquemaCorrida.getNumCorrida();
while (des.before(has)) {
EsquemaCorrida ec = new EsquemaCorrida();
eo.setActivo(Boolean.TRUE);
@ -566,6 +569,12 @@ public class EditarCorridaController extends MyGenericForwardComposer {
ec.setClaseServicio2(esquemaCorrida.getClaseServicio2());
// Salva
Boolean existeNumCorridaBloco = true;
while (existeNumCorridaBloco) {
existeNumCorridaBloco = esquemaCorridaService.buscarNumCorrida(numCorrida, 9999);
ec.setNumCorrida(numCorrida);
numCorrida = numCorrida + 1;
}
ec = esquemaCorridaService.suscribir(ec);
esquemaCorridaService.actualizaEsquemaTramo(lsParadaEsquema, ec);
@ -848,9 +857,9 @@ public class EditarCorridaController extends MyGenericForwardComposer {
boolean podeExcluir = false;
for (int i = 0; i < lsParadaEsquema.size(); i++) {
if (lsParadaEsquema.get(i).getParada().equals(pe.getParada())) {
if (i > 0 && i < lsParadaEsquema.size() - 1) {// condição
if (i > 0 && i < lsParadaEsquema.size() - 1) {// condi<EFBFBD><EFBFBD>o
// para
// não
// n<>o
// poder
// remover
// o