Se corrigen errores al participar en sesion, monitoreo y detalles de sesion

tecnicas/controllers/models_controller/dato_controller.py

@@ -89,7 +89,7 @@ class DatoController():
                 producto_code=F(
                     "id_dato__id_calificacion__id_producto__codigoProducto"),
                 usuarioCatador=F(
-                    "id_dato__id_calificacion__id_catador__usuarioCatador"),
+                    "id_dato__id_calificacion__id_catador__user__username"),
                 dato_valor=F("valor")
             )
         )

tecnicas/middlewares/presenter_middleware.py

@@ -1,18 +1,17 @@
-from django.core.exceptions import PermissionDenied
-
 class PresenterAccessMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
         path = request.path_info
-        
+
         if path.startswith('/cata/presenter/'):
             if not request.user.is_authenticated:
                 from django.shortcuts import redirect
                 return redirect("cata_system:autenticacion")
 
             if not hasattr(request.user, 'user_presentador'):
+                from django.shortcuts import redirect
                 return redirect("cata_system:autenticacion")
 
         return self.get_response(request)

tecnicas/middlewares/tester_middleware.py

@@ -15,32 +15,7 @@ class TesterAccessMiddleware:
                 return redirect("cata_system:catador_login")
 
             if not hasattr(request.user, 'user_catador'):
+                from django.shortcuts import redirect
                 return redirect("cata_system:catador_login")
 
         return self.get_response(request)
-
-# from django.http import HttpRequest
-
-
-# class LoginTesterMiddleware():
-#     def __init__(self, get_response):
-#         self.get_response = get_response
-
-#     def __call__(self, req: HttpRequest):
-#         base_url_protected = "/cata/testers/"
-
-#         if req.path.startswith(base_url_protected):
-#             if not "cata_username" in req.session:
-#                 id_participacion = req.COOKIES.get("id_participacion")
-#                 if id_participacion:
-#                     from tecnicas.controllers import ParticipacionController
-#                     ParticipacionController.outSession(id_participacion)
-#                 from django.shortcuts import redirect
-#                 from django.urls import reverse
-#                 response = redirect(reverse("cata_system:catador_login"))
-#                 response.delete_cookie("id_participacion")
-#                 return response
-
-#         response = self.get_response(req)
-
-#         return response

tecnicas/templates/tecnicas/components/table-convencional.html

@@ -23,7 +23,6 @@
                         {% with match=None %}
                         {% for valor in valores %}
                         {% if valor.nombre_palabra == palabra %}
-                        {{ palabra }} <br>
                         {{ valor.dato_valor }}
                         {% with match=True %}{% endwith %}
                         {% endif %}

tecnicas/templates/tecnicas/forms_tester/convencional.html

@@ -45,7 +45,7 @@
         </header>
 
         <article class="hidden">
-            <form action="{% url 'cata_system:catador_main' %}" method="post" class="form-actions">
+            <form action="{% url 'cata_system:catador_init_session' code_sesion=session.codigo_sesion %}" method="post" class="form-actions">
                 {% csrf_token %}
                 <input type="hidden" name="action" class="action-input">
             </form>

tecnicas/templates/tecnicas/manage_sesions/detalles-sesion.html

@@ -212,8 +212,7 @@
         {% if existen_calificaciones %}
         <article class="bg-surface-card p-4 max-sm:px-2 text-black rounded">
             {% for repeticion, catadores in calificaciones.items %}
-            {% include "../components/table-convencional.html" with repeticion=repeticion catadores=catadores
-            palabras=palabras %}
+            {% include "../components/table-convencional.html" with repeticion=repeticion catadores=catadores palabras=palabras %}
             {% endfor %}
         </article>
         {% else %}

tecnicas/templates/tecnicas/manage_sesions/monitor-sesion.html

@@ -91,10 +91,10 @@
                     <ul class="divide-y divide-gray-400 max-sm:w-full text-black">
                         {% for parti in participations %}
                         <li class="grid grid-cols-4 text-center bg-surface-card py-2 [&_>*]:px-2">
-                            <p class="border-r border-gray-400">{{ parti.catador.usuarioCatador }}</p>
+                            <p class="border-r border-gray-400">{{ parti.catador.user.username }}</p>
                             <p class="border-r border-gray-400">
-                                {{ parti.catador.nombre }}
-                                {{ parti.catador.apellido}}
+                                {{ parti.catador.user.first_name }}
+                                {{ parti.catador.user.last_name}}
                             </p>
 
                             {% if parti.activo %}

tecnicas/views/apis/rating_word.py

@@ -44,9 +44,9 @@ def reatingWord(req:  HttpRequest):
 
         view_controller = ApiRatingController(
             rating_controller=CalificacionController(
-                technique=req.session["id_techniqe"],
+                technique=req.session["id_technique"],
                 product=received_id_product,
-                tester=req.session["id_cata"]
+                tester=req.user.user_catador
             ),
             data_controller=DatoController(
                 word=received_id_word,

tecnicas/views/tester_forms/convencional_scales.py

@@ -60,17 +60,19 @@ from django.urls import reverse
 from ...controllers import SesionController, PosicionController, CalificacionController, ParticipacionController, PalabrasController, EscalaController, DatoController
 
 
-def convencionalScales(req: HttpRequest):
+def convencionalScales(req: HttpRequest, code_sesion: str):
     if not "id_order" in req.session:
         return redirect(reverse("cata_system:catador_main"))
 
-    session = SesionController.getSessionByCode(req.session["code_session"])
+    session = SesionController.getSessionByCode(code_sesion)
     technique = session.tecnica
 
     context = {
         "session": session
     }
 
+    req.session["id_technique"] = session.tecnica.id
+
     if req.method == "GET":
         positions = PosicionController.getPostionsInOrder(
             id_order=req.session["id_order"])
@@ -82,7 +84,7 @@ def convencionalScales(req: HttpRequest):
         next_position = CalificacionController.checkProducsWithoutRating(
             positions=sorted_positions,
             user_cata=req.user.username,
-            id_technique=req.session["id_techniqe"],
+            id_technique=session.tecnica.id,
             repetition=session.tecnica.repeticion,
             technique=technique,
             num_words=len(words)
@@ -102,7 +104,7 @@ def convencionalScales(req: HttpRequest):
             technique=technique,
             product=next_position.id_producto,
             repetition=technique.repeticion,
-            user_tester=req.session["cata_username"]
+            user_tester=req.user.username
         )
 
         if isinstance(ratings_product, dict):

tecnicas/views/tester_forms/init_tester_form.py

@@ -31,6 +31,10 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
         return render(req, template_url, context)
     elif req.method == "POST":
         if req.POST["action"] == "start_posting":
+            parameters = {
+                "code_sesion": code_sesion
+            }
+
             if "id_order" in req.session:
                 update_participation = ParticipacionController.enterSession(
                     tester=req.user.user_catador, session=session)
@@ -38,7 +42,7 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
                     context["error"] = update_participation["error"]
                     return render(req, template_url, context)
 
-                return redirect(reverse("cata_system:session_convencional"))
+                return redirect(reverse("cata_system:session_convencional", kwargs=parameters))
 
             order = view_controller.assignOrder()
             if isinstance(order, dict):
@@ -50,15 +54,11 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
             if isinstance(update_participation, dict):
                 context["error"] = update_participation["error"]
                 return render(req, template_url, context)
-            
-            parameters = {
-                "code_sesion": code_sesion
-            }
 
             return redirect(reverse("cata_system:session_convencional", kwargs=parameters))
         elif req.POST["action"] == "exit_session":
             response = ParticipacionController.outSession(
-                req.session["id_participation"])
+                tester=req.user.user_catador, session=session)
             if isinstance(response, dict):
                 context["error"] = response["error"]
             return render(req, template_url, context)
@@ -67,3 +67,11 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
             return render(req, template_url, context)
     else:
         return JsonResponse({"error": "metodo no permitido"})
+
+# 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)

tecnicas/views/tester_forms/login_session.py

@@ -33,15 +33,7 @@ def loginSessionTester(req: HttpRequest):
         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)