fixes bug #9105

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71568 d1611594-4594-4d17-8e1d-87c2c4800839

src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java

@@ -7,7 +7,6 @@ package com.rjconsultores.ventaboletos.dao.hibernate;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.collections.set.CompositeSet.SetMutator;
 import org.apache.commons.lang.math.NumberUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Query;

src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java

@@ -4,7 +4,6 @@
  */
 package com.rjconsultores.ventaboletos.dao.hibernate;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;

src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java

@@ -83,6 +83,9 @@ public class CajaDetPago implements java.io.Serializable {
 	@OneToOne(mappedBy = "cajaDetPago")
 	private CajaTarjeta cajaTarjetas;
 
+	@Column(name = "SERIESUBSERIE", length = 30)
+	private String serieSubSerie;
+
 	public Long getCajaDetPagoId() {
 		return cajaDetPagoId;
 	}
@@ -235,4 +238,12 @@ public class CajaDetPago implements java.io.Serializable {
 		this.cajaTarjetas = cajaTarjetas;
 	}
 
+	public String getSerieSubSerie() {
+		return serieSubSerie;
+	}
+
+	public void setSerieSubSerie(String serieSubSerie) {
+		this.serieSubSerie = serieSubSerie;
+	}
+
 }

src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java

@@ -55,6 +55,10 @@ public class CuponSecretaria implements Serializable {
 	private BigDecimal porcdescuentoseguro;
 	@Column(name = "PORCDESCUENTOTAXAEMBARQUE")
 	private BigDecimal porcdescuentotaxaembarque;
+	@Column(name = "SERIE")
+	private String serie;
+	@Column(name = "SUBSERIE")
+	private String subserie;
 
 	public CuponSecretaria() {
 	}
@@ -151,6 +155,22 @@ public class CuponSecretaria implements Serializable {
 		this.porcdescuentotaxaembarque = porcdescuentotaxaembarque;
 	}
 
+	public String getSubserie() {
+		return subserie;
+	}
+
+	public void setSubserie(String subserie) {
+		this.subserie = subserie;
+	}
+
+	public String getSerie() {
+		return serie;
+	}
+
+	public void setSerie(String serie) {
+		this.serie = serie;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 0;

src/com/rjconsultores/ventaboletos/entidad/Secretaria.java

@@ -60,6 +60,8 @@ public class Secretaria implements Serializable {
 	private String cvesecretaria;
 	@Column(name = "VALIDAFOLIO")
 	private Boolean validafolio;
+	@Column(name = "INDSERIESUBSERIE")
+	private Boolean validaSerieSubSerie;
 	@Column(name = "IMPRIMEPRECIO")
 	private Short imprimeprecio;
 	@OneToMany(cascade = CascadeType.ALL)
@@ -178,7 +180,6 @@ public class Secretaria implements Serializable {
 		return tmp;
 	}
 
-    
 	public List<SecretariaEmpresa> getEmpresas() {
 		List<SecretariaEmpresa> lista = new ArrayList<SecretariaEmpresa>();
 		for (SecretariaEmpresa eb : empresas) {
@@ -197,6 +198,13 @@ public class Secretaria implements Serializable {
 		this.lsCuponSecretaria = lsCuponSecretaria;
 	}
 
+	public Boolean getValidaSerieSubSerie() {
+		return validaSerieSubSerie;
+	}
+
+	public void setValidaSerieSubSerie(Boolean validaSerieSubSerie) {
+		this.validaSerieSubSerie = validaSerieSubSerie;
+	}
 
 	@Override
 	public int hashCode() {

src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java

@@ -235,4 +235,8 @@ public class ApplicationProperties {
 		return property.equals("1");
 	}
 	
+	public boolean isSerieSubserieSecretaria() {
+		String property = p.getProperty("validaSerieSubserieSecretaria", "0");
+		return property.equals("1");
+	}
 }

src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java

@@ -1,15 +1,9 @@
 package com.rjconsultores.ventaboletos.utilerias.seguridad;
 
-import java.io.File;
-import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Locale;
 import java.util.regex.Pattern;
 
-import org.zkoss.util.resource.LabelLocator;
-import org.zkoss.util.resource.Labels;
-
 import com.rjconsultores.ventaboletos.exception.BusinessException;
 
 public class ContrasenaUtileria {
@@ -52,24 +46,24 @@ public class ContrasenaUtileria {
 			throw new BusinessException("complejidadContrasena.CANT_ESPECIALES", new Object[]{CANT_ESPECIALES});
 		}
 	}
-	public static void main(String args[]){
-		System.out.println(ContrasenaUtileria.encriptarContrasena("gleimar"));
-		
-		LabelLocator teste = new LabelLocator() {
-			
-			@Override
-			public URL locate(Locale arg0) throws Exception {
-				return new File("E:/scia_ventaboletos_transpais_senda/sco/AdmVenta/Web/trunk/ventaboletos/web/WEB-INF/i3-label_pt_BR.label").toURI().toURL();
-			}
-		};
-		Labels.register(teste);
-		try {
-			ContrasenaUtileria.validarContrasenaCompleja("asdfasdf1@@");
-			System.out.println("ok");
-		} catch (BusinessException e) {
-			System.out.println(e.getLocalizedMessage());
-		}
-		
-	}
+//	public static void main(String args[]){
+//		System.out.println(ContrasenaUtileria.encriptarContrasena("gleimar"));
+//		
+//		LabelLocator teste = new LabelLocator() {
+//			
+//			@Override
+//			public URL locate(Locale arg0) throws Exception {
+//				return new File("E:/scia_ventaboletos_transpais_senda/sco/AdmVenta/Web/trunk/ventaboletos/web/WEB-INF/i3-label_pt_BR.label").toURI().toURL();
+//			}
+//		};
+//		Labels.register(teste);
+//		try {
+//			ContrasenaUtileria.validarContrasenaCompleja("asdfasdf1@@");
+//			System.out.println("ok");
+//		} catch (BusinessException e) {
+//			System.out.println(e.getLocalizedMessage());
+//		}
+//		
+//	}
 
 }