Se establece el panel principal de Catadores

tecnicas/controllers/views_controller/main_panel_tester_controller.py

@@ -0,0 +1,61 @@
+from django.core.paginator import Paginator, PageNotAnInteger
+from django.db.models import OuterRef, Subquery, BooleanField
+from tecnicas.models import Catador, SesionSensorial, Participacion
+from tecnicas.utils import controller_error
+
+
+class MainPanelTesterController():
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def getSessionByTester(page: int, tester: Catador):
+        elements_by_page = 6
+
+        base_qs = SesionSensorial.objects.filter(
+            tecnica__tecnica_participacion__catador=tester
+        )
+
+        participacion_finalizado_subq = Subquery(
+            Participacion.objects.filter(
+                tecnica=OuterRef('tecnica_id'),
+                catador=tester
+            ).values('finalizado')[:1],
+            output_field=BooleanField()
+        )
+
+        participacion_activo_subq = Subquery(
+            Participacion.objects.filter(
+                tecnica=OuterRef('tecnica_id'),
+                catador=tester
+            ).values('activo')[:1],
+            output_field=BooleanField()
+        )
+
+        queryset = (
+            base_qs
+            .select_related(
+                'tecnica',
+                'tecnica__tipo_tecnica',
+                'tecnica__id_estilo',
+            )
+            .annotate(
+                participacion_finalizado=participacion_finalizado_subq,
+                participacion_activo=participacion_activo_subq,
+            )
+            .order_by('activo', '-fechaCreacion')
+            .distinct()
+        )
+
+        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/auth.html

@@ -26,7 +26,7 @@
                 </label>
 
                 <label for="password">
-                    <input type="text" name="password" id="password" placeholder="Ingrese Contraseña"
+                    <input type="password" name="password" id="password" placeholder="Ingrese Contraseña"
                         class="placeholder:text-gray-400 placeholder:font-semibold text-xl max-sm:text-base bg-surface-ligt py-3 px-6 rounded-xl lg:w-sm border-b-2 border-surface-sweet"
                         required>
                 </label>

tecnicas/templates/tecnicas/cata-login.html

@@ -13,23 +13,15 @@
             </header>
 
             {% if error %}
-            <article class="bg-ct-error p-4 text-white rounded-xl ct-notification-error">
-                <p
-                    class="block font-sans text-white text-xl antialiased font-bold uppercase tracking-wider text-center">
-                    {{ error }}
-                </p>
-            </article>
+            {% include "./components/error-message.html" with message=error %}
+            {% endif %}
+            {% if message %}
+            {% include "./components/error-message.html" with message=message %}
             {% endif %}
 
             <article class="flex flex-col gap-6 items-center w-full mt-5">
-                <label for="id">
-                    <input type="text" name="code_session" id="id" placeholder="Codigo de sesion"
-                        class="placeholder:text-gray-400 placeholder:font-semibold text-xl max-sm:text-base bg-surface-ligt py-3 px-6 rounded-xl lg:w-sm border-b-2 border-surface-sweet"
-                        required>
-                </label>
-
-                <label for="id">
-                    <input type="text" name="user_tester" id="id" placeholder="Nombre de usuario"
+                <label for="tester">
+                    <input type="text" name="user_tester" id="tester" placeholder="Nombre de usuario"
                         class="placeholder:text-gray-400 placeholder:font-semibold text-xl max-sm:text-base bg-surface-ligt py-3 px-6 rounded-xl lg:w-sm border-b-2 border-surface-sweet"
                         required>
                 </label>
@@ -44,15 +36,4 @@
         </form>
     </article>
 </article>
-{% endblock %}
-
-{% block extra_js %}
-<script>
-    const error = document.querySelector(".ct-notification-error")
-    if (error) {
-        setTimeout(() => {
-            error.classList.add("hidden")
-        }, 4000)
-    }
-</script>
 {% endblock %}

tecnicas/templates/tecnicas/forms_tester/main_panel_tester.html

@@ -0,0 +1,122 @@
+{% extends 'tecnicas/layouts/base.html' %}
+
+{% block title %}Detalles Sesion{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content text-black">
+        <div class="container mx-auto max-w-2xl p-4 space-y-6">
+            <div class="card bg-surface-card shadow-lg">
+                <div class="card-body">
+                    <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>
+
+                        <button class="cts-btn-general-compress px-4 py-2 cts-btn-primary btn-push">
+                            + Nueva sesión
+                        </button>
+                    </div>
+
+                    <div class="divider my-3"></div>
+
+                    <div class="flex flex-wrap gap-4 text-base">
+                        <div class="bg-surface-sweet rounded-xl p-4 grow border-l-2 border-b-2 border-pink-400">
+                            <p class="font-semibold">Nombre completo:</p>
+                            <p>{{ name }}</p>
+                        </div>
+                        <div class="bg-surface-sweet rounded-xl p-4 grow border-l-2 border-b-2 border-pink-400">
+                            <p class="font-semibold">Nombre de usuario:</p>
+                            <p>@{{ username }}</p>
+                        </div>
+                        <div class="bg-surface-sweet rounded-xl p-4 grow border-l-2 border-b-2 border-pink-400">
+                            <p class="font-semibold">Email:</p>
+                            <p>{{ email }}</p>
+                        </div>
+                        <div class="bg-surface-sweet rounded-xl p-4 grow border-l-2 border-b-2 border-pink-400">
+                            <p class="font-semibold">Teléfono:</p>
+                            <p>{{ phone }}</p>
+                        </div>
+                        <div class="bg-surface-sweet rounded-xl p-4 grow border-l-2 border-b-2 border-pink-400">
+                            <p class="font-semibold">Genero:</p>
+                            <p>{{ genere }}</p>
+                        </div>
+                        <div class="bg-surface-sweet rounded-xl p-4 grow border-l-2 border-b-2 border-pink-400">
+                            <p class="font-semibold">Nacimiento:</p>
+                            <p>{{ birthday }}</p>
+                        </div>
+                    </div>
+                </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>
+                {% endif %}
+            </div>
+        </div>
+    </article>
+</article>
+{% endblock %}

tecnicas/urls.py

@@ -11,7 +11,7 @@ urlpatterns = [
          name="autenticacion"),
 
     path("catador-login",
-         views.testerLogin,
+         views.loginTester,
          name="catador_login"),
 
 
@@ -79,9 +79,13 @@ urlpatterns = [
 
     # Vistas para catadores
     path("testers/catador-main",
-         views.mainTesterForm,
+         views.mainPanelTester,
          name="catador_main"),
 
+    path("testers/catador-init",
+         views.initTesterForm,
+         name="catador_init"),
+
     path("testers/en-session/convencional",
          views.convencionalScales,
          name="session_convencional"),

tecnicas/views/__init__.py

@@ -1,5 +1,5 @@
 from .autentication import autentication
-from .login_tester import testerLogin
+from .login_tester import loginTester
 from .main_panel import mainPanel
 
 from .sessions_management.sessions_panel import sesionsPanel
@@ -22,5 +22,6 @@ from .apis.api_tag import newTag
 from .apis.api_words import words
 from .apis.rating_word import reatingWord
 
-from .tester_forms.main_tester_form import mainTesterForm
+from .tester_forms.init_tester_form import initTesterForm
 from .tester_forms.convencional_scales import convencionalScales
+from .tester_forms.panel_main_tester import mainPanelTester

tecnicas/views/login_tester.py

@@ -1,10 +1,28 @@
 from django.http import HttpRequest
 from django.shortcuts import render, redirect
 from django.urls import reverse
+from django.contrib.auth import login
+from django.contrib.auth.models import User
 from ..utils import general_error
 from ..controllers import LoginTesterController
 
 
+def loginTester(req: HttpRequest):
+    if req.method == "GET":
+        return render(req, "tecnicas/cata-login.html")
+    elif req.method == "POST":
+        view_context = {}
+        username = req.POST.get("user_tester")
+
+        user = User.objects.filter(username=username).first()
+        if not user:
+            view_context["error"] = "Catador no encontrado"
+            return render(req, "tecnicas/cata-login.html", view_context)
+
+        login(req, user, backend='django.contrib.auth.backends.ModelBackend')
+        return redirect(reverse("cata_system:catador_main"))
+
+
 def testerLogin(req: HttpRequest):
     if req.method == "GET":
         return render(req, "tecnicas/cata-login.html")

tecnicas/views/tester_forms/{main_tester_form.py → init_tester_form.py}

@@ -4,7 +4,7 @@ from django.urls import reverse
 from ...controllers import SesionController, MainTesterFormController, ParticipacionController
 
 
-def mainTesterForm(req: HttpRequest):
+def initTesterForm(req: HttpRequest):
     session = SesionController.getSessionByCodePanelTester(
         req.session["code_session"])
 
@@ -24,7 +24,6 @@ def mainTesterForm(req: HttpRequest):
                 id_participation=req.session["id_participation"], repetition=session.tecnica.repeticion)
             
             if is_end:
-                print("Estoy dentro y termine [0_0]")
                 context["message"] = "El catador ha terminado de realizar su evaluación, espere instrucciones del presentador"
                 context["has_ended"] = True
 

tecnicas/views/tester_forms/panel_main_tester.py

@@ -0,0 +1,17 @@
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import render
+
+
+def mainPanelTester(req: HttpRequest):
+    if req.method == "GET":
+        view_context = {
+            "name": f"{req.user.first_name} {req.user.last_name}",
+            "username": req.user.username,
+            "email": req.user.email,
+            "phone": req.user.user_catador.telefono,
+            "genere": req.user.user_catador.genero,
+            "birthday": req.user.user_catador.nacimiento
+        }
+        return render(req, "tecnicas/forms_tester/main_panel_tester.html", view_context)
+    else:
+        return JsonResponse({"message": "Método no permitido"})