Se agrega ingreso a sesion en login-sesion

tecnicas/controllers/views_controller/login_tester_controller.py

@@ -14,7 +14,7 @@ class LoginTesterController():
 
     def existCredential(self, user_tester: str, code_session: str):
         try:
-            self.tester = Catador.objects.get(usuarioCatador=user_tester)
+            self.tester = Catador.objects.get(user__username=user_tester)
             self.session = SesionSensorial.objects.get(
                 codigo_sesion=code_session)
 
@@ -23,7 +23,7 @@ class LoginTesterController():
             return controller_error("Credenciales inválidas")
 
     def validateEntry(self):
-        if not self.tester.nombre or not self.session.codigo_sesion:
+        if not self.tester.user.first_name or not self.session.codigo_sesion:
             return controller_error("Credenciales no definidas")
 
         if not self.session.activo:

tecnicas/controllers/views_controller/main_tester_form_controller.py

@@ -10,7 +10,7 @@ class MainTesterFormController():
 
     def __init__(self, code_session: str, user_tester: str):
         try:
-            self.tester = Catador.objects.get(usuarioCatador=user_tester)
+            self.tester = Catador.objects.get(user__username=user_tester)
             self.session = SesionSensorial.objects.get(
                 codigo_sesion=code_session)
         except (Catador.DoesNotExist, SesionSensorial.DoesNotExist):

tecnicas/models/participacion.py

@@ -12,4 +12,4 @@ class Participacion(models.Model):
     finalizado = models.BooleanField(default=True)
 
     def __str__(self):
-        return f"{self.catador.usuarioCatador} {'activo' if self.activo else 'no activo'}"
+        return f"{self.catador.user.username} {'activo' if self.activo else 'no activo'}"

tecnicas/models/sesion_sensorial.py

@@ -17,4 +17,9 @@ class SesionSensorial(models.Model):
         Tecnica, on_delete=models.CASCADE, related_name="sesion_tecnica")
 
     def __str__(self):
-        return self.nombre_sesion if self.nombre_sesion else self.codigo_sesion
+        name_str = f"{self.codigo_sesion}"
+
+        if self.nombre_sesion:
+            name_str += f" : {self.nombre_sesion}"
+        
+        return name_str

tecnicas/templates/tecnicas/forms_tester/{main_tester.html → init_session.html}

@@ -99,7 +99,8 @@
 
         <article class="flex flex-wrap gap-10">
             {% if has_ended %}
-            <div class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none">
+            <div
+                class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none">
                 <p class=" text-black">Finalizaste la repetición</p>
             </div>
             {% else %}
@@ -112,14 +113,15 @@
                 </figure>
             </button>
             {% endif %}
-            <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"
-                onclick="closeSession()">
-                Salir se la sesión
-                <figure class="w-10">
-                    <img src="{% static 'img/exit.svg' %}" alt="bote de basura" class="invert">
-                </figure>
-            </button>
+            <a href="{% url 'cata_system:catador_main' %}">
+                <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
+                    <figure class="w-10">
+                        <img src="{% static 'img/exit.svg' %}" alt="bote de basura" class="invert">
+                    </figure>
+                </button>
+            </a>
         </article>
 
         <form action="" method="post" class="hidden ct-action-form">

tecnicas/templates/tecnicas/forms_tester/login_session.html

@@ -0,0 +1,50 @@
+{% extends 'tecnicas/layouts/base.html' %}
+
+{% block title %}Ingresar a Sesión{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content text-black max-w-2xl">
+        <header class="flex flex-col md:flex-row md:items-center md:justify-between gap-3">
+            <h1 class="rounded font-bold text-2xl bg-surface-ligt p-4 flex-1">
+                Ingresar a una sesión sensorial
+            </h1>
+            <a href="{% url 'cata_system:catador_main' %}">
+                <button class="cts-btn-general-compress px-4 py-2 cts-btn-secondary btn-push">
+                    Regresar
+                </button>
+            </a>
+        </header>
+
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% endif %}
+        {% if message %}
+        {% include "../components/error-message.html" with message=message %}
+        {% endif %}
+
+        <form action="" method="post" class="rounded-xl text-black space-y-4">
+            {% csrf_token %}
+            <section class="bg-surface-sweet rounded p-4">
+                <h2 class="font-semibold text-2xl text-center">
+                    Para Ingresar a la sesion debes ingresar el codigo de sesión
+                </h2>
+            </section>
+            <article class="flex flex-col gap-6 items-center w-full px-6">
+                <label for="code_session" class="w-full">
+                    <input type="text" name="code_session" id="code_session" placeholder="Código de sesión"
+                        class="placeholder:text-gray-400 placeholder:font-semibold text-xl max-sm:text-base bg-surface-ligt py-3 px-6 rounded-xl w-full border-b-2 border-surface-sweet"
+                        required>
+                </label>
+
+                <section class="flex flex-row flex-wrap gap-4 w-full justify-center">
+                    <button type="submit"
+                        class="cts-btn-general-compress px-4 py-2 cts-btn-primary btn-push uppercase w-full">
+                        Ingresar a la sesión
+                    </button>
+                </section>
+            </article>
+        </form>
+    </article>
+</article>
+{% endblock %}

tecnicas/templates/tecnicas/forms_tester/main_panel_tester.html

@@ -1,6 +1,6 @@
 {% extends 'tecnicas/layouts/base.html' %}
 
-{% block title %}Detalles Sesion{% endblock %}
+{% block title %}Panel Principal Tester{% endblock %}
 
 {% block content %}
 <article class="cts-container-main">
@@ -11,9 +11,11 @@
                     <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>
+                        <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>
                     </div>
 
                     <div class="divider my-3"></div>

tecnicas/urls.py

@@ -82,9 +82,13 @@ urlpatterns = [
          views.mainPanelTester,
          name="catador_main"),
 
-    path("testers/catador-init",
+    path("testers/log-in-session",
+         views.loginSessionTester,
+         name="catador_in_session"),
+
+    path("testers/init-session/<str:code_sesion>",
          views.initTesterForm,
-         name="catador_init"),
+         name="catador_init_session"),
 
     path("testers/en-session/convencional",
          views.convencionalScales,

tecnicas/views/__init__.py

@@ -25,3 +25,4 @@ from .apis.rating_word import reatingWord
 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

tecnicas/views/login_tester.py

@@ -3,8 +3,6 @@ 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):
@@ -21,44 +19,3 @@ def loginTester(req: HttpRequest):
 
         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")
-    elif req.method == "POST":
-        tester_user = req.POST.get("user_tester")
-        session_code = req.POST.get("code_session")
-        if not tester_user or not session_code:
-            return general_error("Se esperan credenciales")
-
-        login_controller = LoginTesterController()
-
-        existCredentials = login_controller.existCredential(
-            tester_user, session_code)
-        if isinstance(existCredentials, dict):
-            context = {"error": existCredentials["error"]}
-            return render(req, "tecnicas/cata-login.html", context)
-
-        tester = existCredentials[0]
-        session = existCredentials[1]
-
-        taster_participation = login_controller.validateEntry()
-        if isinstance(taster_participation, dict):
-            context = {"error": taster_participation["error"]}
-            return render(req, "tecnicas/cata-login.html", context)
-
-        req.session["cata_username"] = tester_user
-        req.session["id_cata"] = tester.id
-        req.session["code_session"] = session_code
-        req.session["id_techniqe"] = session.tecnica.id
-        req.session["id_participation"] = taster_participation.id
-
-        req.session.set_expiry(15*60)
-
-        response = redirect(reverse("cata_system:catador_main"))
-        response.set_cookie('id_participacion',
-                            taster_participation.id, max_age=60*60*24)
-        return response
-    else:
-        return render(req, "tecnicas/cata-login.html")

tecnicas/views/tester_forms/init_tester_form.py

@@ -4,16 +4,17 @@ from django.urls import reverse
 from ...controllers import SesionController, MainTesterFormController, ParticipacionController
 
 
-def initTesterForm(req: HttpRequest):
-    session = SesionController.getSessionByCodePanelTester(
-        req.session["code_session"])
+def initTesterForm(req: HttpRequest, code_sesion: str):
+    session = SesionController.getSessionByCodePanelTester(code_sesion)
 
     context = {
         "session": session
     }
 
     view_controller = MainTesterFormController(
-        req.session["code_session"], req.session["cata_username"])
+        code_sesion, req.user.username)
+
+    template_url = "tecnicas/forms_tester/init_session.html"
 
     if req.method == "GET":
         order = view_controller.checkAssignOrder()
@@ -22,12 +23,12 @@ def initTesterForm(req: HttpRequest):
             req.session["id_order"] = order.id
             is_end = view_controller.isEndedSession(
                 id_participation=req.session["id_participation"], repetition=session.tecnica.repeticion)
-            
+
             if is_end:
                 context["message"] = "El catador ha terminado de realizar su evaluación, espere instrucciones del presentador"
                 context["has_ended"] = True
 
-        return render(req, "tecnicas/forms_tester/main_tester.html", context)
+        return render(req, template_url, context)
     elif req.method == "POST":
         if req.POST["action"] == "start_posting":
             if "id_order" in req.session:
@@ -35,33 +36,30 @@ def initTesterForm(req: HttpRequest):
                     id_participation=req.session["id_participation"])
                 if isinstance(update_participation, dict):
                     context["error"] = update_participation["error"]
-                    return render(req, "tecnicas/forms_tester/main_tester.html", context)
+                    return render(req, template_url, context)
 
                 return redirect(reverse("cata_system:session_convencional"))
 
             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, template_url, context)
 
             update_participation = ParticipacionController.enterSession(
                 id_participation=req.session["id_participation"])
             if isinstance(update_participation, dict):
                 context["error"] = update_participation["error"]
-                return render(req, "tecnicas/forms_tester/main_tester.html", context)
+                return render(req, template_url, context)
 
             return redirect(reverse("cata_system:session_convencional"))
-        elif req.POST["action"] == "close_session":
-            req.session.flush()
-            return redirect(reverse("cata_system:catador_login"))
         elif req.POST["action"] == "exit_session":
             response = ParticipacionController.outSession(
                 req.session["id_participation"])
             if isinstance(response, dict):
                 context["error"] = response["error"]
-            return render(req, "tecnicas/forms_tester/main_tester.html", context)
+            return render(req, template_url, context)
         else:
             context["error"] = "Acción sin especificar"
-            return render(req, "tecnicas/forms_tester/main_tester.html", context)
+            return render(req, template_url, context)
     else:
         return JsonResponse({"error": "metodo no permitido"})

tecnicas/views/tester_forms/login_session.py

@@ -0,0 +1,47 @@
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import render, redirect
+from django.urls import reverse
+from tecnicas.utils import general_error
+from tecnicas.controllers import LoginTesterController
+
+
+def loginSessionTester(req: HttpRequest):
+    if req.method == "GET":
+        return render(req, "tecnicas/forms_tester/login_session.html")
+    elif req.method == "POST":
+        tester_user = req.user.username
+        session_code = req.POST.get("code_session")
+        if not tester_user or not session_code:
+            return general_error("Se esperan credenciales")
+
+        login_controller = LoginTesterController()
+
+        existCredentials = login_controller.existCredential(
+            tester_user, session_code)
+        if isinstance(existCredentials, dict):
+            context = {"error": existCredentials["error"]}
+            return render(req, "tecnicas/forms_tester/login_session.html", context)
+
+        tester = existCredentials[0]
+        session = existCredentials[1]
+
+        taster_participation = login_controller.validateEntry()
+        if isinstance(taster_participation, dict):
+            context = {"error": taster_participation["error"]}
+            return render(req, "tecnicas/forms_tester/login_session.html", context)
+
+        params = {
+            "code_sesion": session_code
+        }
+        
+        return redirect(reverse("cata_system:catador_init_session", kwargs=params))
+    else:
+        return JsonResponse({"message": "Método no valido"})
+
+# req.session["cata_username"] = tester_user
+# req.session["id_cata"] = tester.id
+# req.session["code_session"] = session_code
+# req.session["id_techniqe"] = session.tecnica.id
+# req.session["id_participation"] = taster_participation.id
+
+# response.set_cookie('id_participacion', taster_participation.id, max_age=60*60*24)