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

fixed bug #6478 - Alteração em tela de geração automática de linha para aceitar mesmo numero de linha para ida e volta. 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@46129 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago 2015-07-20 13:16:37 +00:00
parent d094fac525
commit ecc259ca3a
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java
View File

@ -27,7 +27,6 @@ import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Button;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.ListModelList;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;

28
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarTramoRutaController.java
View File

@ -9,6 +9,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
@ -18,7 +20,6 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Radio;
import org.zkoss.zul.Window;
@ -96,14 +97,33 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
public void onClick$btnCombinacion(Event e) throws InterruptedException {
List<Ruta> lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue());
RutaTramoVO rutaTramoVO = new RutaTramoVO();
if (radIda.isChecked()) {
rutaTramoVO.setIndSentidoIda(Boolean.TRUE);
} else if (radVolta.isChecked()) {
rutaTramoVO.setIndSentidoIda(Boolean.FALSE);
}
if (!lsRuta.isEmpty()) {
boolean exists = CollectionUtils.exists(lsRuta, new Predicate() {
@Override
public boolean evaluate(Object object) {
return ((Ruta) object).getNumRuta().equals(txtNumRuta.getValue()) && ((Ruta) object).getIndSentidoIda().equals(radIda.isChecked());
}
});
if (exists) {
Messagebox.show(
Labels.getLabel("editarTramoRutaController.registroNumRutaExiste"),
Labels.getLabel("editarTramoRutaController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
return;
}
}
if (lsRutaEmpresa.isEmpty()) {
Messagebox.show(Labels.getLabel("editarTramoRutaController.msg.empresaObligatoria"),
Labels.getLabel("editarTramoRutaController.window.title"), Messagebox.OK,
@ -118,7 +138,6 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
return;
}
RutaTramoVO rutaTramoVO = new RutaTramoVO();
rutaTramoVO.setClaseServicio((ClaseServicio) cmbClaseServicio.getSelectedItem().getValue());
rutaTramoVO.setOrgaoConcedente((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue());
rutaTramoVO.setSolicitaNombrePasajero(chkSolicitaNombrePasajero.isChecked());
@ -129,11 +148,6 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
rutaTramoVO.setNumRuta(txtNumRuta.getValue());
if (radIda.isChecked()) {
rutaTramoVO.setIndSentidoIda(Boolean.TRUE);
} else if (radVolta.isChecked()) {
rutaTramoVO.setIndSentidoIda(Boolean.FALSE);
}
Map<String, Object> params = new LinkedHashMap<String, Object>();
params.put("rutaTramoVO", rutaTramoVO);