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

fixes bug #6970 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@52337 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2016-01-27 19:55:55 +00:00
parent 514ef91a96
commit fc616d1dcd
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java
View File

@ -54,15 +54,14 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
private ClaseServicio claseServicio;
private OrgaoConcedente orgaoConcedente;
private DataBinder dataBinder;
private final Combobox cboVenda;
// private Combobox cboVenda;
private static Logger log = Logger.getLogger(GridRutaTramoCoeficiente.class);
public GridRutaTramoCoeficiente() {
lsSecuenciaRutaTramoCoeficienteVO = new ArrayList<SecuenciaRutaTramoCoeficienteVO>();
this.setRowRenderer(this);
this.appendChild(generarColumns());
dataBinder = new DataBinder();
cboVenda = new Combobox();
dataBinder = new DataBinder();
}
/**
@ -285,6 +284,7 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
row.appendChild(cboVia);
// Cell Venda
final Combobox cboVenda = new Combobox();
cboVenda.setId(cboVenda.getUuid());
cboVenda.setReadonly(true);
cboVenda.setWidth("100%");
@ -435,7 +435,6 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
dataBinder.addBinding(ibxKm2, "value", row.getUuid() + ".kmCoeficiente2", null, null,
"save", "com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter", null, null, null);
row.appendChild(ibxKm2);
}
/**
@ -550,7 +549,4 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
this.lsCoeficientes = lsCoeficientes;
}
public Combobox getCboVenda() {
return cboVenda;
}
}

30
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarCombinacionTramoRutaController.java
View File

@ -80,6 +80,7 @@ public class EditarCombinacionTramoRutaController extends MyGenericForwardCompos
}
public void onClick$btnSalvar(Event e) throws InterruptedException {
boolean generarRutaRegresso = false;
//Mantis 6970
if (!validarRetorno()){
@ -92,9 +93,7 @@ public class EditarCombinacionTramoRutaController extends MyGenericForwardCompos
Labels.getLabel("editarCombinacionTramoRutaController.window.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.NO){
return;
}
generarRutaRegresso = (resp == Messagebox.YES);
}
rutaTramoIdaVO.setLsCombinacionRutaTramoVO(gridRutaSecuenciaIda.getLsSecuenciaRutaTramoCoeficienteVO());
@ -110,21 +109,20 @@ public class EditarCombinacionTramoRutaController extends MyGenericForwardCompos
Labels.getLabel("editarCombinacionTramoRutaController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
if (!gridRutaSecuenciaVolta.isEmpty()) {
int resp = Messagebox.show(Labels.getLabel("editarCombinacionTramoRutaController.MSG.generarRutaRegreso"),
Labels.getLabel("editarCombinacionTramoRutaController.window.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) {
if (generarRutaRegresso) {
if (gridRutaSecuenciaVolta.isEmpty()){
rutaTramoRegresoVO = tramoRutaService.generarRutaRegreso(rutaTramoIdaVO);
} else {
rutaTramoRegresoVO.setLsCombinacionRutaTramoVO(gridRutaSecuenciaVolta.getLsSecuenciaRutaTramoCoeficienteVO());
Ruta rutaRegresso = tramoRutaService.generarTramosRutas(rutaTramoRegresoVO);
}
Ruta rutaRegresso = tramoRutaService.generarTramosRutas(rutaTramoRegresoVO);
if (rutaRegresso != null) {
Messagebox.show(Labels.getLabel("editarCombinacionTramoRutaController.MSG.rutaRegresoGenerada",
new Object[] { rutaRegresso.getRutaId() + " - " + rutaRegresso.getDescruta() }),
Labels.getLabel("editarCombinacionTramoRutaController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
}
if (rutaRegresso != null) {
Messagebox.show(Labels.getLabel("editarCombinacionTramoRutaController.MSG.rutaRegresoGenerada",
new Object[] { rutaRegresso.getRutaId() + " - " + rutaRegresso.getDescruta() }),
Labels.getLabel("editarCombinacionTramoRutaController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
}
}
}