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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@20680 d1611594-4594-4d17-8e1d-87c2c4800839

master
rodrigo 2012-08-22 21:03:15 +00:00
parent ab5cb1f4f9
commit 0c2bb1ac83
5 changed files with 80 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramo.java
View File

@ -252,27 +252,22 @@ public class GridRutaTramo extends Grid implements RowRenderer, RendererCtrl {
columns.appendChild(columnSecuencia);
Column columnOrigen = new Column(Labels.getLabel("gridRutaSecuencia.columnOrigen.label"));
columnOrigen.setWidth("25%");
columns.appendChild(columnOrigen);
Column columnDestino = new Column(Labels.getLabel("gridRutaSecuencia.columnDestino.label"));
columnDestino.setWidth("25%");
columns.appendChild(columnDestino);
Column columnVia = new Column(Labels.getLabel("gridRutaSecuencia.columnVia.label"));
columnVia.setWidth("25%");
columns.appendChild(columnVia);
Column kmsReal = new Column(Labels.getLabel("gridRutaSecuencia.columnKmsReal.label"));
kmsReal.setWidth("20%");
columns.appendChild(kmsReal);
Column tiempoRecorrido = new Column(Labels.getLabel("gridRutaSecuencia.columnTiempoRecorrido.label"));
tiempoRecorrido.setWidth("15%");
columns.appendChild(tiempoRecorrido);
Column columnIDTramo = new Column(Labels.getLabel("gridRutaSecuencia.columnIDTramo.label"));
columnIDTramo.setWidth("5%");
columnIDTramo.setWidth("7%");
columns.appendChild(columnIDTramo);
return columns;

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/BusquedaRestriccionFormaPagoController.java
View File

@ -80,8 +80,9 @@ public class BusquedaRestriccionFormaPagoController extends MyGenericForwardComp
ConfigRestriccionPago.class,
pagingrestriccionFormaPago.getPageSize());
configRestriccionPagoBusqueda.addFilterLike("formaPago.descpago",
"%" + txtNome.getText().trim().concat("%"));
if (!txtNome.getText().isEmpty()) {
configRestriccionPagoBusqueda.addFilterLike("formaPago.descpago", "%" + txtNome.getText().trim().concat("%"));
}
configRestriccionPagoBusqueda.addSortAsc("formaPago.descpago");
configRestriccionPagoBusqueda.addFilterEqual("activo", Boolean.TRUE);

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

@ -703,11 +703,11 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
comboVenda.setMold("rounded");
comboVenda.setWidth("90%");
List<String> op = new ArrayList<String>();
op.add("Si");
op.add("No");
op.add("Sim");
op.add("Não");
comboVenda.setModel(new ListModelList(op));
comboVenda.setValue(rutaCombinacion.getIndventa() == Boolean.TRUE ? "Si"
: "No");
comboVenda.setValue(rutaCombinacion.getIndventa() == Boolean.TRUE ? "Sim"
: "Não");
comboVenda.setTooltip(rutaCombinacion.getRutacombinacionId().toString());
comboVenda.addEventListener("onChange", new EventListener() {

12
src/java/com/rjconsultores/ventaboletos/web/utilerias/ConstraintNumberBD.java
View File

@ -22,8 +22,11 @@ public class ConstraintNumberBD implements Constraint {
/**
* Ex.: (precision,scale) == (3,2) Va a aceptar numero menores que 9.99
* @param preicion - La precision del numero
* @param scale - La escala
*
* @param preicion
* - La precision del numero
* @param scale
* - La escala
*/
public ConstraintNumberBD(Integer preicion, Integer scale) {
this(preicion, scale, false);
@ -31,7 +34,7 @@ public class ConstraintNumberBD implements Constraint {
public ConstraintNumberBD(Integer preicion, Integer scale, Boolean obligatorio) {
if ((preicion == null) || (scale == null)) {
throw new IllegalArgumentException("Deve de ser informado el valor de la precicion y scale");
throw new IllegalArgumentException("Deve ser informado o valor de precisao e escala.");
}
this.precision = preicion;
this.scale = scale;
@ -42,7 +45,6 @@ public class ConstraintNumberBD implements Constraint {
if ((precision != null) && (scale != null)) {
if ((value != null) && (value instanceof String)) {
value = (((String) value).trim().equals("")) ? null : value;
}
@ -70,6 +72,6 @@ public class ConstraintNumberBD implements Constraint {
return (BigDecimal) value;
}
return new BigDecimal((String) value);
return new BigDecimal(((String) value).replace(",", ""));
}
}

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/StringDecimalToDecimalConverter.java
View File

@ -15,7 +15,7 @@ import org.zkoss.zkplus.databind.TypeConverter;
*/
public class StringDecimalToDecimalConverter implements TypeConverter {
private static final String FORMAT = "###,##0.00";
private static final String FORMAT = "#####0.00";
public Object coerceToUi(Object val, Component comp) {
if (val != null) {