diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java index 6f98536e3..121ae35c9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java @@ -11,6 +11,7 @@ import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Button; import com.rjconsultores.ventaboletos.entidad.Hotel; @@ -41,6 +42,7 @@ public class EditarHotelController extends MyGenericForwardComposer { private MyTextbox txtBairro; private MyTextbox txtCidade; private MyTextbox txtEstado; + private MyTextbox txtDesctelefone; public Button getBtnApagar() { return btnApagar; @@ -69,7 +71,7 @@ public class EditarHotelController extends MyGenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - + aplicarMascara(); hotel = (Hotel) Executions.getCurrent().getArg().get("hotel"); hotelList = (MyListbox) Executions.getCurrent().getArg().get("hotelList"); @@ -89,11 +91,13 @@ public class EditarHotelController extends MyGenericForwardComposer { txtEndereco.getValue(); txtEstado.getValue(); txtNumero.getValue(); + txtDesctelefone.getValue(); try { hotel.setActivo(Boolean.TRUE); hotel.setFecmodif(Calendar.getInstance().getTime()); hotel.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + hotel.setDesctelefone(txtDesctelefone.getValue().replaceAll("[^0-9]", "")); if (hotel.getHotelId() == null) { hotelService.suscribir(hotel); @@ -142,6 +146,10 @@ public class EditarHotelController extends MyGenericForwardComposer { log.error(ex); } } + + public void aplicarMascara() { + Clients.evalJavaScript("jQuery('#" + txtDesctelefone.getUuid()+ "').mask('(99)9999-9999?9')"); + } public MyTextbox getTxtCep() { return txtCep; @@ -198,4 +206,12 @@ public class EditarHotelController extends MyGenericForwardComposer { public void setTxtNumero(MyTextbox txtNumero) { this.txtNumero = txtNumero; } + + public MyTextbox getTxtDesctelefone() { + return txtDesctelefone; + } + + public void setTxtDesctelefone(MyTextbox txtDesctelefone) { + this.txtDesctelefone = txtDesctelefone; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuHotel.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuHotel.java index 6dc88806c..e9042c0a6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuHotel.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuHotel.java @@ -19,7 +19,7 @@ public class ItemMenuHotel extends DefaultItemMenuSistema { @Override public void ejecutar() { PantallaUtileria.openWindow("/gui/catalogos/busquedaHotel.zul", - Labels.getLabel("busquedaTurnoController.window.title"), getArgs(), desktop); + Labels.getLabel("busquedaHotelController.window.title"), getArgs(), desktop); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHotel.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHotel.java index 355987079..46b442497 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHotel.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHotel.java @@ -1,5 +1,8 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; +import javax.swing.text.MaskFormatter; + +import org.apache.commons.lang.StringUtils; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -7,16 +10,26 @@ import org.zkoss.zul.ListitemRenderer; import com.rjconsultores.ventaboletos.entidad.Hotel; public class RenderHotel implements ListitemRenderer { - + public void render(Listitem lstm, Object o) throws Exception { Hotel hotel = (Hotel) o; Listcell lc = new Listcell(hotel.getHotelId().toString()); lc.setParent(lstm); - + lc = new Listcell(hotel.getDeschotel()); lc.setParent(lstm); + if(StringUtils.isNotBlank(hotel.getDesctelefone())) { + MaskFormatter mf = new MaskFormatter("(##)####-#####"); + mf.setValueContainsLiteralCharacters(false); + lc = new Listcell(mf.valueToString(hotel.getDesctelefone())); + lc.setParent(lstm); + } else { + lc = new Listcell(""); + lc.setParent(lstm); + } + lstm.setAttribute("data", hotel); } } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index fbd906a30..ea5f822f9 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5170,6 +5170,7 @@ busquedaHotelController.txtNombre.label = Descripción busquedaHotelController.btnPesquisa.label = Búsqueda busquedaHotelController.lhId.label = ID busquedaHotelController.lhDesc.label = Descripción +busquedaHotelController.lhDesctelefone.label = Teléfono # Editar Hotel editarHotelController.window.title = Hotel @@ -5184,6 +5185,7 @@ editarHotelController.lhComplemento.label = Complemento editarHotelController.lhBairro.label = Colonia editarHotelController.lhCidade.label = Ciudad editarHotelController.lhEstado.label = Estado +editarHotelController.lhDesctelefone.label = Teléfono editarHotelController.MSG.suscribirOK = Hotel se registró exitosamente editarHotelController.MSG.borrarPergunta = Eliminar hotel? editarHotelController.MSG.borrarOK = Hotel se eliminó exitosamente diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 9f26f62ae..b5be3e678 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5241,6 +5241,7 @@ busquedaHotelController.txtNombre.label = Descrição busquedaHotelController.btnPesquisa.label = Pesquisa busquedaHotelController.lhId.label = ID busquedaHotelController.lhDesc.label = Descrição +busquedaHotelController.lhDesctelefone.label = Telefone # Editar Hotel editarHotelController.window.title = Hotel @@ -5255,6 +5256,7 @@ editarHotelController.lhComplemento.label = Complemento editarHotelController.lhBairro.label = Bairro editarHotelController.lhCidade.label = Cidade editarHotelController.lhEstado.label = Estado +editarHotelController.lhDesctelefone.label = Telefone editarHotelController.MSG.suscribirOK = Hotel Registrado com Sucesso. editarHotelController.MSG.borrarPergunta = Eliminar Hotel? editarHotelController.MSG.borrarOK = Hotel Excluido com Sucesso. diff --git a/web/gui/catalogos/busquedaHotel.zul b/web/gui/catalogos/busquedaHotel.zul index fab8119cf..22bb452c8 100644 --- a/web/gui/catalogos/busquedaHotel.zul +++ b/web/gui/catalogos/busquedaHotel.zul @@ -47,6 +47,9 @@ + diff --git a/web/gui/catalogos/editarHotel.zul b/web/gui/catalogos/editarHotel.zul index 2e0f789d8..fb1594311 100644 --- a/web/gui/catalogos/editarHotel.zul +++ b/web/gui/catalogos/editarHotel.zul @@ -7,7 +7,7 @@ @@ -36,6 +36,12 @@ value="@{winEditarHotel$composer.hotel.deschotel}" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/> + +