Redefinicion de forms con estilo palabras, creacion de sesion con napping

tecnicas/controllers/__init__.py

@@ -22,6 +22,7 @@ from .views_controller.create_session.panels_create.panel_create_rata_controller
 from .views_controller.create_session.panels_create.panel_create_cata_controller import PanelCreateCataController
 from .views_controller.create_session.panels_create.panel_create_pf_controller import PanelCreatePFController
 from .views_controller.create_session.panels_create.panel_create_sort_controller import PanelCreateSortController
+from .views_controller.create_session.panels_create.panel_create_napping_controller import PanelCreateNappingController
 
 
 from .views_controller.session_management.details.details_controller import DetallesController

tecnicas/controllers/models_controller/tecnica_controller.py

@@ -16,7 +16,7 @@ class TecnicaController():
     def setTechniqueFromBasicData(self, basic):
         self.technique = Tecnica(
             tipo_tecnica=TipoTecnica.objects.get(nombre_tecnica=basic["name_tecnica"]),
-            id_estilo=EstiloPalabra.objects.get(id=basic["estilo_palabras"]),
+            id_estilo=EstiloPalabra.objects.get(nombre_estilo=basic["estilo_palabras"]),
             repeticiones_max=basic["numero_repeticiones"] or 1,
             limite_catadores=basic["numero_catadores"],
             instrucciones=basic["instrucciones"] or "Espere instrucciones del Presentador",

tecnicas/controllers/views_controller/create_session/panel_basic_controller.py

@@ -1,4 +1,4 @@
-from tecnicas.forms import SesionBasicForm, SesionBasicCATAForm, SesionBasicPFForm, SesionBasicSortForm
+from tecnicas.forms import SesionBasicForm, SesionBasicCATAForm, SesionBasicPFForm, SesionBasicSortForm, SesionBasicNappingForm
 from django.http import HttpRequest
 from django.shortcuts import redirect, render
 from django.urls import reverse
@@ -14,6 +14,7 @@ class PanelBasicController():
     url_panel_basic_cata = "tecnicas/create_sesion/panel-basic-cata.html"
     url_panel_basic_pf = "tecnicas/create_sesion/panel-basic-pf.html"
     url_panel_basic_sort = "tecnicas/create_sesion/panel-basic-sort.html"
+    url_panel_basic_napping = "tecnicas/create_sesion/panel-basic-napping.html"
 
     url_next_panel_tags = "cata_system:panel_configuracion_tags"
     url_next_panel_codes = "cata_system:panel_configuracion_codes"
@@ -44,7 +45,7 @@ class PanelBasicController():
             if form.is_valid():
                 values = {}
                 for name, value in form.cleaned_data.items():
-                    if name == "estilo_palabras" or name == "tipo_escala":
+                    if name == "tipo_escala":
                         values[name] = value.id
                     else:
                         values[name] = value
@@ -85,7 +86,7 @@ class PanelBasicController():
             if form.is_valid():
                 values = {}
                 for name, value in form.cleaned_data.items():
-                    if name == "estilo_palabras" or name == "tipo_escala":
+                    if name == "tipo_escala":
                         values[name] = value.id
                     else:
                         values[name] = value
@@ -133,10 +134,7 @@ class PanelBasicController():
         if form.is_valid():
             values = {}
             for name, value in form.cleaned_data.items():
-                if name == "estilo_palabras":
-                    values[name] = value.id
-                else:
-                    values[name] = value
+                values[name] = value
 
             values["name_tecnica"] = name_tecnica
             request.session['form_basic'] = values
@@ -208,4 +206,35 @@ class PanelBasicController():
             response = render(request, PanelBasicController.url_panel_basic_sort, {
                 "form_sesion": form, "error": "Información no valida"})
 
-        return response
+        return response
+
+    @staticmethod
+    def controllGetNapping(request: HttpRequest):
+        form_sesion = SesionBasicNappingForm()
+
+        view_context = {
+            "form_sesion": form_sesion,
+            "use_technique": "napping"
+        }
+
+        return render(
+            request, PanelBasicController.url_panel_basic_napping, view_context)
+
+    @staticmethod
+    def controllPostNapping(request: HttpRequest, name_tecnica: str):
+        form = SesionBasicNappingForm(request.POST)
+
+        if form.is_valid():
+            values = {}
+            for name, value in form.cleaned_data.items():
+                values[name] = value
+
+            values["name_tecnica"] = name_tecnica
+            request.session['form_basic'] = values
+            response = redirect(
+                reverse(PanelBasicController.url_next_panel_codes))
+        else:
+            response = render(request, PanelBasicController.url_panel_basic_napping, {
+                "form_sesion": form, "error": "Información no valida"})
+
+        return response

tecnicas/controllers/views_controller/create_session/panel_codes_controller.py

@@ -66,7 +66,7 @@ class PanelCodesController():
         return render(request, PanelCodesController.url_current_panel, context_codes_form)
 
     @staticmethod
-    def controllGetRATA(request: HttpRequest, data, name_technique: str):
+    def controllGetWithoutOrders(request: HttpRequest, data, name_technique: str):
         num_products = data["numero_productos"]
         codes_products = generarCodigos(num_products)
         form_codes = CodesForm(codes=codes_products)
@@ -80,7 +80,7 @@ class PanelCodesController():
         return render(request, PanelCodesController.url_current_panel, context_codes_form)
 
     @staticmethod
-    def controllPostRATA(request: HttpRequest, is_rata=True):
+    def controllPostWithWords(request: HttpRequest, name_technique: str):
         codes = []
         context_codes_form = {}
 
@@ -92,7 +92,7 @@ class PanelCodesController():
 
         context_codes_form = {
             "form_codes": form_codes,
-            "use_technique": "rata" if is_rata else "cata"
+            "use_technique": name_technique
         }
 
         if form_codes.is_valid():
@@ -117,31 +117,7 @@ class PanelCodesController():
         return render(request, PanelCodesController.url_current_panel, context_codes_form)
 
     @staticmethod
-    def controllPostPF(request: HttpRequest):
-        codes = []
-        context_codes_form = {}
-
-        for name, value in request.POST.items():
-            if name.__contains__("producto_"):
-                codes.append(value)
-
-        form_codes = CodesForm(request.POST, codes=codes)
-
-        context_codes_form = {
-            "form_codes": form_codes,
-            "use_technique": "perfil flash"
-        }
-
-        if form_codes.is_valid():
-            request.session["form_codes"] = codes
-            return redirect(reverse(PanelCodesController.url_create_session))
-        else:
-            context_codes_form["error"] = "error en los datos recibidos"
-
-        return render(request, PanelCodesController.url_current_panel, context_codes_form)
-
-    @staticmethod
-    def controllPostSort(request: HttpRequest):
+    def controllPostWithoutOrdersWords(request: HttpRequest, name_technique: str):
         codes = []
         context_codes_form = {}
 
@@ -153,7 +129,7 @@ class PanelCodesController():
 
         context_codes_form = {
             "form_codes": form_codes,
-            "use_technique": "sort"
+            "use_technique": name_technique
         }
 
         if form_codes.is_valid():

tecnicas/controllers/views_controller/create_session/panels_create/panel_create_cata_controller.py

@@ -30,7 +30,7 @@ class PanelCreateCataController(PanelCreateController):
                         tipo_tecnica=TipoTecnica.objects.get(
                             nombre_tecnica=data_basic["name_tecnica"]),
                         id_estilo=EstiloPalabra.objects.get(
-                            id=data_basic["estilo_palabras"]),
+                            nombre_estilo=data_basic["estilo_palabras"]),
                         repeticiones_max=data_basic["numero_repeticiones"] or 1,
                         limite_catadores=data_basic["numero_catadores"],
                         instrucciones=data_basic["instrucciones"] or "Espere instrucciones del Presentador",

tecnicas/controllers/views_controller/create_session/panels_create/panel_create_napping_controller.py

@@ -0,0 +1,95 @@
+from .panel_create_controller import PanelCreateController
+from django.http import HttpRequest, JsonResponse
+from tecnicas.models import Tecnica, TipoTecnica, EstiloPalabra, Producto, SesionSensorial
+from django.db import transaction
+from tecnicas.utils import deleteDataSession
+
+
+class PanelCreateNappingController(PanelCreateController):
+    def __init__(self):
+        super().__init__()
+
+    @staticmethod
+    def controllPost(request: HttpRequest):
+        if request.POST.get('action') == 'create_session':
+            if not request.session.get("form_basic") or not request.session.get("form_codes"):
+                deleteDataSession(request)
+                return general_error("No se ha especificado información necesaria para la creación de la sesión, por favor, vuelve a intentarlo")
+            try:
+                with transaction.atomic():
+                    # //////////////////////////// #
+                    #
+                    # First step: Create technique #
+                    #
+                    # //////////////////////////// #
+                    data_basic = request.session["form_basic"]
+                    data_basic["numero_catadores"] = data_basic["numero_catadores"] or 2
+                    data_basic["numero_repeticiones"] = 0
+
+                    technique = Tecnica.objects.create(
+                        tipo_tecnica=TipoTecnica.objects.get(
+                            nombre_tecnica=data_basic["name_tecnica"]),
+                        id_estilo=EstiloPalabra.objects.get(
+                            nombre_estilo="napping"),
+                        repeticiones_max=data_basic["numero_repeticiones"],
+                        limite_catadores=data_basic["numero_catadores"],
+                        instrucciones=data_basic["instrucciones"] or "Espere instrucciones del Presentador",
+                    )
+
+                    if not technique:
+                        raise ValueError("Error al guardar la técnica")
+
+                    # ////////////////////////////////////////////// #
+                    #
+                    # Second step: Create productos with their codes #
+                    #
+                    # ////////////////////////////////////////////// #
+                    codes = request.session["form_codes"]
+
+                    if not codes:
+                        raise ValueError("No hay códigos de productos")
+
+                    products_without_save = []
+                    for code in codes:
+                        product = Producto(
+                            codigoProducto=code,
+                            id_tecnica=technique
+                        )
+                        products_without_save.append(product)
+
+                    Producto.objects.bulk_create(products_without_save)
+
+                    # /////////////////////////////////////////////////////// #
+                    #
+                    # Third step: Create session and relat with the technique #
+                    #
+                    # /////////////////////////////////////////////////////// #
+                    session = SesionSensorial.objects.create(
+                        nombre_sesion=data_basic["nombre_sesion"] if data_basic["nombre_sesion"] != "" else None,
+                        tecnica=technique,
+                        creadoPor=request.user.user_presentador
+                    )
+
+                    if not session:
+                        raise ValueError("Error al crear sesion sensorial")
+
+                    context = {
+                        "message": "sesión creada",
+                        "data": {
+                            "codigo_sesion": session.codigo_sesion,
+                            "nombre_sesion": session.nombre_sesion
+                        }
+                    }
+
+                    # ////////////////////////////////// #
+                    #
+                    # Final step: Delete date en session #
+                    #
+                    # ////////////////////////////////// #
+                    deleteDataSession(request)
+                    return JsonResponse(context)
+
+            except ValueError as e:
+                return general_error(f"Error: {e}")
+        else:
+            return general_error("No se ha establecido acción")

tecnicas/controllers/views_controller/create_session/panels_create/panel_create_pf_controller.py

@@ -29,7 +29,7 @@ class PanelCreatePFController(PanelCreateController):
                         tipo_tecnica=TipoTecnica.objects.get(
                             nombre_tecnica=data_basic["name_tecnica"]),
                         id_estilo=EstiloPalabra.objects.get(
-                            nombre_estilo="vocabulario"),
+                            nombre_estilo="perfil flash"),
                         repeticiones_max=data_basic["numero_repeticiones"] +
                         phases_before_reptition,
                         limite_catadores=data_basic["numero_catadores"],

tecnicas/controllers/views_controller/create_session/panels_create/panel_create_rata_controller.py

@@ -31,7 +31,7 @@ class PanelCreateRataController(PanelCreateController):
                         tipo_tecnica=TipoTecnica.objects.get(
                             nombre_tecnica=data_basic["name_tecnica"]),
                         id_estilo=EstiloPalabra.objects.get(
-                            id=data_basic["estilo_palabras"]),
+                            nombre_estilo=data_basic["estilo_palabras"]),
                         repeticiones_max=data_basic["numero_repeticiones"] or 1,
                         limite_catadores=data_basic["numero_catadores"],
                         instrucciones=data_basic["instrucciones"] or "Espere instrucciones del Presentador",

tecnicas/controllers/views_controller/create_session/panels_create/panel_create_sort_controller.py

@@ -30,7 +30,7 @@ class PanelCreateSortController(PanelCreateController):
                         tipo_tecnica=TipoTecnica.objects.get(
                             nombre_tecnica=data_basic["name_tecnica"]),
                         id_estilo=EstiloPalabra.objects.get(
-                            nombre_estilo="vocabulario"),
+                            nombre_estilo="sort"),
                         repeticiones_max=data_basic["numero_repeticiones"],
                         limite_catadores=data_basic["numero_catadores"],
                         instrucciones=data_basic["instrucciones"] or "Espere instrucciones del Presentador",

tecnicas/forms/__init__.py

@@ -3,6 +3,7 @@ from .create_session.sesiob_basic_cata_form import SesionBasicCATAForm
 from .create_session.sesion_basic_pf_form import SesionBasicPFForm
 from .create_session.sesion_tags_form import SesionTagsForm
 from .create_session.sesion_basic_sort_form import SesionBasicSortForm
+from .create_session.sesion_basic_napping import SesionBasicNappingForm
 
 from .etiqueta_form import EtiquetaForm
 from .codes_form import CodesForm

tecnicas/forms/create_session/sesiob_basic_cata_form.py

@@ -22,6 +22,11 @@ class SesionBasicCATAForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields['estilo_palabras'] = forms.ModelChoiceField(queryset=EstiloPalabra.objects.all(), widget=forms.RadioSelect(attrs={
+        options = [
+            ("atributos", "atributos"),
+            ("vocabulario", "vocabulario")
+        ]
+
+        self.fields['estilo_palabras'] = forms.ChoiceField(choices=options, widget=forms.RadioSelect(attrs={
             "class": "uppercase text-lg tracking-wider font-medium p-2 px-4 active:px-5 transition-all rounded-xl bg-blue-500 text-white",
-        }), required=True, initial=EstiloPalabra.objects.first())
+        }), required=True, initial=options[0])

tecnicas/forms/create_session/sesion_basic_form.py

@@ -38,9 +38,14 @@ class SesionBasicForm(forms.Form):
         if initial_conf is None:
             initial_conf = {}
 
-        self.fields['estilo_palabras'] = forms.ModelChoiceField(queryset=EstiloPalabra.objects.all(), widget=forms.RadioSelect(attrs={
+        options = [
+            ("atributos", "atributos"),
+            ("vocabulario", "vocabulario")
+        ]
+
+        self.fields['estilo_palabras'] = forms.ChoiceField(choices=options, widget=forms.RadioSelect(attrs={
             "class": "uppercase text-lg tracking-wider font-medium p-2 px-4 active:px-5 transition-all rounded-xl bg-blue-500 text-white",
-        }), required=True, initial=EstiloPalabra.objects.first())
+        }), required=True, initial=options[0])
 
         self.fields['tipo_escala'] = forms.ModelChoiceField(queryset=TipoEscala.objects.all(), widget=forms.RadioSelect(attrs={
             "class": "uppercase text-lg tracking-wider font-medium p-2 px-4 active:px-5 transition-all rounded-xl bg-blue-500 text-white",

tecnicas/forms/create_session/sesion_basic_napping.py

@@ -0,0 +1,24 @@
+from django import forms
+
+
+class SesionBasicNappingForm(forms.Form):
+    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",
+        "placeholder": "Ej. Mermelada de mango picante"
+    }), required=False)
+
+    numero_productos = forms.IntegerField(widget=forms.NumberInput(attrs={
+        "class": "bg-surface-ligt p-1 border-b-1 text-center w-full",
+        "placeholder": "Solo números"
+    }), required=True)
+
+    numero_catadores = forms.IntegerField(widget=forms.NumberInput(attrs={
+        "class": "bg-surface-ligt p-1 border-b-1 text-center w-full",
+        "placeholder": "Solo números"
+    }), required=True)
+
+    instrucciones = forms.CharField(max_length=255, widget=forms.TextInput(attrs={
+        "class": "bg-surface-ligt border-b-1 text-center w-full p-1",
+        "placeholder": "Este campo es opcional"
+    }), required=False)

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

@@ -0,0 +1,71 @@
+{% extends 'tecnicas/layouts/base.html' %}
+{% load static %}
+
+{% block title %}Panel Configuracion{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content text-black">
+        <h1 class="text-center font-bold text-4xl">Panel de configuración</h1>
+
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% endif %}
+        {% if message %}
+        {% include "../components/error-message.html" with message=message %}
+        {% endif %}
+
+        <form method="post" action="" class="space-y-4">
+            {% csrf_token %}
+            <article>
+                <h2 class="text-2xl mb-2 font-bold">Información Basica</h2>
+                <section class="flex justify-center items-center">
+                    <label for="{{form_sesion.nombre_sesion.id_for_label}}"
+                        class="text-lg flex flex-col items-center px-2 w-full font-medium tracking-wide mb-4">
+                        <p class="tracking-normal text-xl font-bold">Nombre del proyecto:</p>
+                        {{ form_sesion.nombre_sesion }}
+                    </label>
+                </section>
+                <section class="flex flex-row flex-wrap justify-center gap-4">
+                    <label for="{{ form_sesion.numero_productos.id_for_label }}"
+                        class="text-lg flex flex-col items-center px-2 font-medium tracking-wide">
+                        <p class="tracking-normal text-base font-bold">
+                            Número de Productos:
+                        </p>
+                        {{ form_sesion.numero_productos }}
+                    </label>
+                    <label for="{{ form_sesion.numero_catadores.id_for_label }}"
+                        class="text-lg flex flex-col items-center px-2 font-medium tracking-wide">
+                        <p class="tracking-normal text-base font-bold">
+                            Número de Catadores:
+                        </p>
+                        {{ form_sesion.numero_catadores }}
+                    </label>
+                </section>
+                <section class="flex justify-center items-center mt-2">
+                    <label for="{{form_sesion.instrucciones.id_for_label}}"
+                        class="text-lg flex flex-col items-center px-2 w-full font-medium tracking-wide mb-4">
+                        <p class="tracking-normal text-base font-bold">Instrucciones para la sesión:</p>
+                        {{ form_sesion.instrucciones }}
+                    </label>
+                </section>
+            </article>
+
+            <article class="w-full flex max-sm:flex-col flex-wrap items-center justify-center gap-4">
+                <button type="submit" class="cts-btn-general cts-btn-primary btn-push flex-1/4 w-full">
+                    Continuar
+                </button>
+                <a href="{% url 'cata_system:seleccion_tecnica' %}" class="flex-1/4 w-full">
+                    <button type="button" class="cts-btn-general cts-btn-error btn-push w-full">
+                        Cancelar la creación
+                    </button>
+                </a>
+            </article>
+        </form>
+    </article>
+</article>
+{% endblock %}
+
+{% block extra_js %}
+<script src="{% static 'js/panel-basic.js' %}"></script>
+{% endblock %}

tecnicas/views/sessions_config/configuration_panel_basic.py

@@ -21,6 +21,8 @@ def configurationPanelBasic(req: HttpRequest):
             response = PanelBasicController.controllGetPF(request=req)
         elif name_tecnica == "sort":
             response = PanelBasicController.controllGetSort(request=req)
+        elif name_tecnica == "napping":
+            response = PanelBasicController.controllGetNapping(request=req)
         else:
             response = redirect(
                 reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida o sin implementar")
@@ -44,6 +46,9 @@ def configurationPanelBasic(req: HttpRequest):
         elif name_tecnica == "sort":
             response = PanelBasicController.controllPostSort(
                 request=req, name_tecnica=name_tecnica)
+        elif name_tecnica == "napping":
+            response = PanelBasicController.controllPostNapping(
+                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")

tecnicas/views/sessions_config/configuration_panel_codes.py

@@ -18,8 +18,8 @@ def configurationPanelCodes(req: HttpRequest):
         if name_technique == "escalas":
             response = PanelCodesController.controllGetEscalas(
                 req, data_basic)
-        elif name_technique == "rata" or name_technique == "cata" or name_technique == "perfil flash" or name_technique == "sort":
-            response = PanelCodesController.controllGetRATA(
+        elif name_technique in ["rata", "cata", "perfil flash", "sort", "napping"]:
+            response = PanelCodesController.controllGetWithoutOrders(
                 request=req, data=data_basic, name_technique=name_technique)
         else:
             response = redirect(
@@ -30,17 +30,12 @@ def configurationPanelCodes(req: HttpRequest):
         if name_technique == "escalas":
             response = PanelCodesController.controllPostEscalas(
                 req, data_basic)
-        elif name_technique == "rata":
-            response = PanelCodesController.controllPostRATA(request=req)
-        elif name_technique == "cata":
-            response = PanelCodesController.controllPostRATA(
-                request=req, is_rata=False)
-        elif name_technique == "perfil flash":
-            response = PanelCodesController.controllPostPF(
-                request=req)
-        elif name_technique == "sort":
-            response = PanelCodesController.controllPostSort(
-                request=req)
+        elif name_technique in ["rata", "cata"]:
+            response = PanelCodesController.controllPostWithWords(
+                request=req, name_technique=name_technique)
+        elif name_technique in ["perfil flash", "sort", "napping"]:
+            response = PanelCodesController.controllPostWithoutOrdersWords(
+                request=req, name_technique=name_technique)
         else:
             response = redirect(
                 reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida")

tecnicas/views/sessions_config/configuration_panel_words.py

@@ -14,12 +14,10 @@ def configurationPanelWords(req: HttpRequest):
 
     basic_data = req.session["form_basic"]
     name_technique = basic_data["name_tecnica"]
-    style_words = EstiloPalabra.objects.get(
-        id=basic_data["estilo_palabras"]).nombre_estilo
+    style_words = basic_data["estilo_palabras"]
 
     if req.method == "GET":
         if name_technique == "escalas" or name_technique == "rata" or name_technique == "cata":
-            print()
             if style_words == "atributos":
                 response = PanelWordsController.controllGetEscalasAtributes(
                     req)

tecnicas/views/sessions_config/create_session.py

@@ -1,7 +1,7 @@
 from django.http import HttpRequest, JsonResponse
 from django.shortcuts import render, redirect
 from django.urls import reverse
-from tecnicas.controllers import PanelCreateEscalasController, PanelCreateRataController, PanelCreateCataController, PanelCreatePFController, PanelCreateSortController
+from tecnicas.controllers import PanelCreateEscalasController, PanelCreateRataController, PanelCreateCataController, PanelCreatePFController, PanelCreateSortController, PanelCreateNappingController
 from tecnicas.utils import deleteDataSession
 
 
@@ -25,6 +25,8 @@ def createSession(req: HttpRequest):
             response = PanelCreatePFController.controllGet(req)
         elif name_technique == "sort":
             response = PanelCreateSortController.controllGet(req)
+        elif name_technique == "napping":
+            response = PanelCreateNappingController.controllGet(req)
         else:
             response = redirect(
                 reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida")
@@ -41,6 +43,8 @@ def createSession(req: HttpRequest):
             response = PanelCreatePFController.controllPost(req)
         elif name_technique == "sort":
             response = PanelCreateSortController.controllPost(req)
+        elif name_technique == "napping":
+            response = PanelCreateNappingController.controllPost(req)
         else:
             response = redirect(
                 reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida")