Configuracion basica y configuracion de tags configuradas para otros tipo de tecnica

tecnicas/controllers/__init__.py

@@ -18,4 +18,7 @@ from .views_controller.main_tester_form_controller import MainTesterFormControll
 from .views_controller.api_rating_controller import ApiRatingController
 from .views_controller.monitor_sesion_controller import MonitorSesionController
 from .views_controller.tester_list_controller import TesterListController
-from .views_controller.list_sessions_tester_controller import ListSessionsTesterController
+from .views_controller.list_sessions_tester_controller import ListSessionsTesterController
+
+from .views_controller.create_session.panel_basic_controller import PanelBasicController
+from .views_controller.create_session.panel_tags_controller import PanelTagsController

tecnicas/controllers/models_controller/tecnica_controller.py

@@ -15,7 +15,7 @@ class TecnicaController():
 
     def setTechniqueFromBasicData(self, basic):
         self.technique = Tecnica(
-            tipo_tecnica=TipoTecnica.objects.get(id=basic["id_tecnica"]),
+            tipo_tecnica=TipoTecnica.objects.get(nombre_tecnica=basic["name_tecnica"]),
             id_estilo=EstiloPalabra.objects.get(id=basic["estilo_palabras"]),
             repeticiones_max=basic["numero_repeticiones"] or 0,
             limite_catadores=basic["numero_catadores"],

tecnicas/controllers/views_controller/create_session/panel_basic_controller.py

@@ -0,0 +1,42 @@
+from tecnicas.forms import SesionBasicForm
+from django.http import HttpRequest
+from django.shortcuts import redirect, render
+from django.urls import reverse
+
+
+class PanelBasicController():
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def controllGetConvencional(request: HttpRequest):
+        form_sesion = SesionBasicForm()
+        response = render(
+            request, "tecnicas/create_sesion/configuracion-panel-basic.html", {"form_sesion": form_sesion})
+        return response
+
+    @staticmethod
+    def controllPostConvencional(request: HttpRequest, name_tecnica: str):
+        try:
+            form = SesionBasicForm(request.POST)
+
+            if form.is_valid():
+                values = {}
+                for name, value in form.cleaned_data.items():
+                    if name == "estilo_palabras" or name == "tipo_escala":
+                        values[name] = value.id
+                    else:
+                        values[name] = value
+
+                values["name_tecnica"] = name_tecnica
+                request.session['form_basic'] = values
+                response = redirect(
+                    reverse("cata_system:panel_configuracion_tags"))
+            else:
+                response = render(request, "tecnicas/create_sesion/configuracion-panel-basic.html", {
+                    "form_sesion": form, "error": "Información no valida"})
+        except KeyError:
+            response = redirect(reverse(
+                "cata_system:seleccion_tecnica") + "?error=error en datos de configuracion")
+
+        return response

tecnicas/controllers/views_controller/create_session/panel_tags_controller.py

@@ -0,0 +1,71 @@
+from django.http import HttpRequest
+from django.shortcuts import redirect, render
+from django.urls import reverse
+from tecnicas.forms import SesionTagsForm, EtiquetaForm
+from tecnicas.models import TipoEscala
+
+
+class PanelTagsController():
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def controllGetConvencional(request: HttpRequest, data):
+        (
+            type_scale,
+            tamano_escala,
+            form_new_etiqueta
+        ) = PanelTagsController.defineInfoScale(data)
+
+        form_etiqutas = SesionTagsForm(
+            longitud=tamano_escala, tipo_escala=type_scale.nombre_escala)
+
+        context_tags = {
+            "form_tags": form_etiqutas,
+            "form_new_tag": form_new_etiqueta
+        }
+
+        return render(request, "tecnicas/create_sesion/configuracion-panel-tags.html", context_tags)
+
+    @staticmethod
+    def controllPostConvencional(request: HttpRequest, data):
+        (
+            type_scale,
+            tamano_escala,
+            form_new_etiqueta
+        ) = PanelTagsController.defineInfoScale(data)
+
+        values = {}
+        form = SesionTagsForm(request.POST, longitud=tamano_escala,
+                              tipo_escala=type_scale.nombre_escala)
+
+        context_tags = {
+            "form_tags": form,
+            "form_new_tag": form_new_etiqueta
+        }
+
+        if form.is_valid():
+            for name, value in form.cleaned_data.items():
+                values[name] = value.id
+
+            request.session["form_tags"] = values
+            response = redirect(
+                reverse("cata_system:panel_configuracion_codes"))
+        else:
+            context_tags["error"] = "ha ocurrido un error"
+            response = render(
+                request, "tecnicas/create_sesion/configuracion-panel-tags.html", context_tags)
+
+        return response
+
+    @staticmethod
+    def defineInfoScale(data):
+        type_scale = TipoEscala.objects.get(pk=data["tipo_escala"])
+        tamano_escala = data["tamano_escala"]
+        form_new_etiqueta = EtiquetaForm()
+
+        return (
+            type_scale,
+            tamano_escala,
+            form_new_etiqueta
+        )

tecnicas/forms/sesion_basic_form.py

@@ -8,8 +8,6 @@ class SesionBasicForm(forms.Form):
     sizes_structure = [5, 7, 9]
     sizes_continue = [9, 13, 15]
 
-    id_tecnica = forms.IntegerField(widget=forms.HiddenInput())
-
     nombre_sesion = forms.CharField(max_length=255, widget=forms.TextInput(attrs={
         "class": "bg-surface-ligt border-b-1 text-center w-full p-1",
         "name": "nombre_sesion",
@@ -36,7 +34,7 @@ class SesionBasicForm(forms.Form):
         "placeholder": "Este campo es opcional"
     }), required=False)
 
-    def __init__(self, *args, id_tecnica_new=0, **kwargs):
+    def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.fields['estilo_palabras'] = forms.ModelChoiceField(queryset=EstiloPalabra.objects.all(), widget=forms.RadioSelect(attrs={
@@ -49,11 +47,7 @@ class SesionBasicForm(forms.Form):
 
         self.fields['tamano_escala'] = forms.IntegerField(widget=forms.HiddenInput(attrs={
             "class": "cts-size-input",
-        }), required=True, min_value=5)
-
-        if id_tecnica_new != 0:
-            self.fields['id_tecnica'] = forms.IntegerField(
-                initial=id_tecnica_new, widget=forms.HiddenInput())
+        }), required=True)
 
     def clean(self):
         data_clean = super().clean()
@@ -73,10 +67,3 @@ class SesionBasicForm(forms.Form):
             self.add_error("tamano_escala", "El tamaño de la escala no aplica")
         elif escala.nombre_escala == "continua" and not self.sizes_continue.__contains__(tamano_escala):
             self.add_error("tamano_escala", "El tamaño de la escala no aplica")
-
-        id_tecnica = data_clean.get("id_tecnica")
-
-        try:
-            tecnica = TipoTecnica.objects.get(pk=id_tecnica)
-        except (ValueError, TipoTecnica.DoesNotExist):
-            return data_clean

tecnicas/templates/tecnicas/create_sesion/configuracion-panel-basic.html

@@ -13,8 +13,8 @@
         <hr>
         <form method="post" action="" class="[&>article]:not-last:mb-4 [&>article]:not-first:pt-4 [&>article]:px-6">
             {% csrf_token %}
-            <label for="form_sesion.id_tecnica.id_for_label" class="hidden">
-                {{ form_sesion.id_tecnica }}
+            <label for="form_sesion.name_tecnica.id_for_label" class="hidden">
+                {{ form_sesion.name_tecnica }}
             </label>
 
             <article>

tecnicas/templates/tecnicas/create_sesion/seleccion-tecnica.html

@@ -33,7 +33,7 @@
                 <section
                     class="modal-list-{{ cate }} flex flex-col text-lg bg-surface-ligt p-4 pr-6 pl-8 sm:pl-12 z-10 -translate-y-1 rounded-b-2xl *:not-last:mb-4 transition-all duration-1000 hidden w-full">
                     {% for tecnica in tecnicas %}
-                    <a href="{% url 'cata_system:panel_configuracion_basic'%}?id_tecnica={{tecnica.id}}">
+                    <a href="{% url 'cata_system:panel_configuracion_basic'%}?name_tecnica={{ tecnica }}">
                         <button
                             class="cts-btn-secondary btn-push rounded-lg border-b-0 border-l-4 border-gray-700 px-3 py-2 w-full text-left font-bold uppercase">
                             {{ tecnica.nombre_tecnica }}

tecnicas/views/sessions_config/configuration_panel_basic.py

@@ -1,8 +1,8 @@
 from django.shortcuts import render, redirect
-from django.http import HttpRequest
+from django.http import HttpRequest, JsonResponse
 from django.urls import reverse
-from ...forms import SesionBasicForm
-from ...models import TipoTecnica
+from tecnicas.forms import SesionBasicForm
+from tecnicas.controllers import PanelBasicController
 
 
 def configurationPanelBasic(req: HttpRequest):
@@ -17,36 +17,26 @@ def configurationPanelBasic(req: HttpRequest):
         if key in req.session:
             del req.session[key]
 
-    if req.method == "POST":
-        try:
-            form = SesionBasicForm(req.POST)
-
-            if form.is_valid():
-                values = {}
-
-                for name, value in form.cleaned_data.items():
-                    if name == "estilo_palabras" or name == "tipo_escala":
-                        values[name] = value.id
-                    else:
-                        values[name] = value
-
-                req.session['form_basic'] = values
-                return redirect(reverse("cata_system:panel_configuracion_tags"))
-        except KeyError:
-            return redirect(reverse("cata_system:seleccion_tecnica") + "?error=error en datos de configuracion")
-
-        return render(req, "tecnicas/create_sesion/configuracion-panel-basic.html", {"form_sesion": form, "error": "Ha ocurrido un error al continuar al siguiente paso."})
-    elif req.method == "GET":
-        try:
-            id_tecnica = req.GET["id_tecnica"]
-            tecnica = TipoTecnica.objects.get(pk=id_tecnica)
-        except KeyError:
-            return redirect(reverse("cata_system:seleccion_tecnica") + "?error=tecnica_no_establecida")
-        except (ValueError, TipoTecnica.DoesNotExist):
-            return redirect(reverse("cata_system:seleccion_tecnica") + "?error=tecnica_no_establecida")
-
-        if tecnica:
-            form_sesion = SesionBasicForm(id_tecnica_new=id_tecnica)
-            return render(req, "tecnicas/create_sesion/configuracion-panel-basic.html", {"form_sesion": form_sesion})
+    if req.method == "GET":
+        name_tecnica = req.GET["name_tecnica"]
+
+        if name_tecnica == "escalas":
+            response = PanelBasicController.controllGetConvencional(request=req)
         else:
-            return redirect(reverse("cata_system:seleccion_tecnica") + "?error=la_tecnica_no_existe")
+            response = redirect(
+                reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida o sin implementar")
+
+        return response
+    elif req.method == "POST":
+        name_tecnica = req.GET["name_tecnica"]
+
+        if name_tecnica == "escalas":
+            response = PanelBasicController.controllPostConvencional(
+                request=req, name_tecnica=name_tecnica)
+        else:
+            response = redirect(
+                reverse("cata_system:seleccion_tecnica") + "?error=¡Oh, vaya! Cambio de técnica repentino, vuelve a elegir otra vez")
+
+        return response
+    else:
+        return JsonResponse({"message": "Método no permitido"})

tecnicas/views/sessions_config/configuration_panel_tags.py

@@ -1,46 +1,26 @@
-from django.http import HttpRequest
-from django.shortcuts import redirect, render
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import redirect
 from django.urls import reverse
-from tecnicas.forms import SesionTagsForm, EtiquetaForm
-from tecnicas.models import TipoEscala
+from tecnicas.controllers import PanelTagsController
 
 
 def configurationPanelTags(req: HttpRequest):
-    basic_data = req.session.get("form_basic", {})
-
+    basic_data = req.session.get("form_basic")
     if not basic_data:
         return redirect(reverse('cata_system:panel_configuracion_basic'))
 
-    type_scale = TipoEscala.objects.get(pk=basic_data["tipo_escala"])
-    tamano_escala = basic_data["tamano_escala"]
-    form_new_etiqueta = EtiquetaForm()
-
     if req.method == "GET":
-        form_etiqutas = SesionTagsForm(
-            longitud=tamano_escala, tipo_escala=type_scale.nombre_escala)
-
-        context_tags = {
-            "form_tags": form_etiqutas,
-            "form_new_tag": form_new_etiqueta
-        }
+        if basic_data["name_tecnica"] == "escalas":
+            response = PanelTagsController.controllGetConvencional(
+                request=req, data=basic_data)
+        else:
+            response = redirect(
+                reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida")
 
-        return render(req, "tecnicas/create_sesion/configuracion-panel-tags.html", context_tags)
+        return response
     elif req.method == "POST":
-        values = {}
-        form = SesionTagsForm(req.POST, longitud=tamano_escala,
-                              tipo_escala=type_scale.nombre_escala)
-
-        context_tags = {
-            "form_tags": form,
-            "form_new_tag": form_new_etiqueta
-        }
-
-        if form.is_valid():
-            for name, value in form.cleaned_data.items():
-                values[name] = value.id
-
-            req.session["form_tags"] = values
-            return redirect(reverse("cata_system:panel_configuracion_codes"))
-        else:
-            context_tags["error"] = "ha ocurrido un error"
-            return render(req, "tecnicas/create_sesion/configuracion-panel-tags.html", context_tags)
+        response = PanelTagsController.controllPostConvencional(
+            request=req, data=basic_data)
+        return response
+    else:
+        return JsonResponse({"message": "Método no permitido"})

tecnicas/views/sessions_config/seleccion_tecnica.py

@@ -1,7 +1,6 @@
 from django.shortcuts import render
 from django.http import HttpRequest
-
-from ...controllers  import TecnicaController
+from tecnicas.controllers  import TecnicaController
 
 def selecionTecnica(req:HttpRequest):
     tipos = TecnicaController.getTypesTechnique()