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); columns.appendChild(columnSecuencia);
Column columnOrigen = new Column(Labels.getLabel("gridRutaSecuencia.columnOrigen.label")); Column columnOrigen = new Column(Labels.getLabel("gridRutaSecuencia.columnOrigen.label"));
columnOrigen.setWidth("25%");
columns.appendChild(columnOrigen); columns.appendChild(columnOrigen);
Column columnDestino = new Column(Labels.getLabel("gridRutaSecuencia.columnDestino.label")); Column columnDestino = new Column(Labels.getLabel("gridRutaSecuencia.columnDestino.label"));
columnDestino.setWidth("25%");
columns.appendChild(columnDestino); columns.appendChild(columnDestino);
Column columnVia = new Column(Labels.getLabel("gridRutaSecuencia.columnVia.label")); Column columnVia = new Column(Labels.getLabel("gridRutaSecuencia.columnVia.label"));
columnVia.setWidth("25%");
columns.appendChild(columnVia); columns.appendChild(columnVia);
Column kmsReal = new Column(Labels.getLabel("gridRutaSecuencia.columnKmsReal.label")); Column kmsReal = new Column(Labels.getLabel("gridRutaSecuencia.columnKmsReal.label"));
kmsReal.setWidth("20%");
columns.appendChild(kmsReal); columns.appendChild(kmsReal);
Column tiempoRecorrido = new Column(Labels.getLabel("gridRutaSecuencia.columnTiempoRecorrido.label")); Column tiempoRecorrido = new Column(Labels.getLabel("gridRutaSecuencia.columnTiempoRecorrido.label"));
tiempoRecorrido.setWidth("15%");
columns.appendChild(tiempoRecorrido); columns.appendChild(tiempoRecorrido);
Column columnIDTramo = new Column(Labels.getLabel("gridRutaSecuencia.columnIDTramo.label")); Column columnIDTramo = new Column(Labels.getLabel("gridRutaSecuencia.columnIDTramo.label"));
columnIDTramo.setWidth("5%"); columnIDTramo.setWidth("7%");
columns.appendChild(columnIDTramo); columns.appendChild(columnIDTramo);
return columns; 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, ConfigRestriccionPago.class,
pagingrestriccionFormaPago.getPageSize()); pagingrestriccionFormaPago.getPageSize());
configRestriccionPagoBusqueda.addFilterLike("formaPago.descpago", if (!txtNome.getText().isEmpty()) {
"%" + txtNome.getText().trim().concat("%")); configRestriccionPagoBusqueda.addFilterLike("formaPago.descpago", "%" + txtNome.getText().trim().concat("%"));
}
configRestriccionPagoBusqueda.addSortAsc("formaPago.descpago"); configRestriccionPagoBusqueda.addSortAsc("formaPago.descpago");
configRestriccionPagoBusqueda.addFilterEqual("activo", Boolean.TRUE); 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.setMold("rounded");
comboVenda.setWidth("90%"); comboVenda.setWidth("90%");
List<String> op = new ArrayList<String>(); List<String> op = new ArrayList<String>();
op.add("Si"); op.add("Sim");
op.add("No"); op.add("Não");
comboVenda.setModel(new ListModelList(op)); comboVenda.setModel(new ListModelList(op));
comboVenda.setValue(rutaCombinacion.getIndventa() == Boolean.TRUE ? "Si" comboVenda.setValue(rutaCombinacion.getIndventa() == Boolean.TRUE ? "Sim"
: "No"); : "Não");
comboVenda.setTooltip(rutaCombinacion.getRutacombinacionId().toString()); comboVenda.setTooltip(rutaCombinacion.getRutacombinacionId().toString());
comboVenda.addEventListener("onChange", new EventListener() { comboVenda.addEventListener("onChange", new EventListener() {

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

@ -11,65 +11,67 @@ import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zul.Constraint; import org.zkoss.zul.Constraint;
/** /**
* *
* @author Gleimar * @author Gleimar
*/ */
public class ConstraintNumberBD implements Constraint { public class ConstraintNumberBD implements Constraint {
private Integer precision; private Integer precision;
private Integer scale; private Integer scale;
private Boolean obligatorio = false; private Boolean obligatorio = false;
/** /**
* Ex.: (precision,scale) == (3,2) Va a aceptar numero menores que 9.99 * 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
public ConstraintNumberBD(Integer preicion, Integer scale) { * @param scale
this(preicion, scale, false); * - La escala
} */
public ConstraintNumberBD(Integer preicion, Integer scale) {
this(preicion, scale, false);
}
public ConstraintNumberBD(Integer preicion, Integer scale, Boolean obligatorio) { public ConstraintNumberBD(Integer preicion, Integer scale, Boolean obligatorio) {
if ((preicion == null) || (scale == null)) { 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.precision = preicion;
this.scale = scale; this.scale = scale;
this.obligatorio = obligatorio; this.obligatorio = obligatorio;
} }
public void validate(Component comp, Object value) throws WrongValueException { public void validate(Component comp, Object value) throws WrongValueException {
if ((precision != null) && (scale != null)) { if ((precision != null) && (scale != null)) {
if ((value != null) && (value instanceof String)) {
value = (((String) value).trim().equals("")) ? null : value;
}
if (obligatorio && (value == null)) {
throw new WrongValueException(comp,
Labels.getLabel("MSG.CONSTRAINT.CONSTRAINTNUMBERBDOBLIGATORIO"));
}
if ((value != null) && (value instanceof String)) { if (value == null) {
value = (((String) value).trim().equals("")) ? null : value; return;
} }
if (obligatorio && (value == null)) {
throw new WrongValueException(comp,
Labels.getLabel("MSG.CONSTRAINT.CONSTRAINTNUMBERBDOBLIGATORIO"));
}
if (value == null) { BigDecimal valor = getBigDecimal(value);
return;
}
BigDecimal valor = getBigDecimal(value); if ((valor.precision() > precision) || (valor.scale() > scale)) {
throw new WrongValueException(comp,
Labels.getLabel("MSG.CONSTRAINT.CONSTRAINTNUMBERBD", new Object[] { precision - 2, scale }));
}
}
}
if ((valor.precision() > precision) || (valor.scale() > scale)) { private BigDecimal getBigDecimal(Object value) {
throw new WrongValueException(comp,
Labels.getLabel("MSG.CONSTRAINT.CONSTRAINTNUMBERBD", new Object[]{precision - 2, scale}));
}
}
}
private BigDecimal getBigDecimal(Object value) { if (value instanceof BigDecimal) {
return (BigDecimal) value;
}
if (value instanceof BigDecimal) { return new BigDecimal(((String) value).replace(",", ""));
return (BigDecimal) value; }
}
return new BigDecimal((String) value);
}
} }

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

@ -10,34 +10,34 @@ import org.zkoss.zk.ui.Component;
import org.zkoss.zkplus.databind.TypeConverter; import org.zkoss.zkplus.databind.TypeConverter;
/** /**
* *
* @author Administrador * @author Administrador
*/ */
public class StringDecimalToDecimalConverter implements 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) { public Object coerceToUi(Object val, Component comp) {
if (val != null) { if (val != null) {
String format = (String) comp.getAttribute("format"); String format = (String) comp.getAttribute("format");
if (format == null) { if (format == null) {
format = FORMAT; format = FORMAT;
} }
DecimalFormat df = new DecimalFormat(format,new java.text.DecimalFormatSymbols(java.util.Locale.US)); DecimalFormat df = new DecimalFormat(format, new java.text.DecimalFormatSymbols(java.util.Locale.US));
return df.format(val); return df.format(val);
} }
return null; return null;
} }
public Object coerceToBean(Object val, Component cmpnt) { public Object coerceToBean(Object val, Component cmpnt) {
if (val == null){ if (val == null) {
return null; return null;
} }
if (val instanceof String) { if (val instanceof String) {
return (val.toString().trim().isEmpty())?(BigDecimal)null: new BigDecimal(val.toString().replace(",", "")); return (val.toString().trim().isEmpty()) ? (BigDecimal) null : new BigDecimal(val.toString().replace(",", ""));
} }
return null; return null;
} }
} }