Merge pull request 'fixes bug#AL-2048' (#56) from AL-2048 into master

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/56
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.0.43</version>
+	<version>1.0.44</version>
 	<packaging>war</packaging>
  
 	<properties>

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java

@@ -34,6 +34,7 @@ import java.util.zip.ZipOutputStream;
 
 import javax.activation.MimetypesFileTypeMap;
 import javax.sql.DataSource;
+import javax.swing.text.MaskFormatter;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
@@ -200,6 +201,8 @@ import com.rjconsultores.wsag.GeradorTitulosAG;
 //import com.rjconsultores.wsag.WSAGLog;
 import com.rjconsultores.wsag.WSAGLog;
 
+import bsh.ParseException;
+
 /**
  *
  * @author Rafius
@@ -657,6 +660,9 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
             }
         });
 		
+		
+		
+		
 		inserirItensLista(lsCategoriaBloquear);
 		
 		getTxtTaxaConvenienciaPorc().setConstraint(getCt());
@@ -713,6 +719,30 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 			}
 		});
 		
+		numtelefonodos.addEventListener(Events.ON_CHANGE, new EventListener() {
+
+            @Override
+            public void onEvent(Event event) throws Exception {
+            	numtelefonodos.setValue(mascaraTelefone(numtelefonodos.getValue()));
+            }
+		});             
+		
+		numtelefonouno.addEventListener(Events.ON_CHANGE, new EventListener() {
+			@Override
+            public void onEvent(Event event) throws Exception {
+				numtelefonouno.setValue(mascaraTelefone(numtelefonouno.getValue()));        	
+            }
+		});     
+		
+		txtNumFax.addEventListener(Events.ON_CHANGE, new EventListener() {
+
+			@Override
+            public void onEvent(Event event) throws Exception {
+				txtNumFax.setValue(mascaraTelefone(txtNumFax.getValue()));
+            }
+		});		
+		
+
 		try {
 			fechamentoParamptovtaList.setItemRenderer(new FechamentoParamptovtaListItemRenderer());
 
@@ -2084,25 +2114,28 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 				puntoVenta.setNumfax(null);
 				if (!txtNumFax.getValue().equals("")) {
 					getString = this.replaceTextbox(txtNumFax);
-					if (getString.length() >= 11) {
+					if (getString.indexOf("_") > 0) {
 						puntoVenta.setNumfax(txtNumFax.getValue().replace("_", ""));
-					}
+					}else
+						puntoVenta.setNumfax(txtNumFax.getValue());
 				}
 				
 				puntoVenta.setNumtelefonouno(null);
 				if (!numtelefonouno.getValue().equals("")) {
 					getString = this.replaceTextbox(numtelefonouno);
-					if (getString.length() >= 11) {
+					if (getString.indexOf("_") > 0) {
 						puntoVenta.setNumtelefonouno(numtelefonouno.getValue().replace("_", ""));
-					}
+					}else
+						puntoVenta.setNumtelefonouno(numtelefonouno.getValue());
 				}
 				
 				puntoVenta.setNumtelefonodos(null);
 				if (!numtelefonodos.getValue().equals("")) {
 					getString = this.replaceTextbox(numtelefonodos);
-					if (getString.length() >= 11) {
+					if (getString.indexOf("_") > 0) {
 						puntoVenta.setNumtelefonodos(numtelefonodos.getValue().replace("_", ""));
-					}
+					}else
+						puntoVenta.setNumtelefonodos(numtelefonodos.getValue());
 				}
 
 				if (cmbBanco.getSelectedItem() == null) {
@@ -4744,6 +4777,21 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		this.tabEndereco = tabEndereco;
 	}
 	
+	private String mascaraTelefone(String campo) {
+		campo = formatString(campo,"(###)####-####");
+		return campo;
+	}
+	
+	private static String formatString(String value, String pattern) {
+		MaskFormatter mf;
+		try {
+			mf = new MaskFormatter(pattern);
+			mf.setValueContainsLiteralCharacters(false);
+			return mf.valueToString(value);
+		} catch (Exception e) {
+			return value;
+		}
+	}
 	
 	
 }

web/gui/catalogos/editarPuntoVenta.zul

@@ -266,7 +266,7 @@
 								<label
 									value="${c:l('editarPuntoVentaController.lbTelefonoUno.value')}" />
 								<textbox id="numtelefonouno"
-									constraint="no zero" width="70%" maxlength="40"
+									constraint="no zero" width="70%" maxlength="15"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
 							</row>
 							<row>
@@ -274,7 +274,7 @@
 								<label
 									value="${c:l('editarPuntoVentaController.lbTelefonoDos.value')}" />
 								<textbox id="numtelefonodos"
-									constraint="no zero" width="70%" maxlength="40"
+									constraint="no zero" width="70%" maxlength="15"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
 							</row>