From b1cb9273564855dcb485b7adb11261908f66b5b7 Mon Sep 17 00:00:00 2001
From: Celestino Rey <creylopez@yahoo.es>
Date: Thu, 3 Oct 2024 16:17:55 +0200
Subject: [PATCH] =?UTF-8?q?Visualizaci=C3=B3n=20de=20lista=20de=20espera?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JugarAlPadel/K8S/Makefile                     |  2 +-
 .../gestion_reservas/eventos/views.py         | 13 +++++++---
 .../gestion_reservas/templates/base.html      |  1 +
 .../templates/eventos/detalle_evento.html     | 26 ++++++++++++++++++-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/JugarAlPadel/K8S/Makefile b/JugarAlPadel/K8S/Makefile
index fd38374..fbde142 100644
--- a/JugarAlPadel/K8S/Makefile
+++ b/JugarAlPadel/K8S/Makefile
@@ -1,7 +1,7 @@
 export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
 #export REGISTRY=localhost:5000
 export REGISTRY=registry.reymota.es
-export IMG_VERSION = 0.15
+export IMG_VERSION = 0.16
 export IMG_NGINX_VERSION = 2.3
 
 # limpia todo
diff --git a/JugarAlPadel/gestion_reservas/eventos/views.py b/JugarAlPadel/gestion_reservas/eventos/views.py
index f5ec482..83d092d 100644
--- a/JugarAlPadel/gestion_reservas/eventos/views.py
+++ b/JugarAlPadel/gestion_reservas/eventos/views.py
@@ -98,10 +98,17 @@ def detalle_evento(request, evento_id):
 
     reservas = Reserva.objects.filter(evento=evento_id)
 
-    for i in reservas:
-        print("Reserva: ", i.usuario.nombre)
+    lista_espera = ListaEspera.objects.filter(evento=evento_id)
 
-    return render(request, 'eventos/detalle_evento.html', {'evento': evento, 'reservas': reservas})
+    for elemento in lista_espera:
+        print("Lista de espera: ", elemento.usuario.nombre)
+        print("Apuntado en: ", elemento.fecha_apuntado)
+
+    for booking in reservas:
+        print(booking.evento)
+        print(booking.usuario.nombre)
+
+    return render(request, 'eventos/detalle_evento.html', {'evento': evento, 'reservas': reservas, 'lista': lista_espera})
 
 
 # Verificar si el usuario es administrador
diff --git a/JugarAlPadel/gestion_reservas/templates/base.html b/JugarAlPadel/gestion_reservas/templates/base.html
index 68eab84..6b908c3 100644
--- a/JugarAlPadel/gestion_reservas/templates/base.html
+++ b/JugarAlPadel/gestion_reservas/templates/base.html
@@ -118,6 +118,7 @@
                                 <span class="nav-link-text">Crear un nuevo evento</span>
                         </a><!--//nav-link-->
                     </li><!--//nav-item-->
+                    
                     {% endif %}
 
                     <li class="nav-item">
diff --git a/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html b/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html
index db1409a..8b4306a 100644
--- a/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html
+++ b/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html
@@ -26,10 +26,11 @@
         </div><!--//app-card-header-->
         <div class="row g-3 align-items-center">
             <div class="col-12 col-lg-auto text-center text-lg-start">
+                {% if reservas %}
                 <table class="table app-table-hover mb-0 text-left">
                     <thead>
                         <tr>
-                            <th class="cell">Nombre</th>
+                            <th class="cell">Apuntados</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -40,6 +41,29 @@
                         {% endfor %}	
                     </tbody>
                 </table>
+                {% else %}
+                <p>No hay nadie apuntado</p>
+                {% endif %}
+
+                {% if lista %}
+                <p></p>
+                <table class="table app-table-hover mb-0 text-left">
+                    <thead>
+                        <tr>
+                            <th class="cell">Lista de espera</th>
+                            <th class="cell">En lista desde...</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for l in lista %}
+                        <tr>
+                            <td class="cell">{{ l.usuario.nombre }}</td>
+                            <td class="cell">{{ l.fecha_apuntado }}</td>
+                        </tr>
+                        {% endfor %}	
+                    </tbody>
+                </table>
+                {% endif %}
             </div>
         </div>
     </div><!--//app-card-->