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

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -26,6 +27,7 @@ public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO<OrgaoConced
 	public List<OrgaoConcedente> obtenerTodos() {
 		Criteria c = getSession().createCriteria(getPersistentClass());
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
+		c.addOrder(Order.asc("descOrgao"));
 
 		return c.list();
 	}

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

@@ -86,6 +86,11 @@ public class CoeficienteTarifa implements Serializable {
 		this.usuarioId = usuarioId;
 	}
 
+	@Override
+	public String toString() {
+		return descCoeficiente + " - " + coeficiente;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

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

@@ -95,6 +95,11 @@ public class OrgaoConcedente implements Serializable {
 		this.usuarioId = usuarioId;
 	}
 
+	@Override
+	public String toString() {
+		return descOrgao;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

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

@@ -75,6 +75,9 @@ public class Tramo implements Serializable {
 	@OneToMany(cascade = CascadeType.ALL)
 	@JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID")
 	private List<TramoKm> tramoKms;
+	@OneToMany(cascade = CascadeType.ALL)
+	@JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID")
+	private List<OrgaoTramo> lsOrgaoTramo;
 
 	public Tramo() {
 	}
@@ -238,9 +241,25 @@ public class Tramo implements Serializable {
 		this.kmReal = kmReal;
 	}
 
+	public List<OrgaoTramo> getLsOrgaoTramo() {
+		List<OrgaoTramo> tmp = new ArrayList<OrgaoTramo>();
+		for (OrgaoTramo orgaoTramo : this.lsOrgaoTramo) {
+			if (orgaoTramo.getActivo()) {
+				tmp.add(orgaoTramo);
+			}
+		}
+
+		this.lsOrgaoTramo = tmp;
+
+		return tmp;
+	}
+
+	public void setLsOrgaoTramo(List<OrgaoTramo> lsOrgaoTramo) {
+		this.lsOrgaoTramo = lsOrgaoTramo;
+	}
+
 	@Override
 	public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
 		if (!(object instanceof Tramo)) {
 			return false;
 		}
@@ -259,10 +278,6 @@ public class Tramo implements Serializable {
 		this.tramoKms = tramoKms;
 	}
 
-//	@Override
-//	public String toString() {
-//		return getDesctramo();
-//	}
 	@Override
 	public String toString() {
 		return getDesctramo().concat(" - ").concat(this.getVia().getNombvia());