From e79f4da42735e5ff1ec2bd477ff96213e6dd83b2 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 12 Jun 2015 21:59:56 +0000
Subject: [PATCH] fixes bug #6376

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@44982 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/PacoteDAO.java              |  4 ++++
 .../dao/hibernate/PacoteHibernateDAO.java        | 16 +++++++++++++---
 .../ventaboletos/entidad/Pacote.java             |  2 +-
 .../ventaboletos/entidad/VendaPacote.java        | 12 ++++++++++++
 .../ventaboletos/enums/LocalEnderecoApanhe.java  | 13 +++++++++++++
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java b/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java
index d4f93d07f..3e20344ab 100644
--- a/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java
@@ -1,5 +1,9 @@
 package com.rjconsultores.ventaboletos.dao;
 
+import java.util.List;
+
+import org.hibernate.criterion.Criterion;
+
 import com.rjconsultores.ventaboletos.entidad.Pacote;
 
 public interface PacoteDAO extends GenericDAO<Pacote, Integer> {
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java
index 3a6b8a9c6..8ab767f21 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java
@@ -1,6 +1,10 @@
 package com.rjconsultores.ventaboletos.dao.hibernate;
 
+import java.util.List;
+
+import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -18,8 +22,14 @@ public class PacoteHibernateDAO extends GenericHibernateDAO<Pacote, Integer> imp
 	public PacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
 		setSessionFactory(factory);
 	}
-	
-	
-	
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<Pacote> obtenerTodos() {
+		Criteria c = this.makeCriteria();
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+		return c.list();
+	}
+	
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Pacote.java b/src/com/rjconsultores/ventaboletos/entidad/Pacote.java
index f8e407f8d..2c53a678a 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Pacote.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Pacote.java
@@ -197,7 +197,7 @@ public class Pacote implements Serializable {
 
 	@Override
 	public String toString() {
-		return "Pacote [pacoteId=" + pacoteId + ", nompacote=" + nompacote + ", descpacote=" + descpacote + ", indvendaagencia=" + indvendaagencia + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", ruta=" + ruta + "]";
+		return this.getNompacote();
 	}
 
 	public Empresa getEmpresa() {
diff --git a/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java b/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java
index d01cd28cc..e254e6a5d 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java
@@ -63,6 +63,10 @@ public class VendaPacote implements Serializable {
 	
 	@Column(name = "USUARIO_CANCELAMENTO_ID")
 	private Integer usuarioCancelamentoId;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "USUARIO_ID")
+	private Usuario usuario;
 	
 	@Column(name = "SUBTOTAL")
 	private BigDecimal subtotal;
@@ -169,4 +173,12 @@ public class VendaPacote implements Serializable {
 		this.enderecoApanhes = enderecoApanhes;
 	}
 
+	public Usuario getUsuario() {
+		return usuario;
+	}
+
+	public void setUsuario(Usuario usuario) {
+		this.usuario = usuario;
+	}
+
 }
diff --git a/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java b/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java
index 1918d6e5b..e8f4996e4 100644
--- a/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java
+++ b/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java
@@ -23,5 +23,18 @@ public enum LocalEnderecoApanhe {
 	public String toString() {
 		return this.descricao;
 	}
+	
+	public static LocalEnderecoApanhe getLocalEnderecoApanhe(Integer valor) {
+		if(APANHE_EM_CASA.getValor().equals(valor)) {
+			return APANHE_EM_CASA;
+		} else if(HOTEL.getValor().equals(valor)) {
+			return HOTEL;
+		} else if(NENHUM.getValor().equals(valor)) {
+			return NENHUM;
+		} else if(REGIAO_METROPOLITANA.getValor().equals(valor)) {
+			return REGIAO_METROPOLITANA;
+		}
+		return null;
+	}
 
 }