Merge pull request #17 from CascoArcilla/HU2

tecnicas/controllers/__init__.py

@@ -16,4 +16,5 @@ from .views_controller.detalles_sesion_controller import DetallesSesionControlle
 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.monitor_sesion_controller import MonitorSesionController
+from .views_controller.tester_list_controller import TesterListController

tecnicas/controllers/views_controller/tester_list_controller.py

@@ -0,0 +1,58 @@
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from tecnicas.models import Catador
+from tecnicas.utils import controller_error
+
+
+class TesterListController():
+    def __init__(self, page: int):
+        self.num_page = page
+
+    def getContext(self):
+        view_context = {"num_page": self.num_page}
+
+        res_tuple = TesterListController.getTestersByPage(page=self.num_page)
+
+        if isinstance(res_tuple, dict):
+            view_context["error"] = res_tuple["error"]
+            return view_context
+        
+        (testers, last_page) = res_tuple
+
+        view_context["testers"] = testers
+        view_context["last_page"] = last_page
+
+        return view_context
+
+    @staticmethod
+    def getTestersByPage(page: int):
+        elements_by_page = 6
+
+        queryset = (
+            Catador.objects
+            .select_related(
+                "user"
+            )
+            .only(
+                "user__first_name",
+                "user__last_name",
+                "user__username",
+                "user__email",
+                "genero",
+                "telefono",
+                "nacimiento"
+            )
+            .order_by("-user__date_joined")
+        )
+
+        paginator = Paginator(queryset, elements_by_page)
+        try:
+            testers_in_page = paginator.page(page)
+        except PageNotAnInteger:
+            return controller_error("índice inválido")
+
+        if not testers_in_page.object_list:
+            return controller_error("Sin registros de Catadores")
+
+        is_last_page = not testers_in_page.number < paginator.num_pages
+
+        return (testers_in_page, is_last_page)

tecnicas/templates/tecnicas/components/item-tester.html

@@ -0,0 +1,37 @@
+<div
+    class="card w-full min-w-2xs max-w-sm bg-surface-ligt shadow-md hover:shadow-lg transition-shadow duration-300 text-black">
+    <div class="card-body">
+        <h2 class="text-center text-lg font-bold bg-surface-sweet rounded">
+            {{ tester.user.first_name }} {{ tester.user.last_name }}
+        </h2>
+        <p class="text-lg text-center bg-surface-alter-card rounded px-2">
+            <span class="font-bold">Usuario: </span>
+            {{ tester.user.username }}
+        </p>
+
+        <div class="w-full text-base flex gap-2 flex-wrap text-center">
+            <p class="font-semibold bg-btn-secondary rounded text-white p-1">
+                <span class="font-bold">Genero:</span>
+                {{ tester.genero }}
+            </p>
+            <p class="font-semibold bg-btn-secondary rounded text-white p-1">
+                <span class="font-bold">Teléfono: </span>
+                {{ tester.telefono }}
+            </p>
+            <p class="font-semibold bg-btn-secondary rounded text-white p-1">
+                <span class="font-bold">Email: </span>
+                {{ tester.user.email }}
+            </p>
+            <p class="font-semibold bg-btn-secondary rounded text-white p-1">
+                <span class="font-bold">Nacimiento: </span>
+                {{ tester.nacimiento|date:"d/m/Y" }}
+            </p>
+        </div>
+
+        <div class="card-actions justify-end mt-3">
+            <button class="btn bg-btn-primary border-0 block w-full btn-push">
+                Ver detalles
+            </button>
+        </div>
+    </div>
+</div>

tecnicas/templates/tecnicas/manage_tester/catador-lista.html

@@ -0,0 +1,52 @@
+{% extends 'tecnicas/layouts/base.html' %}
+{% load static %}
+
+{% block title %}Lista de Catadores{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content">
+        <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 Catadores</h1>
+            </div>
+            <div class="flex-1 flex justify-end items-center">
+                <a href="{% url 'cata_system:panel_catadores' %}" class="w-fit">
+                    <button class="cts-btn-general cts-btn-error btn-push">
+                        Rresegar al panel anterior
+                    </button>
+                </a>
+            </div>
+        </header>
+
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% else %}
+        <div class="flex justify-center md:grid md:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+            {% for tester in testers %}
+            {% include "../components/item-tester.html" with tester=tester %}
+            {% endfor %}
+        </div>
+        <section class="flex justify-center items-center gap-2">
+            <div class="join space-x-2">
+                {% if num_page != 1 %}
+                <a href="{% url 'cata_system:panel_sesiones' page=num_page|add:-1 %}" class="w-fit">
+                    <button class="join-item btn bg-btn-secondary py-1">
+                        <img class="h-full" src="{% static 'img/less-than.svg' %}" alt="menor que">
+                    </button>
+                </a>
+                {% endif %}
+                <button class="join-item btn bg-btn-secondary">Page {{ num_page }}</button>
+                {% if not last_page %}
+                <a href="{% url 'cata_system:panel_sesiones' page=num_page|add:1 %}" class="w-fit">
+                    <button class="join-item btn bg-btn-secondary py-1">
+                        <img class="h-full" src="{% static 'img/greater-than.svg' %}" alt="mayor que">
+                    </button>
+                </a>
+                {% endif %}
+            </div>
+        </section>
+        {% endif %}
+    </article>
+</article>
+{% endblock %}

tecnicas/templates/tecnicas/manage_tester/catadores-panel.html

@@ -28,15 +28,18 @@
                         class="w-full h-full object-cover rounded-xl">
                 </div>
                 <a href="{% url 'cata_system:crear_catador' %}" class="flex-1">
-                    <button
-                        class="w-full h-full text-black bg-btn-primary font-bold rounded-xl px-8 py-4 text-center border-b-green-800 btn-push">
+                    <button class="w-full h-full cts-btn-general-compress cts-btn-primary btn-push">
                         Crear Cadator
                     </button>
                 </a>
                 <a href="{% url 'cata_system:buscar_catador' %}" class="flex-1">
-                    <button
-                        class="w-full h-full text-black bg-btn-secondary font-bold rounded-xl px-8 py-4 text-center border-b-pink-800 btn-push">
-                        Buscar Catador
+                    <button class="w-full h-full cts-btn-general-compress cts-btn-secondary btn-push">
+                        Buscar/Actualizar Catador
+                    </button>
+                </a>
+                <a href="{% url 'cata_system:listar_catador' num_page=1 %}" class="flex-1">
+                    <button class="w-full h-full cts-btn-general-compress cts-btn-tertiary btn-push">
+                        Listar Catadores
                     </button>
                 </a>
                 <div class="w-full h-40 rounded-2xl min-sm:hidden">

tecnicas/urls.py

@@ -14,22 +14,10 @@ urlpatterns = [
          views.testerLogin,
          name="catador_login"),
 
+
     # Pantalla principal Presetador
     path("presenter/", views.mainPanel, name="index"),
 
-    # Gestion de catadores
-    path("presenter/panel-catadores",
-         views.testerMenu,
-         name="panel_catadores"),
-
-    path("presenter/crear-catador",
-         views.testerCreate,
-         name="crear_catador"),
-
-    path("presenter/buscar-catador",
-         views.testerSearch,
-         name="buscar_catador"),
-
 
     # Creacion de sessiones sensoriales
     path("presenter/seleccion-tecnica",
@@ -57,6 +45,24 @@ urlpatterns = [
          name="creando_sesion"),
 
 
+    # Gestion de catadores
+    path("presenter/panel-catadores",
+         views.testerMenu,
+         name="panel_catadores"),
+
+    path("presenter/crear-catador",
+         views.testerCreate,
+         name="crear_catador"),
+
+    path("presenter/buscar-catador",
+         views.testerSearch,
+         name="buscar_catador"),
+
+    path("presenter/listar-catador/<int:num_page>",
+         views.testerList,
+         name="listar_catador"),
+
+
     # Gestion de sesiones sensoriales
     path("presenter/panel-sesiones/<int:page>",
          views.sesionsPanel,
@@ -80,6 +86,7 @@ urlpatterns = [
          views.convencionalScales,
          name="session_convencional"),
 
+
     # APIs
     path("api/nueva-etiqueta",
          views.newTag,

tecnicas/views/__init__.py

@@ -16,6 +16,7 @@ from .sessions_config.create_session import createSession
 from .tester_management.tester_menu import testerMenu
 from .tester_management.tester_create import testerCreate
 from .tester_management.tester_search import testerSearch
+from .tester_management.tester_list import testerList
 
 from .apis.api_tag import newTag
 from .apis.api_words import words

tecnicas/views/tester_management/tester_list.py

@@ -0,0 +1,13 @@
+from django.http import HttpRequest
+from django.shortcuts import render
+from tecnicas.controllers import TesterListController
+from tecnicas.utils import general_error
+
+
+def testerList(req: HttpRequest, num_page: int):
+    if req.method == "GET":
+        view_controller = TesterListController(page=num_page)
+        view_context = view_controller.getContext()
+        return render(req, "tecnicas/manage_tester/catador-lista.html", view_context)
+    else:
+        return general_error("Método no permitido")