0010953: Não aceitar caracteres especiais no cadastro de número da linha.

fixes bug#10953
dev:Daniel Zauli
qua:Renato

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@83115 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabricio.oliveira 2018-07-04 13:52:52 +00:00
parent 482d09a055
commit f9a963c857
3 changed files with 154 additions and 85 deletions

View File

@ -17,6 +17,8 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.faces.event.ListenerFor;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate; import org.apache.commons.collections.Predicate;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -168,7 +170,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
private Boolean modificado = Boolean.FALSE; private Boolean modificado = Boolean.FALSE;
private static Logger log = Logger.getLogger(EditarCatalogoDeRutaController.class); private static Logger log = Logger.getLogger(EditarCatalogoDeRutaController.class);
private boolean carregouCombinacao; private boolean carregouCombinacao;
private MyTextbox txtNumRuta; private Intbox txtNumRuta;
private Intbox txtCantEixos; private Intbox txtCantEixos;
private Intbox txtCantAsientos; private Intbox txtCantAsientos;
private Checkbox chkIndVentaRioCard; private Checkbox chkIndVentaRioCard;
@ -720,7 +722,6 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
return; return;
} }
Comboitem cbiEmpresa = cmbEmpresa.getSelectedItem(); Comboitem cbiEmpresa = cmbEmpresa.getSelectedItem();
if (cbiEmpresa != null) { if (cbiEmpresa != null) {
@ -869,7 +870,17 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
return; return;
} }
List<Ruta> lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue()); List<Ruta> lsRuta = new ArrayList<Ruta>();
if (null != txtNumRuta && txtNumRuta.getValue() != null && txtNumRuta.getValue() == 0 && txtNumRuta.getValue().toString().contains("%.-")) {
Messagebox.show(
Labels.getLabel("editarCatalogoDeRutaController.lblCantAsientosZeroInvalido.value"),
Labels.getLabel("editarCatalogoDeRutaController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
return;
}else {
lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue().toString());
}
if (radIda.isChecked()) { if (radIda.isChecked()) {
ruta.setIndSentidoIda(Boolean.TRUE); ruta.setIndSentidoIda(Boolean.TRUE);
@ -1021,7 +1032,6 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
dialog.doModal(); dialog.doModal();
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
} }
@ -1216,8 +1226,8 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
Constraint constNumRuta = txtNumRuta.getConstraint(); Constraint constNumRuta = txtNumRuta.getConstraint();
txtNumRuta.setConstraint(""); txtNumRuta.setConstraint("");
ruta.setNumRuta(""); ruta.setNumRuta(null);
txtNumRuta.setValue(""); txtNumRuta.setValue(null);
txtNumRuta.setConstraint(constNumRuta); txtNumRuta.setConstraint(constNumRuta);
Constraint constPrefixo = txtPrefixo.getConstraint(); Constraint constPrefixo = txtPrefixo.getConstraint();
@ -1276,7 +1286,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
rutaTramoVO.setLsEmpresa(empresas); rutaTramoVO.setLsEmpresa(empresas);
rutaTramoVO.setOrgaoConcedente(ruta.getOrgaoConcedente()); rutaTramoVO.setOrgaoConcedente(ruta.getOrgaoConcedente());
rutaTramoVO.setSolicitaNombrePasajero(ruta.getIndNombreObligatorio()); rutaTramoVO.setSolicitaNombrePasajero(ruta.getIndNombreObligatorio());
rutaTramoVO.setNumRuta(txtNumRuta.getValue()); rutaTramoVO.setNumRuta(txtNumRuta.getValue().toString());
rutaTramoVO.setDescRuta(ruta.getDescruta()); rutaTramoVO.setDescRuta(ruta.getDescruta());
rutaTramoVO.setPrefixo(txtPrefixo.getValue()); rutaTramoVO.setPrefixo(txtPrefixo.getValue());
rutaTramoVO.setIndSentidoIda(radIda.isChecked()); rutaTramoVO.setIndSentidoIda(radIda.isChecked());
@ -1411,7 +1421,8 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
} }
Messagebox.show(Labels.getLabel( Messagebox.show(Labels.getLabel(
"editarCatalogoDeRutaController.MSG.suscribirOK").concat(" ID: " "editarCatalogoDeRutaController.MSG.suscribirOK").concat(
" ID: "
+ ruta.getRutaId().toString()), + ruta.getRutaId().toString()),
Labels.getLabel("editarCatalogoDeRutaController.window.title"), Labels.getLabel("editarCatalogoDeRutaController.window.title"),
Messagebox.OK, Messagebox.OK,

View File

@ -0,0 +1,59 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package com.rjconsultores.ventaboletos.web.utilerias;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.InputEvent;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.Textbox;
/**
*
* @author Administrador
*/
public class MyTextboxCaracterEspecial extends Intbox {
/**
*
*/
private static final long serialVersionUID = 1L;
public MyTextboxCaracterEspecial() {
this.setStyle("text-transform:uppercase;");
}
@Override
public Integer getValue() throws WrongValueException {
return super.getValue();
}
@Override
public void setValue(Integer value) throws WrongValueException {
if (value == null) {
super.setValue(value);
} else {
super.setValue(value);
}
}
@Override
public String getText() throws WrongValueException {
return super.getText();
}
@Override
public void setText(String value) throws WrongValueException {
if (value == null) {
super.setText(value);
} else {
super.setText(value);
}
}
public void onChanging(InputEvent event) {
this.setText((String) event.getValue().replace("-", "").replace(".", ""));// verificar se pode espacos e letras
}
}

View File

@ -65,9 +65,8 @@
<row> <row>
<label <label
value="${c:l('editarCatalogoDeRutaController.lblNumRuta.value')}" /> value="${c:l('editarCatalogoDeRutaController.lblNumRuta.value')}" />
<textbox id="txtNumRuta" maxlength="5" <intbox id="txtNumRuta" maxlength="5" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxCaracterEspecial"
constraint="no empty" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" constraint="no negative,no empty,/\d/" value="@{winEditarRuta$composer.ruta.numRuta}"/>
value="@{winEditarRuta$composer.ruta.numRuta}" />
</row> </row>
<row> <row>
<label <label