Listado de sesionespor Catador

tecnicas/controllers/__init__.py

@@ -17,4 +17,5 @@ from .views_controller.login_tester_controller import LoginTesterController
 from .views_controller.main_tester_form_controller import MainTesterFormController
 from .views_controller.api_rating_controller import ApiRatingController
 from .views_controller.monitor_sesion_controller import MonitorSesionController
-from .views_controller.tester_list_controller import TesterListController
+from .views_controller.tester_list_controller import TesterListController
+from .views_controller.list_sessions_tester_controller import ListSessionsTesterController

tecnicas/controllers/views_controller/{main_panel_tester_controller.py → list_sessions_tester_controller.py}

@@ -4,10 +4,24 @@ from tecnicas.models import Catador, SesionSensorial, Participacion
 from tecnicas.utils import controller_error
 
 
-class MainPanelTesterController():
+class ListSessionsTesterController():
     def __init__(self):
         pass
 
+    def getContext(self, user: Catador, page: int):
+        context_view = {}
+
+        response = ListSessionsTesterController.getSessionByTester(page, user)
+        if isinstance(response, dict):
+            return response
+
+        (sessions, is_last_page, current_page) = response
+        context_view["sessions"] = sessions
+        context_view["last_page"] = is_last_page
+        context_view["page"] = current_page
+
+        return context_view
+
     @staticmethod
     def getSessionByTester(page: int, tester: Catador):
         elements_by_page = 6
@@ -43,19 +57,20 @@ class MainPanelTesterController():
                 participacion_finalizado=participacion_finalizado_subq,
                 participacion_activo=participacion_activo_subq,
             )
-            .order_by('activo', '-fechaCreacion')
+            .order_by('participacion_finalizado', '-activo', '-fechaCreacion')
             .distinct()
         )
 
         paginator = Paginator(queryset, elements_by_page)
         try:
-            testers_in_page = paginator.page(page)
+            sessions_in_page = paginator.page(page)
         except PageNotAnInteger:
             return controller_error("índice inválido")
 
-        if not testers_in_page.object_list:
+        if not sessions_in_page.object_list:
             return controller_error("Sin registros de Catadores")
 
-        is_last_page = not testers_in_page.number < paginator.num_pages
+        current_page = sessions_in_page.number
+        is_last_page = not current_page < paginator.num_pages
 
-        return (testers_in_page, is_last_page)
+        return (sessions_in_page, is_last_page, current_page)

tecnicas/middlewares/tester_middleware.py

@@ -9,12 +9,12 @@ class TesterAccessMiddleware:
     def __call__(self, request):
         path = request.path_info
 
-        if path.startswith('/cata/tester/'):
+        if path.startswith('/cata/testers/'):
             if not request.user.is_authenticated:
                 from django.shortcuts import redirect
                 return redirect("cata_system:catador_login")
 
-            if not hasattr(request.user, 'catador'):
+            if not hasattr(request.user, 'user_catador'):
                 return redirect("cata_system:catador_login")
 
         return self.get_response(request)

tecnicas/templates/tecnicas/components/item_session.html

@@ -0,0 +1,47 @@
+<div
+    class='card {{ sesion.activo|yesno:"bg-surface-ligt,bg-surface-card" }} shadow-lg text-black sm:max-w-80 w-full flex justify-center items-center'>
+    <div class="card-body flex flex-col justify-between w-full">
+        <div class="flex flex-col gap-1 [&>*]:first:text-xl [&>*]:first:font-bold [&>*]:first:border-b">
+            {% if sesion.nombre_sesion %}
+            <h2>{{ sesion.nombre_sesion }}</h2>
+            <span class="text-lg underline"><b>Código:</b><br>{{ sesion.codigo_sesion }}</span>
+            {% else %}
+            <span class="text-lg">Código:<br>{{ sesion.codigo_sesion }}</span>
+            {% endif %}
+        </div>
+        <ul class="mt-6 flex flex-col gap-2 text-base">
+            <li>
+                Se usa la Técnica:
+                <span class="uppercase font-bold">
+                    {{ sesion.tecnica.tipo_tecnica.nombre_tecnica }}
+                </span>
+            </li>
+            <li>
+                El Estilo de palabras:
+                <span class="uppercase font-bold">
+                    {{ sesion.tecnica.id_estilo.nombre_estilo }}
+                </span>
+            </li>
+            <li>
+                {{ sesion.fechaCreacion }}
+            </li>
+            <li>
+                Estado:
+                <span class="uppercase font-bold">
+                    {% if sesion.activo %}
+                    Activo
+                    {% else %}
+                    No activo
+                    {% endif %}
+                </span>
+            </li>
+        </ul>
+        <div class="mt-6">
+            <a href="{% url 'cata_system:detalles_sesion' session_code=sesion.codigo_sesion %}">
+                <button class="btn bg-btn-primary border-0 block w-full btn-push">
+                    Inspeccionar sesión
+                </button>
+            </a>
+        </div>
+    </div>
+</div>

tecnicas/templates/tecnicas/components/item_session_tester.html

@@ -0,0 +1,40 @@
+<div class="card bg-surface-sweet border border-base-300 shadow-md hover:shadow-lg transition">
+    <div class="card-body space-y-4">
+        <h4 class="card-title text-lg font-bold">
+            {% if session.nombre_sesion %}
+            {{ session.nombre_sesion }}
+            {% else %}
+            <span class="italic text-gray-500">Sin nombre</span>
+            {% endif %}
+        </h4>
+
+        <article class="text-sm space-y-1">
+            <p><span class="font-semibold">Código:</span> {{ session.codigo_sesion }}</p>
+            <p><span class="font-semibold">Técnica:</span> {{ session.tecnica.tipo_tecnica }}</p>
+            <p><span class="font-semibold">Fecha:</span> {{ session.fechaCreacion }}</p>
+            <p>
+                <span class="font-semibold">Finazliado:</span>
+                {% if session.participacion_finalizado %}
+                <span class="badge badge-success">Se ha concluido</span>
+                {% else %}
+                <span class="badge badge-warning">Sin concluir</span>
+                {% endif %}
+            </p>
+            <p>
+                <span class="font-semibold">Estatus:</span>
+                {% if session.activo %}
+                <span class="badge badge-success">En proceso</span>
+                {% else %}
+                <span class="badge badge-error">No activo</span>
+                {% endif %}
+            </p>
+        </article>
+        <article>
+            <a href="{% url 'cata_system:catador_init_session' code_sesion=session.codigo_sesion %}">
+                <button class="btn bg-btn-primary border-0 block w-full btn-push">
+                    Inspeccionar
+                </button>
+            </a>
+        </article>
+    </div>
+</div>

tecnicas/templates/tecnicas/forms_tester/init_session.html

@@ -113,10 +113,10 @@
                 </figure>
             </button>
             {% endif %}
-            <a href="{% url 'cata_system:catador_main' %}">
+            <a href="{% url 'cata_system:catador_list_sessions' num_page=1 %}">
                 <button
                     class="flex-1 uppercase text-lg tracking-wider cts-btn-general cts-btn-error btn-push flex flex-col justify-center items-center gap-2">
-                    Salir se la sesión
+                    Regresar a la lista
                     <figure class="w-10">
                         <img src="{% static 'img/exit.svg' %}" alt="bote de basura" class="invert">
                     </figure>

tecnicas/templates/tecnicas/forms_tester/main_panel_tester.html

@@ -11,11 +11,9 @@
                     <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-3">
                         <h2 class="card-title text-2xl font-semibold">Información del Usuario</h2>
 
-                        <a href="{% url 'cata_system:catador_in_session' %}">
-                            <button class="cts-btn-general-compress px-4 py-2 cts-btn-primary btn-push">
-                                + Nueva sesión
-                            </button>
-                        </a>
+                        <button class="cts-btn-general-compress px-4 py-2 cts-btn-error btn-push">
+                            Salir del Sistema
+                        </button>
                     </div>
 
                     <div class="divider my-3"></div>
@@ -49,76 +47,22 @@
                 </div>
             </div>
 
-            <div class="space-y-4">
-                <h3 class="text-xl font-semibold">Sesiones en las que ha participado</h3>
-
-                <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
-                    {% for sesion in sesiones %}
-                    <div class="card bg-base-100 border border-base-300 shadow-md hover:shadow-lg transition">
-                        <div class="card-body">
-                            <h4 class="card-title text-lg font-bold">
-                                {% if sesion.nombre %}
-                                {{ sesion.nombre }}
-                                {% else %}
-                                <span class="italic text-gray-500">Sin nombre</span>
-                                {% endif %}
-                            </h4>
-
-                            <div class="text-sm space-y-1">
-                                <p><span class="font-semibold">Código:</span> {{ sesion.codigo }}</p>
-                                <p><span class="font-semibold">Técnica:</span> {{ sesion.tecnica }}</p>
-                                <p><span class="font-semibold">Fecha:</span> {{ sesion.fecha_creacion }}</p>
-                                <p>
-                                    <span class="font-semibold">Finazliado:</span>
-                                    {% if sesion.finalizado %}
-                                    <span class="badge badge-success">Se ha concluido</span>
-                                    {% else %}
-                                    <span class="badge badge-warning">Sin concluir</span>
-                                    {% endif %}
-                                </p>
-                                {% if sesion.activo %}
-                                <p>
-                                    <span class="font-semibold">Estatus:</span>
-                                    <span class="badge badge-success">En proceso</span>
-                                </p>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
-                    {% empty %}
-                    <div class="col-span-full text-center text-gray-500">
-                        No hay sesiones registradas.
-                    </div>
-                    {% endfor %}
-                </div>
-
-                {% if sesiones.has_other_pages %}
-                <div class="flex justify-center mt-6">
-                    <div class="join">
-                        {% if sesiones.has_previous %}
-                        <a href="/" class="join-item btn btn-sm">«</a>
-                        {% else %}
-                        <button class="join-item btn btn-sm btn-disabled">«</button>
-                        {% endif %}
-
-                        {% for num in sesiones.paginator.page_range %}
-                        {% if sesiones.number == num %}
-                        <button class="join-item btn btn-sm btn-active">{{ num }}</button>
-                        {% else %}
-                        <a href="/" class="join-item btn btn-sm">{{ num }}</a>
-                        {% endif %}
-                        {% endfor %}
-
-                        {% if sesiones.has_next %}
-                        <a href="/" class="join-item btn btn-sm">»</a>
-                        {% else %}
-                        <button class="join-item btn btn-sm btn-disabled">»</button>
-                        {% endif %}
-                    </div>
+            <div class="card bg-surface-card shadow-lg">
+                <div class="card-body">
+                    <article class="flex flex-wrap gap-4 max-sm:flex-col justify-center">
+                        <a href="{% url 'cata_system:catador_in_session' %}" class="w-fit max-sm:w-full grow">
+                            <button class="cts-btn-general-compress px-4 py-2 cts-btn-primary btn-push w-full">
+                                ➕ Nueva sesión
+                            </button>
+                        </a>
+                        <a href="{% url 'cata_system:catador_list_sessions' num_page=1 %}" class="w-fit max-sm:w-full grow">
+                            <button class="cts-btn-general-compress px-4 py-2 cts-btn-primary btn-push w-full">
+                                🔍 Ver sesiones
+                            </button>
+                        </a>
+                    </article>
                 </div>
-                {% endif %}
             </div>
-        </div>
     </article>
 </article>
 {% endblock %}

tecnicas/templates/tecnicas/forms_tester/sessions_list_tester.html

@@ -0,0 +1,65 @@
+{% extends 'tecnicas/layouts/base.html' %}
+
+{% block title %}Panel Principal Tester{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content text-black">
+        <header class="text-center flex flex-row max-sm:flex-col gap-8 items-center w-full">
+            <div class="bg-surface-card p-4 text-black shadow-lg rounded-xl flex-1">
+                <h1 class="font-bold text-2xl">
+                    Lista de Sesiones en las
+                    que se ha participado
+                </h1>
+            </div>
+            <div class="flex-1 flex justify-end items-center">
+                <a href="{% url 'cata_system:catador_main' %}" class="w-fit">
+                    <button class="cts-btn-general cts-btn-secondary btn-push">
+                        Regresar Panel principal
+                    </button>
+                </a>
+            </div>
+        </header>
+
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% endif %}
+        {% if message %}
+        {% include "../components/error-message.html" with message=message %}
+        {% endif %}
+
+        <div class="space-y-4">
+            <h3 class="text-xl font-semibold">Sesiones en las que ha participado</h3>
+            <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
+                {% for session in sessions %}
+                {% include "../components/item_session_tester.html" with session=session %}
+                {% empty %}
+                <div class="col-span-full text-center text-gray-500">
+                    No hay sesiones registradas.
+                </div>
+                {% endfor %}
+            </div>
+
+            <section class="flex justify-center items-center gap-2">
+                <div class="join space-x-2">
+                    {% if page != 1 %}
+                    <a href="{% url 'cata_system:catador_list_sessions' num_page=page|add:-1 %}" class="w-fit">
+                        <button class="join-item btn bg-btn-secondary py-1 text-2xl">
+                            ⏮️
+                        </button>
+                    </a>
+                    {% endif %}
+                    <button class="join-item btn bg-btn-secondary">Page {{ page }}</button>
+                    {% if not last_page %}
+                    <a href="{% url 'cata_system:catador_list_sessions' num_page=page|add:1 %}" class="w-fit">
+                        <button class="join-item btn bg-btn-secondary py-1 text-2xl">
+                            ⏭️
+                        </button>
+                    </a>
+                    {% endif %}
+                </div>
+            </section>
+        </div>
+    </article>
+</article>
+{% endblock %}

tecnicas/templates/tecnicas/manage_sesions/sesiones-panel.html

@@ -22,55 +22,10 @@
         {% if error %}
         {% include "../components/error-message.html" with message=error %}
         {% else %}
+        
         <section class="grid grid-cols-3 max-lg:grid-cols-2 max-sm:grid-cols-1 w-full gap-4 justify-center">
             {% for sesion in sessions %}
-            <div
-                class='card {{ sesion.activo|yesno:"bg-surface-ligt,bg-surface-card" }} shadow-lg text-black sm:max-w-80 w-full flex justify-center items-center'>
-                <div class="card-body flex flex-col justify-between w-full">
-                    <div class="flex flex-col gap-1 [&>*]:first:text-xl [&>*]:first:font-bold [&>*]:first:border-b">
-                        {% if sesion.nombre_sesion %}
-                        <h2>{{ sesion.nombre_sesion }}</h2>
-                        <span class="text-lg underline"><b>Código:</b><br>{{ sesion.codigo_sesion }}</span>
-                        {% else %}
-                        <span class="text-lg">Código:<br>{{ sesion.codigo_sesion }}</span>
-                        {% endif %}
-                    </div>
-                    <ul class="mt-6 flex flex-col gap-2 text-base">
-                        <li>
-                            Se usa la Técnica:
-                            <span class="uppercase font-bold">
-                                {{ sesion.tecnica.tipo_tecnica.nombre_tecnica }}
-                            </span>
-                        </li>
-                        <li>
-                            El Estilo de palabras:
-                            <span class="uppercase font-bold">
-                                {{ sesion.tecnica.id_estilo.nombre_estilo }}
-                            </span>
-                        </li>
-                        <li>
-                            {{ sesion.fechaCreacion }}
-                        </li>
-                        <li>
-                            Estado:
-                            <span class="uppercase font-bold">
-                                {% if sesion.activo %}
-                                Activo
-                                {% else %}
-                                No activo
-                                {% endif %}
-                            </span>
-                        </li>
-                    </ul>
-                    <div class="mt-6">
-                        <a href="{% url 'cata_system:detalles_sesion' session_code=sesion.codigo_sesion %}">
-                            <button class="btn bg-btn-primary border-0 block w-full btn-push">
-                                Inspeccionar sesión
-                            </button>
-                        </a>
-                    </div>
-                </div>
-            </div>
+            {% include "./components/item_session.html" with sesion=sesion %}
             {% endfor %}
         </section>
 

tecnicas/urls.py

@@ -82,6 +82,10 @@ urlpatterns = [
          views.mainPanelTester,
          name="catador_main"),
 
+    path("testers/catador-list-sessions/<int:num_page>",
+         views.sessionsListTester,
+         name="catador_list_sessions"),
+
     path("testers/log-in-session",
          views.loginSessionTester,
          name="catador_in_session"),

tecnicas/views/__init__.py

@@ -26,3 +26,4 @@ from .tester_forms.init_tester_form import initTesterForm
 from .tester_forms.convencional_scales import convencionalScales
 from .tester_forms.panel_main_tester import mainPanelTester
 from .tester_forms.login_session import loginSessionTester
+from .tester_forms.sessions_list_tester import sessionsListTester

tecnicas/views/tester_forms/sessions_list_tester.py

@@ -0,0 +1,13 @@
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import render
+from tecnicas.controllers import ListSessionsTesterController
+
+
+def sessionsListTester(req: HttpRequest, num_page: int):
+    if req.method == "GET":
+        view_controller = ListSessionsTesterController()
+        contex_view = view_controller.getContext(req.user.user_catador, num_page)
+
+        return render(req, "tecnicas/forms_tester/sessions_list_tester.html", contex_view)
+    else:
+        return JsonResponse({"message": "Método no permitido"})