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

fixbug #6970 

Correção de merge

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@52242 d1611594-4594-4d17-8e1d-87c2c4800839
master
eduardo.dicarde 2016-01-26 12:59:19 +00:00
parent 6020b9c512
commit 952263ae6c
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import org.zkoss.zkplus.spring.SpringUtil;
import org.zkoss.zul.Column; import org.zkoss.zul.Column;
import org.zkoss.zul.Columns; import org.zkoss.zul.Columns;
import org.zkoss.zul.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Grid; import org.zkoss.zul.Grid;
import org.zkoss.zul.Hbox; import org.zkoss.zul.Hbox;
import org.zkoss.zul.Intbox; import org.zkoss.zul.Intbox;
@ -136,6 +137,10 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
columnVia.setWidth("15%"); columnVia.setWidth("15%");
columns.appendChild(columnVia); columns.appendChild(columnVia);
Column permiteVenda = new Column(Labels.getLabel("gridRutaSecuencia.columnVenda.label"));
permiteVenda.setWidth("6%");
columns.appendChild(permiteVenda);
Column kmsReal = new Column(Labels.getLabel("gridRutaSecuencia.columnKmsReal.label")); Column kmsReal = new Column(Labels.getLabel("gridRutaSecuencia.columnKmsReal.label"));
kmsReal.setWidth("6%"); kmsReal.setWidth("6%");
columns.appendChild(kmsReal); columns.appendChild(kmsReal);
@ -276,6 +281,47 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
} }
}); });
row.appendChild(cboVia); row.appendChild(cboVia);
// Cell Venda
final Combobox cboVenda = new Combobox();
cboVenda.setId(cboVenda.getUuid());
cboVenda.setReadonly(true);
cboVenda.setWidth("100%");
cboVenda.setConstraint("no empty");
ListModelList listCboVenda = new ListModelList();
final Comboitem cbiSim = new Comboitem("Sim");
cbiSim.setValue("Sim");
final Comboitem cbiNao = new Comboitem("Não");
cbiNao.setValue("Não");
listCboVenda.add(cbiSim.getValue());
listCboVenda.add(cbiNao.getValue());
if (secuenciaRutaTramoCoeficienteVO.getPermiteVenda() == null && this.getId().equalsIgnoreCase("gridrutasecuenciaida")){
listCboVenda.addSelection(cbiNao.getValue());
secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.FALSE);
} else if (this.getId().equalsIgnoreCase("gridrutasecuenciavolta")){
listCboVenda.addSelection(secuenciaRutaTramoCoeficienteVO.getPermiteVenda()?cbiSim.getValue():cbiNao.getValue());
}
cboVenda.setModel(listCboVenda);
cboVenda.addEventListener(Events.ON_CHANGE, new EventListener() {
@Override
public void onEvent(Event evt) throws Exception {
if (cboVenda.getSelectedItem().getValue().equals(cbiSim.getValue())){
secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.TRUE);
} else if (cboVenda.getSelectedItem().getValue().equals(cbiNao.getValue())){
secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.FALSE);
}
}
});
row.appendChild(cboVenda);
boolean esTramoEditable = (secuenciaRutaTramoCoeficienteVO.getTramoId() == null); boolean esTramoEditable = (secuenciaRutaTramoCoeficienteVO.getTramoId() == null);
boolean esTramoServicioEditable = (secuenciaRutaTramoCoeficienteVO.getTramoServicioId() == null); boolean esTramoServicioEditable = (secuenciaRutaTramoCoeficienteVO.getTramoServicioId() == null);
boolean esTramoCoeficienteEditable = (secuenciaRutaTramoCoeficienteVO.getOrgaoTramoId() == null); boolean esTramoCoeficienteEditable = (secuenciaRutaTramoCoeficienteVO.getOrgaoTramoId() == null);

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

@ -94,17 +94,16 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
gridRutaSecuencia.setLsVias(viaService.obtenerTodos()); gridRutaSecuencia.setLsVias(viaService.obtenerTodos());
} }
public void onSelect$cmbClaseServicio(Event e)throws InterruptedException { public void onBlur$cmbClaseServicio(Event e)throws InterruptedException {
if (!validarPreenchimentoEmpresa()){ if (cmbClaseServicio.getSelectedItem() != null && !validarPreenchimentoEmpresa()){
cmbClaseServicio.setSelectedItem(null); cmbClaseServicio.setSelectedItem(null);
return; return;
} }
} }
public void onSelect$cmbOrgaoConcedente(Event e)throws InterruptedException { public void onBlur$cmbOrgaoConcedente(Event e)throws InterruptedException {
if (cmbOrgaoConcedente.getSelectedItem() != null && !validarPreenchimentoEmpresa()){
if (!validarPreenchimentoEmpresa()){ cmbClaseServicio.setSelectedItem(null);
cmbOrgaoConcedente.setSelectedItem(null);
return; return;
} }
} }