Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm

into bug#AL-1905

# Conflicts:
#	pom.xml

pom.xml

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

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java

@@ -86,8 +86,8 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends
 								total = total.add(rset.getBigDecimal("totalReceita"));
 								map.put("totalReceita", total);
 							}
-							if (volta == 0) {
+							else {
-								map.put("totalvolta", rset.getLong("totalvolta"));
+								map.put("totalvolta", rset.getLong("totalvolta") + volta);
 								total = total.add(rset.getBigDecimal("totalReceita"));
 								map.put("totalReceita", total);
 							}

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties

@@ -54,6 +54,11 @@ detail.totalSemDesconto=Total s/ desconto
 detail.totalVendido=Total vendido 
 detail.ccf=CCf
 detail.chaveBPe=Ch. BP-e
+detail.totalV=Total V.
+detail.totalC=Total C.
+detail.totalP=Total P.
+
+
 
 linhas=Linhas
 

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties

@@ -54,6 +54,9 @@ detail.totalSemDesconto=Total s/ desconto
 detail.totalVendido=Total vendido
 detail.ccf=CCf
 detail.chaveBPe=Ch. BP-e
+detail.totalV=Total Vendido
+detail.totalC=Total Cobrado
+detail.totalP=Total Preço
 
 linhas=Linhas
 

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioEmpresaCorrida" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="2.923075650000008"/>
+	<property name="ireport.zoom" value="1.996500000000005"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="1044"/>
-	<property name="ireport.y" value="220"/>
+	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<parameter name="fecInicioViagem" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -597,32 +597,63 @@
 		</band>
 	</detail>
 	<summary>
-		<band height="18">
+		<band height="109">
 			<textField>
 				<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="0" width="139" height="18"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="182" y="0" width="75" height="18"/>
-				<textElement/>
+				<textElement>
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="91cfa7bb-414a-41a5-8971-4b91012dbc4d" x="779" y="0" width="90" height="18"/>
+				<reportElement uuid="91cfa7bb-414a-41a5-8971-4b91012dbc4d" x="814" y="18" width="129" height="18"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="779b8652-d8e3-4b84-85f2-d37ef88488b9" x="869" y="0" width="90" height="18"/>
+				<reportElement uuid="779b8652-d8e3-4b84-85f2-d37ef88488b9" x="814" y="0" width="129" height="18"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="97a0b50b-6760-4619-86ea-ea6ac23547d9" x="959" y="0" width="90" height="18"/>
+				<reportElement uuid="97a0b50b-6760-4619-86ea-ea6ac23547d9" x="814" y="36" width="129" height="18"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{total_vendido}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="7702e077-cc45-41e8-83d7-a6b45fcd5a80" x="650" y="18" width="164" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.totalP}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="7d8e9e1e-3fb6-4b08-8b72-4ff02b598be5" x="650" y="0" width="164" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.totalC}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="1fe1943b-acc0-4514-8c0e-3c63aae5c329" x="650" y="36" width="164" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.totalV}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 	<noData>

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>