diff --git a/pom.xml b/pom.xml
index 2e6936989..f56e6b98b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.111.0
+ 1.112.0
war
- 1.85.0
+ 1.86.0
1.73.0
UTF-8
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImpresionLayoutConfigController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImpresionLayoutConfigController.java
index 8c78dfee6..3a0b634ea 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImpresionLayoutConfigController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImpresionLayoutConfigController.java
@@ -1,14 +1,18 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
+import org.springframework.web.util.HtmlUtils;
import org.zkforge.ckez.CKeditor;
import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox;
@@ -18,10 +22,13 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Button;
import org.zkoss.zul.Comboitem;
+import org.zkoss.zul.Image;
+import org.zkoss.zul.Textbox;
import org.zkoss.zul.Vlayout;
import com.rjconsultores.ventaboletos.entidad.ImpresionLayoutConfig;
import com.rjconsultores.ventaboletos.enums.EnumLinguagemImpresion;
+import com.rjconsultores.ventaboletos.rest.LabelaryService;
import com.rjconsultores.ventaboletos.service.ImpresionLayoutConfigService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
@@ -45,6 +52,8 @@ public class EditarImpresionLayoutConfigController extends MyGenericForwardCompo
private List lsEnumLinguagemImpresion;
private Vlayout layoutCkEditor;
private Borderlayout layoutTextZpl;
+ private Textbox txtTexto;
+ private Image img;
private static Logger log = LogManager.getLogger(EditarImpresionLayoutConfigController.class);
@Override
@@ -67,6 +76,11 @@ public class EditarImpresionLayoutConfigController extends MyGenericForwardCompo
}
ckTexto.setValue(impresionLayoutConfig.getTexto());
+
+ if (StringUtils.isNotBlank(impresionLayoutConfig.getTexto())
+ && EnumLinguagemImpresion.ZPL.equals(impresionLayoutConfig.getLinguagem())) {
+ img.setContent(new org.zkoss.image.AImage("preview.png", retornaImagem(impresionLayoutConfig.getTexto())));
+ }
}
public void onClick$btnSalvar(Event ev) throws InterruptedException {
@@ -167,6 +181,22 @@ public class EditarImpresionLayoutConfigController extends MyGenericForwardCompo
}
+ public void onClick$btnRedesenhar(Event ev) throws InterruptedException {
+
+ try {
+ img.setContent(new org.zkoss.image.AImage("preview.png", retornaImagem(txtTexto.getText())));
+ } catch (IOException e) {
+ log.error("editarImpresionLayoutConfigController: " + e);
+ Messagebox.show(e.getLocalizedMessage(),
+ Labels.getLabel("editarImpresionLayoutConfigController.window.title"), Messagebox.OK,
+ Messagebox.ERROR);
+ }
+ }
+
+ private InputStream retornaImagem(String texto) {
+ return LabelaryService.getInstance().retornarImagem(HtmlUtils.htmlEscape(texto));
+ }
+
public ImpresionLayoutConfigService getImpresionLayoutConfigService() {
return impresionLayoutConfigService;
}
diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label
index 5e38ba464..8d970fdbd 100644
--- a/web/WEB-INF/i3-label_en.label
+++ b/web/WEB-INF/i3-label_en.label
@@ -5261,6 +5261,7 @@ editarImagemController.fileupload.label = Select Image
editarImagemController.lbNome.value = Image
# Pantalla Editar Imagem
editarImagemController.window.title = Image
+editarImpresionLayoutConfigController.btnRedesenhar.value = Redraw
editarImpresionLayoutConfigController.MSG.borrarOK = Layout Deleted Successfully.
editarImpresionLayoutConfigController.MSG.borrarPergunta = Delete Layout?
editarImpresionLayoutConfigController.MSG.suscribirOK = Layout Registered Successfully.
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 284cc9778..e9bacc593 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -5194,6 +5194,7 @@ editarImagemController.fileupload.label = Selecionar Imagem
editarImagemController.lbNome.value = Imagem
# Pantalla Editar Imagem
editarImagemController.window.title = Imagem
+editarImpresionLayoutConfigController.btnRedesenhar.value = Rediseñar
editarImpresionLayoutConfigController.MSG.borrarOK = Artículo eliminado con éxito.
editarImpresionLayoutConfigController.MSG.borrarPergunta = ¿Eliminar artículo?
editarImpresionLayoutConfigController.MSG.suscribirOK = Artículo registrado exitosamente.
diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label
index 6e5b73882..dbe371473 100644
--- a/web/WEB-INF/i3-label_fr_FR.label
+++ b/web/WEB-INF/i3-label_fr_FR.label
@@ -5190,6 +5190,7 @@ editarImagemController.fileupload.label = Sélectionner une image
editarImagemController.lbNome.value = Images
# Pantalla Editar Imagem
editarImagemController.window.title = Images
+editarImpresionLayoutConfigController.btnRedesenhar.value = Refonte
editarImpresionLayoutConfigController.MSG.borrarOK = Article supprimé avec succès.
editarImpresionLayoutConfigController.MSG.borrarPergunta = Supprimer l'article ?
editarImpresionLayoutConfigController.MSG.suscribirOK = Article enregistré avec succès.
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 23918f9c7..a052c4247 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -5193,6 +5193,7 @@ editarImagemController.fileupload.label = Selecionar Imagem
editarImagemController.lbNome.value = Imagem
# Pantalla Editar Imagem
editarImagemController.window.title = Imagem
+editarImpresionLayoutConfigController.btnRedesenhar.value = Redesenhar
editarImpresionLayoutConfigController.MSG.borrarOK = Layout Excluido com Sucesso.
editarImpresionLayoutConfigController.MSG.borrarPergunta = Eliminar Layout?
editarImpresionLayoutConfigController.MSG.suscribirOK = Layout Registrado com Sucesso.
diff --git a/web/gui/catalogos/editarImpresionLayoutConfig.zul b/web/gui/catalogos/editarImpresionLayoutConfig.zul
index 6d9ec60ad..f56d2d598 100644
--- a/web/gui/catalogos/editarImpresionLayoutConfig.zul
+++ b/web/gui/catalogos/editarImpresionLayoutConfig.zul
@@ -57,24 +57,21 @@
-
+
-
-
-
+
+