Merge pull request #32 from CascoArcilla/HU10

tecnicas/controllers/models_controller/sesion_controller.py

@@ -125,12 +125,7 @@ class SesionController():
             return controller_error("Presentador invalido")
 
     @staticmethod
-    def finishRepetion(session: SesionSensorial | str):
-        if isinstance(session, str):
-            use_session = SesionSensorial.objects.get(codigo_sesion=session)
-        else:
-            use_session = session
-
-        use_session.activo = False
-        use_session.save()
+    def finishRepetion(session: SesionSensorial):
+        session.activo = False
+        session.save()
         return session

tecnicas/controllers/views_controller/session_management/monitor_controller.py

@@ -1,5 +1,6 @@
 from django.http import HttpRequest
-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.urls import reverse
 from tecnicas.models import SesionSensorial, Producto, EsAtributo, EsVocabulario
 from tecnicas.controllers import ParticipacionController, SesionController
 from tecnicas.utils import controller_error
@@ -12,6 +13,18 @@ class MonitorController():
     def __init__(self, session: SesionSensorial):
         self.sensorial_session = session
 
+    def controllPostFinishSession(self, request: HttpRequest):
+        self.setContext()
+        (is_all_end, message) = self.checkAllFinish()
+        if not is_all_end:
+            self.context["error"] = message
+            return render(request, self.url_view, self.context)
+        self.finishSession()
+        return redirect(reverse(self.previus_view, kwargs={"session_code": self.sensorial_session.codigo_sesion}))
+
+    def checkAllFinish(self):
+        return (False, "Función sin implementar")
+
     def setContext(self):
         self.participations = ParticipacionController.getParticipationsInTechinique(
             self.sensorial_session.tecnica)
@@ -26,7 +39,7 @@ class MonitorController():
             "use_technique": self.sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
         }
 
-    def controlGetResponse(self, request: HttpRequest,  error: str = "", message: str = ""):
+    def controllGetResponse(self, request: HttpRequest,  error: str = "", message: str = ""):
         self.setContext()
 
         if error != "" or error:
@@ -36,7 +49,7 @@ class MonitorController():
 
         return render(request, self.url_view, self.context)
 
-    def getExpectedRatingsEscalasRapida(self):
+    def getExpectedRatings(self):
         num_products = Producto.objects.filter(
             id_tecnica=self.sensorial_session.tecnica).count()
         style_words = self.sensorial_session.tecnica.id_estilo
@@ -52,8 +65,6 @@ class MonitorController():
         return num_products * num_words
 
     def finishSession(self):
-        response = SesionController.finishRepetion(self.sensorial_session)
-        if isinstance(response, dict):
-            return controller_error(response["error"])
-        self.sensorial_session.refresh_from_db()
+        self.sensorial_session.activo = False
+        self.sensorial_session.save()
         return self.sensorial_session

tecnicas/controllers/views_controller/session_management/monitor_escalas_controller.py

@@ -12,23 +12,10 @@ class MonitorEscalasController(MonitorController):
         self.url_view = "tecnicas/manage_sesions/monitor-sesion.html"
         self.previus_view = "cata_system:detalles_sesion"
 
-    def controllPostFinishSession(self, request: HttpRequest):
-        self.setContext()
-        (is_all_end, message) = self.checkAllFinish()
-        if not is_all_end:
-            self.context["error"] = message
-            return render(request, self.url_view, self.context)
-        response = self.finishSession()
-        if isinstance(response, dict):
-            self.context["error"] = response["error"]
-            return render(request, self.url_view, self.context)
-        self.context["message"] = message
-        return redirect(reverse(self.previus_view, kwargs={"session_code": self.sensorial_session.codigo_sesion}))
-
     def checkAllFinish(self):
         technique = self.sensorial_session.tecnica
 
-        expected_ratings_repetition = self.getExpectedRatingsEscalasRapida()
+        expected_ratings_repetition = self.getExpectedRatings()
 
         all_participations = list(
             Participacion.objects.filter(tecnica=technique))

tecnicas/controllers/views_controller/session_management/monitor_rata_controller.py

@@ -12,23 +12,10 @@ class MonitorRATAController(MonitorController):
         self.url_view = "tecnicas/manage_sesions/monitor-sesion.html"
         self.previus_view = "cata_system:detalles_sesion"
 
-    def controllPostFinishSession(self, request: HttpRequest):
-        self.setContext()
-        (is_all_end, message) = self.checkAllFinish()
-        if not is_all_end:
-            self.context["error"] = message
-            return render(request, self.url_view, self.context)
-        response = self.finishSession()
-        if isinstance(response, dict):
-            self.context["error"] = response["error"]
-            return render(request, self.url_view, self.context)
-        self.context["message"] = message
-        return redirect(reverse(self.previus_view, kwargs={"session_code": self.sensorial_session.codigo_sesion}))
-
     def checkAllFinish(self):
         technique = self.sensorial_session.tecnica
 
-        expected_ratings_repetition = self.getExpectedRatingsEscalasRapida()
+        expected_ratings_repetition = self.getExpectedRatings()
 
         all_participations = list(
             Participacion.objects.filter(tecnica=technique))

tecnicas/views/sessions_management/session_details.py

@@ -42,7 +42,7 @@ def sessionDetails(req: HttpRequest, session_code: str):
             codigo_sesion=session_code)
         use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
 
-        if use_techinique == "escalas" or use_techinique == "rata":
+        if use_techinique == "escalas" or use_techinique == "rata" or use_techinique == "cata":
             controller_view = DetallesEscalasController(sensorial_session)
 
             if req.POST["action"] == "start_session":

tecnicas/views/sessions_management/session_monitor.py

@@ -18,9 +18,9 @@ def sessionMonitor(req: HttpRequest, session_code: str):
             codigo_sesion=session_code)
         use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
 
-        if use_techinique == "escalas" or use_techinique == "rata":
+        if use_techinique == "escalas" or use_techinique == "rata" or use_techinique == "cata":
             controll_view = MonitorEscalasController(sensorial_session)
-            response = controll_view.controlGetResponse(request=req)
+            response = controll_view.controllGetResponse(request=req)
         else:
             response = noValidTechnique(
                 params={
@@ -31,7 +31,6 @@ def sessionMonitor(req: HttpRequest, session_code: str):
                 },
                 name_view="cata_system:detalles_sesion"
             )
-
         return response
     elif req.method == "POST":
         sensorial_session = SesionSensorial.objects.get(

tecnicas/views/tester_forms/init_tester_form.py

@@ -16,7 +16,7 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
     if req.method == "GET":
         if type_technique == "escalas":
             response = view_controller.controllGetEscalas(request=req)
-        elif type_technique == "rata":
+        elif type_technique == "rata" or type_technique == "cata":
             response = view_controller.controllGetRATA(request=req)
         else:
             context = {

tecnicas/views/tester_forms/login_session.py

@@ -29,7 +29,7 @@ def loginSessionTester(req: HttpRequest):
 
         if type_technique == "escalas":
             response = login_controller.validateEntryEscalas(request=req)
-        elif type_technique == "rata":
+        elif type_technique == "rata" or type_technique == "cata":
             response = login_controller.validateEntryRATA(request=req)
         else:
             context = {