Asignacion de orden al catador para escalas

tecnicas/controllers/__init__.py

@@ -8,4 +8,5 @@ from .palabras_controller import PalabrasController
 from .sesion_controller import SesionController
 from .calificacion_controller import CalificacionController
 from .detalles_sesion_controller import DetallesSesionController
-from .login_tester_controller import LoginTesterController
+from .login_tester_controller import LoginTesterController
+from .main_tester_form_controller import MainTesterFormController

tecnicas/controllers/main_tester_form_controller.py

@@ -0,0 +1,48 @@
+from ..models import Catador, SesionSensorial, Orden
+from ..utils import controller_error, shuffleArray
+from django.db import transaction
+
+
+class MainTesterFormController():
+    tester: Catador
+    session: SesionSensorial
+    order: Orden | dict
+
+    def __init__(self, code_session: str, user_tester: str):
+        try:
+            self.tester = Catador.objects.get(usuarioCatador=user_tester)
+            self.session = SesionSensorial.objects.get(
+                codigo_sesion=code_session)
+        except (Catador.DoesNotExist, SesionSensorial.DoesNotExist):
+            return controller_error("Parámetros inexistentes")
+
+    def assignOrder(self):
+        self.checkAssignOrder()
+        if isinstance(self.order, Orden):
+            return self.order
+
+        with transaction.atomic():
+            orders_without_tester = Orden.objects.select_for_update().filter(
+                id_tecnica=self.session.tecnica, id_catador=None)
+
+            if not len(orders_without_tester):
+                return controller_error("Las ordenes se han acabado")
+
+            shuffle_orders = shuffleArray(orders_without_tester)
+            self.order_to_assign = shuffle_orders.pop()
+
+            self.order_to_assign.id_catador = self.tester
+            self.order_to_assign.save()
+
+            return self.order_to_assign
+
+    def checkAssignOrder(self):
+        if not self.tester or self.session:
+            return controller_error("Atributos no establecidos")
+
+        try:
+            res_order = Orden.objects.get(
+                id_tecnica=self.session.tecnica, id_catador=self.tester.id)
+            self.order = res_order
+        except Orden.DoesNotExist:
+            return controller_error("Catador sin orden")

tecnicas/controllers/presentador_controller.py

@@ -0,0 +1,14 @@
+from ..models import Presentador
+from ..utils import controller_error
+
+
+class PresentadorController():
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def getPresenterByUsername(username: str):
+        try:
+            presenter = Presentador.objects.get(nombre_usuario=username)
+        except Presentador.DoesNotExist:
+            return controller_error("Presentador inexistente")

tecnicas/controllers/sesion_controller.py

@@ -54,7 +54,8 @@ class SesionController():
             queryset = SesionSensorial.objects.select_related(
                 "tecnica",
                 "tecnica__tipo_tecnica",
-                "tecnica__id_estilo").only(
+                "tecnica__id_estilo"
+            ).only(
                 "codigo_sesion",
                 "nombre_sesion",
                 "fechaCreacion",
@@ -64,21 +65,41 @@ class SesionController():
 
             paginator = Paginator(queryset, elements_by_page)
             sessions_in_page = paginator.get_page(page)
+
+            return sessions_in_page
         except PageNotAnInteger:
             return controller_error("indice invalido")
         except EmptyPage:
             return controller_error("sin registros de sessiones")
 
-        return sessions_in_page
+    @staticmethod
+    def getSessionByCodePanelTester(code: str):
+        try:
+            session = SesionSensorial.objects.select_related(
+                "tecnica",
+                "tecnica__tipo_tecnica",
+                "tecnica__id_estilo"
+            ).only(
+                "codigo_sesion",
+                "nombre_sesion",
+                "tecnica__repecion",
+                "tecnica__instrucciones",
+                "tecnica__tipo_tecnica__nombre_tecnica",
+                "tecnica__id_estilo__nombre_estilo"
+            ).get(codigo_sesion=code)
+
+            return session
+        except SesionSensorial.DoesNotExist:
+            return controller_error("La sesión ya no existe")
 
     @staticmethod
     def getNumberSessionsByCreator(user_name: str):
         try:
             creator = Presentador.objects.get(nombre_usuario=user_name)
-        except Presentador.DoesNotExist:
-            return controller_error("presentador invalido")
 
-        number_sessions = SesionSensorial.objects.filter(
-            creadoPor=creator).count()
+            number_sessions = SesionSensorial.objects.filter(
+                creadoPor=creator).count()
 
-        return number_sessions/9
+            return number_sessions/9
+        except Presentador.DoesNotExist:
+            return controller_error("presentador invalido")

tecnicas/controllers/tecnica_controller.py

@@ -35,6 +35,14 @@ class TecnicaController():
     def deleteTechnique(self):
         self.technique.delete()
 
+    @staticmethod
+    def getTechniqueById(id: int):
+        try:
+            technique = Tecnica.objects.get(id)
+            return technique
+        except Tecnica.DoesNotExist:
+            return controller_error("Técnica no encontrada")
+
     @staticmethod
     def getTypesTechnique():
         showTecnicas = {}

tecnicas/middlewares/login_tester_middleware.py

@@ -1,6 +1,4 @@
 from django.http import HttpRequest
-from django.shortcuts import redirect
-from django.urls import reverse
 
 
 class LoginTesterMiddleware():
@@ -8,10 +6,12 @@ class LoginTesterMiddleware():
         self.get_response = get_response
 
     def __call__(self, req: HttpRequest):
-        urls_protected = ["/cata/catador-main"]
+        url_protected = "/cata/testers/"
 
-        if req.path in urls_protected:
+        if req.path.startswith(url_protected):
             if not "cata_username" in req.session:
+                from django.shortcuts import redirect
+                from django.urls import reverse
                 return redirect(reverse("cata_system:catador_login"))
 
         response = self.get_response(req)

tecnicas/templates/tecnicas/forms_tester/main_tester.html

@@ -1,4 +1,5 @@
 {% extends 'tecnicas/layouts/base.html' %}
+{% load static %}
 
 {% block title %}Detalles Sesion{% endblock %}
 
@@ -7,9 +8,107 @@
     <article class="flex flex-col gap-8 bg-gray-400 p-10 rounded-2xl">
         <header class="text-center flex-row w-full flex justify-around items-center flex-wrap gap-10">
             <h1 class="text-white rounded-xl font-bold text-2xl bg-gray-600 p-4 flex-1">
-                Detalles de la sesión
+                Panel principal de Catadores
             </h1>
         </header>
+
+        <article>
+            <p class="text-2xl font-medium text-center bg-gray-200 p-4 rounded-lg">
+                Información sobre la sesión en la que participa
+            </p>
+        </article>
+
+        {% if error %}
+        <hr>
+        
+        <article class="bg-red-600 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>
+        {% endif %}
+
+        <hr>
+
+        <article
+            class="text-white rounded-xl grid grid-cols-1 gap-3 text-center *:bg-gray-500 *:flex *:flex-wrap *:items-center *:justify-center *:gap-x-2 *:p-4 *:rounded-2xl">
+            {% if session %}
+            <section>
+                <p class="text-xl font-bold">
+                    Código:
+                </p>
+                <p class="font-sans text-xl font-normal">
+                    {{ session.codigo_sesion }}
+                </p>
+            </section>
+
+            <section>
+                <p class="text-xl font-bold">
+                    {% if session.nombre_sesion %}
+                    {{ session.nombre_sesion }}
+                    {% else %}
+                    Sin nombre
+                    {% endif %}
+                </p>
+            </section>
+
+            <section>
+                <p class="text-xl font-medium">
+                    Esta sesión usa la técnica <span class="uppercase">{{ session.tecnica.tipo_tecnica }}</span>
+                </p>
+            </section>
+
+            <section>
+                <p class="text-xl font-medium">
+                    Esta sesión usa el estilo de palabras
+                    “<span class="uppercase">{{ session.tecnica.id_estilo }}</span>”
+                </p>
+            </section>
+
+            <section>
+                <p class="text-xl font-medium">
+                    Repetición número {{ session.tecnica.repecion }}
+                </p>
+            </section>
+
+            <section>
+                <p class="text-xl">
+                    {{ session.tecnica.instrucciones }}
+                </p>
+            </section>
+            {% else %}
+            <section>
+                <p class="text-xl font-medium">
+                    Ha ocurrido un error en renderizar esta vista
+                </p>
+            </section>
+            {% endif %}
+        </article>
+
+        <hr>
+
+        <article class="flex flex-wrap gap-10">
+            <a href="">
+                <button
+                    class="ct-btn-start-repition flex-1 uppercase text-lg tracking-wider p-4 border-b-2 active:border-b-0 active:border-t-2 active:border-green-500 border-green-800  transition-all rounded-xl bg-green-600 text-white font-bold disabled:bg-amber-600 flex flex-col justify-center items-center gap-2">
+                    Iniciar técnica
+                    <figure class="w-10">
+                        <img src="{% static 'img/check.svg' %}" alt="flechas girando" class="invert">
+                    </figure>
+                </button>
+            </a>
+            <button
+                class="flex-1 uppercase text-lg tracking-wider p-4 border-b-2 active:border-b-0 active:border-t-2 active:border-red-500 border-red-800 transition-all rounded-xl bg-red-600 text-white font-bold disabled:bg-amber-600 flex flex-col justify-center items-center gap-2">
+                Salir se la sesión
+                <figure class="w-10">
+                    <img src="{% static 'img/exit.svg' %}" alt="bote de basura" class="invert">
+                </figure>
+            </button>
+        </article>
+
+        <form action="" method="post" class="hidden">
+            <input type="hidden" value="start_posting" name="action">
+        </form>
     </article>
 </article>
 {% endblock %}

tecnicas/urls.py

@@ -68,7 +68,7 @@ urlpatterns = [
          views.testerLogin,
          name="catador_login"),
 
-    path("catador-main",
+    path("testers/catador-main",
          views.mainTesterForm,
          name="catador_main"),
 

tecnicas/utils/__init__.py

@@ -1,3 +1,4 @@
 from .code_generate import generarCodigo
 from .code_generate import generarCodigos
 from .personal_errors import general_error, controller_error
+from .shuffle_arrays import shuffleArray

tecnicas/utils/shuffle_arrays.py

@@ -0,0 +1,7 @@
+import random
+
+
+def shuffleArray(obj_list: list):
+    new_obj_list = obj_list[:]
+    random.shuffle(new_obj_list)
+    return new_obj_list

tecnicas/views/tester_forms/main_tester_form.py

@@ -1,9 +1,33 @@
 from django.http import HttpRequest, JsonResponse
 from django.shortcuts import render
+from ...controllers import SesionController, MainTesterFormController
 
 
 def mainTesterForm(req: HttpRequest):
-    if req.method == "POST":
-        return render(req, "tecnica/forms_tester/main_tester.html")
+    session = SesionController.getSessionByCodePanelTester(
+        req.session["code_session"])
+
+    context = {
+        "session": session
+    }
+
+    if req.method == "GET":
+        return render(req, "tecnicas/forms_tester/main_tester.html", context)
+    elif req.method == "POST":
+        if req.POST["action"] == "start_posting":
+            view_controller = MainTesterFormController(
+                req.session["code_session"], req.session["cata_username"])
+            
+            order = view_controller.assignOrder()
+            if isinstance(order, dict):
+                context["error"] = order["error"]
+                return render(req, "tecnicas/forms_tester/main_tester.html", context)
+            
+            return render(req, "tecnicas/forms_tester/main_tester.html", context)
+        elif req.POST["action"] == "close_session":
+            pass
+        else:
+            context["error"] = "Acción sin especificar"
+            return render(req, "tecnicas/forms_tester/main_tester.html", context)
     else:
         return JsonResponse({"error": "metodo no permitido"})