From e76d909b2ee3ce9c6c76d154a42b55d114a597c0 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Mon, 22 Apr 2024 12:10:26 -0300
Subject: [PATCH] fixes bug#AL-4193

---
 pom.xml                                       |  2 +-
 .../RelatorioLinhasHorarioController.java     |  6 +-
 .../render/RenderRelatorioLinhaHorario.java   |  6 --
 .../RenderRelatorioLinhaHorarioRuta.java      | 64 +++++++++++++++++++
 4 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorarioRuta.java

diff --git a/pom.xml b/pom.xml
index 229852830..4375c8798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.65.0</version> 
+	<version>1.65.1</version> 
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
index 4dc8d54f9..2b85b4bb1 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
@@ -45,7 +45,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCorridaOrigemDestino;
-import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioLinhaHorario;
+import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioLinhaHorarioRuta;
 
 @Controller("relatorioLinhasHorarioController")
 @Scope("prototype")
@@ -276,8 +276,8 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 
 		lsGrupoRuta = grupoRutaService.obtenerTodos();
 
-		linhaList.setItemRenderer(new RenderRelatorioLinhaHorario());
-		linhaListSelList.setItemRenderer(new RenderRelatorioLinhaHorario());
+		linhaList.setItemRenderer(new RenderRelatorioLinhaHorarioRuta());
+		linhaListSelList.setItemRenderer(new RenderRelatorioLinhaHorarioRuta());
 
 		servicoList.setItemRenderer(new RenderCorridaOrigemDestino());
 		servicoListSelList.setItemRenderer(new RenderCorridaOrigemDestino());
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorario.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorario.java
index 80bda78ae..2213dbe64 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorario.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorario.java
@@ -33,12 +33,6 @@ public class RenderRelatorioLinhaHorario implements ListitemRenderer {
 		}
 		lc.setParent(lstm);
 		
-		lc = new Listcell(ruta.getRutaId().toString());
-		lc.setParent(lstm);
-
-		lc = new Listcell(ruta.getIndSentidoIda() == true ? "IDA" : "VOLTA" );
-		lc.setParent(lstm);
-
 		Button btn = new Button();
 
 		lc = new Listcell();
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorarioRuta.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorarioRuta.java
new file mode 100644
index 000000000..bae3effb1
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorarioRuta.java
@@ -0,0 +1,64 @@
+package com.rjconsultores.ventaboletos.web.utilerias.render;
+
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zul.Button;
+import org.zkoss.zul.Listcell;
+import org.zkoss.zul.Listitem;
+import org.zkoss.zul.ListitemRenderer;
+
+import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente;
+import com.rjconsultores.ventaboletos.entidad.Ruta;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+
+public class RenderRelatorioLinhaHorarioRuta implements ListitemRenderer {
+	public void render(Listitem lstm, Object o) throws Exception {
+		Ruta ruta = (Ruta) o;
+
+		String num = ruta.getNumRuta()==null?"":ruta.getNumRuta();
+        Listcell lc = new Listcell(num);
+        lc.setParent(lstm);
+
+		lc = new Listcell(ruta.getPrefixo());
+		lc.setParent(lstm);
+
+		lc = new Listcell(ruta.getDescruta());
+		lc.setParent(lstm);
+
+		OrgaoConcedente orgaoConcedente = ruta.getOrgaoConcedente();
+		if (orgaoConcedente != null) {
+			lc = new Listcell(orgaoConcedente.getDescOrgao());
+		} else {
+			lc = new Listcell("-");
+		}
+		lc.setParent(lstm);
+		
+		lc = new Listcell(ruta.getRutaId().toString());
+		lc.setParent(lstm);
+
+		lc = new Listcell(ruta.getIndSentidoIda() == true ? "IDA" : "VOLTA" );
+		lc.setParent(lstm);
+
+		Button btn = new Button();
+
+		lc = new Listcell();
+		lc.setParent(lstm);
+
+		btn.setWidth("16");
+		btn.setHeight("16");
+		btn.setImage("/gui/img/remove.png");
+
+		btn.addEventListener("onClick", new EventListener() {
+			@Override
+			public void onEvent(Event event) throws Exception {
+				MyListbox listBox = (MyListbox) event.getTarget().getParent().getParent().getParent();
+				Listitem listItem = (Listitem) event.getTarget().getParent().getParent();
+				listBox.removeItem((Ruta) listItem.getAttribute("data"));
+			}
+		});
+
+		lc.appendChild(btn);
+
+		lstm.setAttribute("data", ruta);
+	}
+}