diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java new file mode 100644 index 000000000..5a501bff2 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java @@ -0,0 +1,189 @@ + + +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.event.EventListener; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Paging; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.ConfTotem; +import com.rjconsultores.ventaboletos.entidad.Custom; +import com.rjconsultores.ventaboletos.enums.SistemaEnum; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfTotem; +import com.trg.search.Search; + +/** + * + * @author Wallace + */ +@Controller("busquedaConfTotemController") +@Scope("prototype") +public class BusquedaConfTotemController extends MyGenericForwardComposer { + + /** + * + */ + private static final long serialVersionUID = 1L; + @Autowired + private transient PagedListWrapper plwConfTotem; + private MyListbox confTotemList; + private Paging pagingCustom; + private Textbox txtChave; + private Combobox cmbSistema; + private List lsSistemaEnum; + private Search customBusqueda; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + lsSistemaEnum = Arrays.asList(SistemaEnum.values()); + + confTotemList.setItemRenderer(new RenderConfTotem()); + confTotemList.addEventListener("onDoubleClick", new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + ConfTotem a = (ConfTotem) confTotemList.getSelected(); + verConfTotem(a); + } + }); + + refreshLista(); + + txtChave.focus(); + } + + private void verConfTotem(ConfTotem a) { + if (a == null) { + return; + } + + Map args = new HashMap(); + args.put("confTotem", a); + args.put("confTotemList", confTotemList); + + openWindow("/gui/catalogos/editarConfTotem.zul", + Labels.getLabel("customController.window.title"), args, MODAL); + } + + private void refreshLista() { + HibernateSearchObject customBusqueda = new HibernateSearchObject(ConfTotem.class, + pagingCustom.getPageSize()); + + customBusqueda.addFilterLike("chave", + "%" + txtChave.getText().trim().concat("%")); + + Comboitem cbiSistema = cmbSistema.getSelectedItem(); + if (cbiSistema != null) { + SistemaEnum dab = (SistemaEnum) cbiSistema.getValue(); + customBusqueda.addFilterEqual("sistema", dab.getValor()); + } + + customBusqueda.addFilterEqual("activo", Boolean.TRUE); + + customBusqueda.addSortAsc("valor"); + + plwConfTotem.init(customBusqueda, confTotemList, pagingCustom); + + if (confTotemList.getData().length == 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), + Labels.getLabel("customController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + } + } + } + + public void onClick$btnPesquisa(Event ev) { + refreshLista(); + } + + public void onClick$btnRefresh(Event ev) { + refreshLista(); + } + + public void onClick$btnNovo(Event ev) { + verConfTotem(new ConfTotem()); + } + + public PagedListWrapper getPlwCustom() { + return plwConfTotem; + } + + public void setPlwCustom(PagedListWrapper plwConfTotem) { + this.plwConfTotem = plwConfTotem; + } + + public MyListbox getConfTotemList() { + return confTotemList; + } + + public void setCustomList(MyListbox confTotemList) { + this.confTotemList = confTotemList; + } + + public Paging getPagingCustom() { + return pagingCustom; + } + + public void setPagingCustom(Paging pagingCustom) { + this.pagingCustom = pagingCustom; + } + + public Textbox getTxtChave() { + return txtChave; + } + + public void setTxtChave(Textbox txtChave) { + this.txtChave = txtChave; + } + + public Combobox getCmbSistema() { + return cmbSistema; + } + + public void setCmbSistema(Combobox cmbSistema) { + this.cmbSistema = cmbSistema; + } + + public List getLsSistemaEnum() { + return lsSistemaEnum; + } + + public void setLsSistemaEnum(List lsSistemaEnum) { + this.lsSistemaEnum = lsSistemaEnum; + } + + public Search getCustomBusqueda() { + return customBusqueda; + } + + public void setCustomBusqueda(Search customBusqueda) { + this.customBusqueda = customBusqueda; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java new file mode 100644 index 000000000..93160d5fd --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java @@ -0,0 +1,189 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; + +import java.util.Arrays; +import java.util.Calendar; +import java.util.List; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +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.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Textbox; +import org.zkoss.zul.api.Comboitem; + +import com.rjconsultores.ventaboletos.entidad.ConfTotem; +import com.rjconsultores.ventaboletos.entidad.Custom; +import com.rjconsultores.ventaboletos.enums.SistemaEnum; +import com.rjconsultores.ventaboletos.service.ConfTotemService; +import com.rjconsultores.ventaboletos.service.CustomService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + +/** + * + * @author Lucas + */ +@Controller("editarConfTotemController") +@Scope("prototype") +public class EditarConfTotemController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + @Autowired + private ConfTotemService confTotemService; + private ConfTotem confTotem; + private MyListbox confTotemList; + private Button btnApagar; + private Textbox txtChave; + private Textbox txtValor; + private Combobox cmbSistema; + private List lsSistemaEnum; + + private static Logger log = Logger.getLogger(EditarCustomController.class); + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + confTotem = (ConfTotem) Executions.getCurrent().getArg().get("confTotem"); + confTotemList = (MyListbox) Executions.getCurrent().getArg().get("confTotemList"); + + lsSistemaEnum = Arrays.asList(SistemaEnum.values()); + + if (confTotem.getConfTotemId() == null) { + btnApagar.setVisible(Boolean.FALSE); + }else{ + txtChave.setDisabled(Boolean.TRUE); + cmbSistema.setDisabled(Boolean.TRUE); + + } + + txtValor.focus(); + } + + public void onClick$btnSalvar(Event ev) throws InterruptedException { + txtValor.getValue(); + + try { + + Comboitem cbSistema = cmbSistema.getSelectedItem(); + + confTotem.setActivo(Boolean.TRUE); + confTotem.setFecmodif(Calendar.getInstance().getTime()); + confTotem.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + ConfTotem tempConfTotem = confTotemService.buscar(confTotem.getChave()); + + if (confTotem.getConfTotemId() == null && tempConfTotem != null) { + Messagebox.show( + Labels.getLabel("MSG.Registro.Existe"), + Labels.getLabel("customController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } else { + if (confTotem.getConfTotemId() == null) { + confTotemService.suscribir(confTotem); + confTotemList.addItem(confTotem); + } else { + confTotemService.actualizacion(confTotem); + confTotemList.updateItem(confTotem); + } + + Messagebox.show( + Labels.getLabel("customController.MSG.suscribirOK"), + Labels.getLabel("customController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + + closeWindow(); + } + } catch (Exception ex) { + log.error("", ex); + Messagebox.show( + Labels.getLabel("MSG.Error"), + Labels.getLabel("customController.window.title"), + Messagebox.OK, Messagebox.ERROR); + } + } + + public void onClick$btnApagar(Event ev) throws InterruptedException { + + int resp = Messagebox.show( + Labels.getLabel("customController.MSG.borrarPergunta"), + Labels.getLabel("customController.window.title"), + Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); + + if (resp == Messagebox.YES) { + + confTotemService.borrar(confTotem); + + Messagebox.show( + Labels.getLabel("customController.MSG.borrarOK"), + Labels.getLabel("customController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + + confTotemList.removeItem(confTotem); + + closeWindow(); + } + } + + + public ConfTotem getCustom() { + return confTotem; + } + + public void setCustom(ConfTotem confTotem) { + this.confTotem = confTotem; + } + + public Button getBtnApagar() { + return btnApagar; + } + + public void setBtnApagar(Button btnApagar) { + this.btnApagar = btnApagar; + } + + public Textbox getTxtChave() { + return txtChave; + } + + public void setTxtChave(Textbox txtChave) { + this.txtChave = txtChave; + } + + public Textbox getTxtValor() { + return txtValor; + } + + public void setTxtValor(Textbox txtValor) { + this.txtValor = txtValor; + } + + public List getLsSistemaEnum() { + return lsSistemaEnum; + } + + public void setLsSistemaEnum(List lsSistemaEnum) { + this.lsSistemaEnum = lsSistemaEnum; + } + + public Combobox getCmbSistema() { + return cmbSistema; + } + + public void setCmbSistema(Combobox cmbSistema) { + this.cmbSistema = cmbSistema; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuConfTotem.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuConfTotem.java new file mode 100644 index 000000000..a5e72f593 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuConfTotem.java @@ -0,0 +1,25 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuConfTotem extends DefaultItemMenuSistema { + + public ItemMenuConfTotem() { + super("indexController.mniConfTotem.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.CONFTOTEM"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/catalogos/busquedaConfTotem.zul", + Labels.getLabel("busquedaConfTotemController.window.title"), getArgs(), desktop); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties index 45acbe6e8..58b2e88eb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties @@ -93,6 +93,7 @@ esquemaOperacional.atualizacorridafechusofecverano=com.rjconsultores.ventaboleto esquemaOperacional.geracaoArquivoEMTU=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemGeracaoArquivoEMTU esquemaOperacional.configuracaoVendaEmbarcada=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.SubMenuConfiguracaoVendaEmbarcada esquemaOperacional.configuracaoVendaEmbarcada.ItemMenuCadastroOperadorEmbarcada=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuCadastroOperadorEmbarcada +esquemaOperacional.configuracaoVendaTotem=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuConfTotem esquemaOperacional.trocoSimples=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.SubMenuTrocoSimples esquemaOperacional.trocoSimples.ItemMenuCadastroEmpresaTrocoSimples=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuCadastroEmpresaTrocoSimples esquemaOperacional.trocoSimples.ItemMenuRelatorioTrocoSimples=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuRelatorioTrocoSimples diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfTotem.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfTotem.java new file mode 100644 index 000000000..48d1a2c72 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfTotem.java @@ -0,0 +1,27 @@ +package com.rjconsultores.ventaboletos.web.utilerias.render; + +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +import com.rjconsultores.ventaboletos.entidad.ConfTotem; + +public class RenderConfTotem implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + + ConfTotem confTotem = (ConfTotem) o; + + Listcell lc = new Listcell(confTotem.getConfTotemId().toString()); + lc.setParent(lstm); + + lc = new Listcell(confTotem.getChave()); + lc.setParent(lstm); + + lc = new Listcell(""); + lc.setParent(lstm); + + lstm.setAttribute("data", confTotem); + } + +} diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml index 1ecfedafb..72381b481 100644 --- a/src/java/spring-config.xml +++ b/src/java/spring-config.xml @@ -487,6 +487,7 @@ com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples com.rjconsultores.ventaboletos.entidad.Imagem com.rjconsultores.ventaboletos.entidad.RutaIcmsExcepcion + com.rjconsultores.ventaboletos.entidad.ConfTotem diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 30b910911..4388b59db 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -107,6 +107,7 @@ indexController.mnCatalogos.label = Catálogos indexController.mnConfiguracionesComerciales.label = Configuração Comercial indexController.mnEsquemaOperacional.label = Esquema Operacional indexController.mnPricing.label = Pricing +indexController.mniConfTotem.label = Configuração Totem indexController.mnTarifas.label = Adm. de Preço indexController.mnSubSegOpcional.label= Seg. Opcional indexController.mnTarifasOficial.label = Cálculo de Preço @@ -8743,6 +8744,11 @@ editarEmpresaTrocoSimples.MSG.borrarOK = Configuração removida com Sucesso. editarConvenioController.MSG.erro= Erro ao salvar busquedaEmpresaTrocoSimples.valorSugerir= Valor Sugerido +editarConfTotemController.permitirTecladoAlfaNumerico =Permitir teclado Alfanumérico +editarConfTotemController.permitirVenda=Permitir Venda +editarConfTotemController.permitirImpressao=Permitir Impressão + + indexController.mniTrocoSimples.mniRelatorioTrocoSimples.label=Relatório Troco Simples relatorioTrocoSimples.window.title=Relatório Troco Simples relatorioTrocoSimples.dataInicial.label=Data Inicial diff --git a/web/gui/catalogos/busquedaConfTotem.zul b/web/gui/catalogos/busquedaConfTotem.zul new file mode 100644 index 000000000..0f7bb8dbd --- /dev/null +++ b/web/gui/catalogos/busquedaConfTotem.zul @@ -0,0 +1,61 @@ + + + + + + + + + +