From 42fc9d0484229fab9a9d39ea0b9417ec621532f9 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 17 Oct 2016 18:13:00 +0000
Subject: [PATCH] bug #8032

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@61695 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../entidad/CategoriaDescuento.java           | 24 ++++++++++++++++++-
 .../ventaboletos/entidad/Ruta.java            |  5 ----
 .../enums/HorarioLiberacaoVendaPassagem.java  |  8 +++++++
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java

diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
index fb5c75543..7ced03d08 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
@@ -9,23 +9,33 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.SequenceGenerator;
+
+import org.springframework.transaction.annotation.Transactional;
+
+
+import org.springframework.transaction.annotation.Transactional;
+
+import com.rjconsultores.ventaboletos.enums.HorarioLiberacaoVendaPassagem;
 
 /**
  * 
@@ -106,6 +116,10 @@ public class CategoriaDescuento implements Serializable {
 	private Boolean indexigefecnacimientopasajero;
 	@Column(name = "INDEXIGEDOC2PASSAGEIRO")
 	private Boolean indExigeDoc2Passageiro;	
+	
+	@Enumerated(EnumType.ORDINAL)
+	@Column(name = "HORARIOLIBERACAOVENDAPESSAGEM")
+	private HorarioLiberacaoVendaPassagem horarioLiberacaoVendaPassagem;	
 
 	public enum DisponibilidadeFeriado {
 		// Declaração dos enum
@@ -479,4 +493,12 @@ public class CategoriaDescuento implements Serializable {
 		return sCampos.toString();
 	}
 
+	public HorarioLiberacaoVendaPassagem getHorarioLiberacaoVendaPassagem() {
+		return horarioLiberacaoVendaPassagem;
+	}
+
+	public void setHorarioLiberacaoVendaPassagem(HorarioLiberacaoVendaPassagem horarioLiberacaoVendaPassagem) {
+		this.horarioLiberacaoVendaPassagem = horarioLiberacaoVendaPassagem;
+	}
+
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Ruta.java b/src/com/rjconsultores/ventaboletos/entidad/Ruta.java
index 49d41f2e5..b472672d3 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Ruta.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Ruta.java
@@ -229,11 +229,6 @@ public class Ruta implements Serializable, Comparable<Ruta> {
 		return numSecuencia;
 	}
 
-	public Ruta(Integer rutaId) {
-		this();
-		this.rutaId = rutaId;
-	}
-
 	public Integer getRutaId() {
 		return rutaId;
 	}
diff --git a/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java b/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java
new file mode 100644
index 000000000..1f3f1bfea
--- /dev/null
+++ b/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java
@@ -0,0 +1,8 @@
+package com.rjconsultores.ventaboletos.enums;
+
+public enum HorarioLiberacaoVendaPassagem {
+	
+	HORARIO_LIBERACAO_VENDA_ORIGEM,
+	HORARIO_LIBERACAO_VENDA_TRECHO;
+
+}