Paso de valores del form basic a form tags

tecnicas/forms/__init__.py

@@ -1 +1,2 @@
-from .conf_sesion_form_start import SesionFirtsForm
+from .sesion_basic import SesionBasicForm
+from .sesion_tags import SesionTagsForm

tecnicas/forms/{conf_sesion_form_start.py → sesion_basic.py}

@@ -1,36 +1,45 @@
 from django import forms
 
 from ..models import TipoEscala
+from ..models import TipoTecnica
+
+class SesionBasicForm(forms.Form):
+    id_tecnica = forms.IntegerField(widget=forms.HiddenInput())
 
-class SesionFirtsForm(forms.Form):
     nombre_sesion = forms.CharField(max_length=255, widget=forms.TextInput(attrs={
-        "class": "bg-gray-200 border-b-1 text-center w-full p-1",
-        "name": "nombre_sesion",
-        "placeholder": "Ej. Mermelada de mango picante"
-    }), required=False)
+            "class": "bg-gray-200 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-gray-200 p-1 border-b-1 text-center w-full",
-        "placeholder": "Solo números"
-    }), required=True)
+            "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
+            "placeholder": "Solo números"
+        }), required=True)
 
     numero_jueces = forms.IntegerField(widget=forms.NumberInput(attrs={
-        "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
-        "placeholder": "Solo números"
-    }), required=True)
-    
+            "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
+            "placeholder": "Solo números"
+        }), required=True)
+        
     numero_repeticiones = forms.IntegerField(widget=forms.NumberInput(attrs={
-        "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
-        "placeholder": "Solo números"
-    }), required=True)
+            "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
+            "placeholder": "Solo números"
+        }), required=True)
 
     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",
-    }), required=True, initial=TipoEscala.objects.first())
+            "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=TipoEscala.objects.first())
 
     tamano_escala = forms.IntegerField(widget=forms.NumberInput(attrs={
-        "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
-    }), required=True, min_value=5)
+            "class": "bg-gray-200 p-1 border-b-1 text-center w-full",
+        }), required=True, min_value=5)
+    
+    def __init__(self, *args, id_tecnica_new=0, **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        if id_tecnica_new != 0:
+            self.fields['id_tecnica'] = forms.IntegerField(initial=id_tecnica_new, widget=forms.HiddenInput())
 
     def clean(self):
         data_clean = super().clean()
@@ -44,6 +53,7 @@ class SesionFirtsForm(forms.Form):
             try:
                 escala = TipoEscala.objects.get(pk=escala)
             except (ValueError, TipoEscala.DoesNotExist):
+                print("Escala no valida")
                 self.add_error("tipo_escala", "Escala no valida")
                 return data_clean
 
@@ -53,5 +63,10 @@ class SesionFirtsForm(forms.Form):
             self.add_error("tamano_escala", "El tamaño de la escala no aplica")
         elif escala.nombre_escala == "continua" and not sizes_continua.__contains__(tamano_escala):
             self.add_error("tamano_escala", "El tamaño de la escala no aplica")
-        else:
-            self.add_error("tipo_escala", "Escala no valida")
+
+        id_tecnica = data_clean.get("id_tecnica")
+
+        try:
+            tecnica = TipoTecnica.objects.get(pk=id_tecnica)
+        except (ValueError, TipoTecnica.DoesNotExist):
+            return data_clean

tecnicas/forms/sesion_tags.py

@@ -0,0 +1,14 @@
+from django import forms
+from django.shortcuts import redirect
+from django.urls import reverse
+
+from ..models import Etiqueta
+
+class SesionTagsForm(forms.Form):
+    def __init__(self, *args, segmentos=None, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        for i in range(segmentos):
+            self.fields[f'segmento_{i}'] = forms.ModelChoiceField(queryset=Etiqueta.objects.all(), required=True,label=f"segmento {i+1}", empty_label="Selecione opcion", widget=forms.Select(attrs={
+                "class":"ct-select-op p-1 rounded bg-gray-200 [*]:capitalize"
+            }))

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

@@ -16,9 +16,17 @@
 <article class="w-full flex flex-col justify-center items-center bg-gray-600 my-10">
     <article class="flex flex-col gap-4 bg-gray-400 md:p-10 p-5 rounded-2xl lg:w-4xl w-full">
         <h1 class="text-center font-bold text-4xl">Panel de configuración</h1>
+        {% if error %}
+        <p class="text-sm bg-red-200 text-center">{{ error }}</p>
+        {% endif %}
         <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>
+
             <article>
                 <h2 class="text-2xl mb-2 font-bold">Información Basica</h2>
                 <section class="flex justify-center items-center">
@@ -70,7 +78,8 @@
                         {{ form_sesion.tamano_escala }}
                     </label>
                     {% if form_sesion.tamano_escala.errors %}
-                    <article class="w-fit rounded px-2 py-0.5 text-center text-white text-sm font-medium tracking-wide bg-red-500">
+                    <article
+                        class="w-fit rounded px-2 py-0.5 text-center text-white text-sm font-medium tracking-wide bg-red-500">
                         {{ form_sesion.tamano_escala.errors }}
                     </article>
                     {% endif %}
@@ -108,7 +117,7 @@
         labels = document.getElementsByClassName("ct-radio-escala")
         pSize = document.getElementsByClassName("ct-size-scale").item(0).getElementsByTagName("p")[0]
         iSize = document.getElementsByClassName("ct-size-scale").item(0).getElementsByTagName("input")[0]
-        
+
         pSize.textContent = descriptons["estructurada"][0]
         iSize.placeholder = descriptons["estructurada"][1]
 

tecnicas/templates/tecnicas/configuracion-panel-tags.html

@@ -11,15 +11,7 @@
 - Presentar un orden basico segun el numero de catadores y los productos, esta se le muestra el presentador
 -->
 
-{% block content %}
-<article class="w-full flex flex-col justify-center items-center bg-gray-600 my-10">
-    <article class="flex flex-col gap-4 bg-gray-400 md:p-10 p-5 rounded-2xl lg:w-4xl w-full">
-        <h1 class="text-center font-bold text-4xl">Panel de configuración</h1>
-        <hr>
-        <form method="post" action="" class="[&>article]:not-last:mb-4 [&>article]:not-first:pt-4 [&>article]:px-6">
-            {% csrf_token %}
-            <article class="bg-gray-500 p-4 flex flex-col gap-2">
-                <div class="flex flex-row justify-center items-center gap-5 text-lg">
+<!-- <div class="flex flex-row justify-center items-center gap-5 text-lg">
                     <p class="font-medium p-1 px-3 bg-gray-200">Segmento 1</p>
                     <label for="etiquta_1">
                         <select name="etiquta_1" class="p-1 rounded bg-gray-200 [*]:capitalize" id="etiquta_1" required>
@@ -31,59 +23,28 @@
                         </select>
                     </label>
                     <button type="button" class="p-1 rounded-lg bg-gray-200 active:bg-gray-400">➕</button>
-                </div>
-                <div class="flex flex-row justify-center items-center gap-5 text-lg">
-                    <p class="font-medium p-1 px-3 bg-gray-200">Segmento 2</p>
-                    <label for="etiquta_2">
-                        <select name="etiquta_2" class="p-1 rounded bg-gray-200 [*]:capitalize" id="etiquta_2" required>
-                            <option value="1">no se percibe</option>
-                            <option value="2" selected>poca percepcion</option>
-                            <option value="3">se percibe</option>
-                            <option value="4">percepcion intensa</option>
-                            <option value="5">percepcion muy intensa</option>
-                        </select>
-                    </label>
-                    <button type="button" class="p-1 rounded-lg bg-gray-200 active:bg-gray-400">➕</button>
-                </div>
-                <div class="flex flex-row justify-center items-center gap-5 text-lg">
-                    <p class="font-medium p-1 px-3 bg-gray-200">Segmento 3</p>
-                    <label for="etiquta_3">
-                        <select name="etiquta_3" class="p-1 rounded bg-gray-200 [*]:capitalize" id="etiquta_3" required>
-                            <option value="1">no se percibe</option>
-                            <option value="2">poca percepcion</option>
-                            <option value="3" selected>se percibe</option>
-                            <option value="4">percepcion intensa</option>
-                            <option value="5">percepcion muy intensa</option>
-                        </select>
-                    </label>
-                    <button type="button" class="p-1 rounded-lg bg-gray-200 active:bg-gray-400">➕</button>
-                </div>
-                <div class="flex flex-row justify-center items-center gap-5 text-lg">
-                    <p class="font-medium p-1 px-3 bg-gray-200">Segmento 4</p>
-                    <label for="etiquta_4">
-                        <select name="etiquta_4" class="p-1 rounded bg-gray-200 [*]:capitalize" id="etiquta_4" required>
-                            <option value="1">no se percibe</option>
-                            <option value="2">poca percepcion</option>
-                            <option value="3">se percibe</option>
-                            <option value="4" selected>percepcion intensa</option>
-                            <option value="5">percepcion muy intensa</option>
-                        </select>
-                    </label>
-                    <button type="button" class="p-1 rounded-lg bg-gray-200 active:bg-gray-400">➕</button>
-                </div>
+                </div> -->
+
+{% block content %}
+<article class="w-full flex flex-col justify-center items-center bg-gray-600 my-10">
+    <article class="flex flex-col gap-4 bg-gray-400 md:p-10 p-5 rounded-2xl lg:w-4xl w-full">
+        <h1 class="text-center font-bold text-4xl">Panel de configuración</h1>
+        <hr>
+        <form method="post" action="" class="[&>article]:not-last:mb-4 [&>article]:not-first:pt-4 [&>article]:px-6">
+            {% csrf_token %}
+            <article class="bg-gray-500 p-4 flex flex-col gap-2">
+                {% for field in form_tags %}
                 <div class="flex flex-row justify-center items-center gap-5 text-lg">
-                    <p class="font-medium p-1 px-3 bg-gray-200">Segmento 5</p>
-                    <label for="etiquta_5">
-                        <select name="etiquta_5" class="p-1 rounded bg-gray-200 [*]:capitalize" id="etiquta_5" required>
-                            <option value="1">no se percibe</option>
-                            <option value="2">poca percepcion</option>
-                            <option value="3">se percibe</option>
-                            <option value="4">percepcion intensa</option>
-                            <option value="5" selected>percepcion muy intensa</option>
-                        </select>
+                    <label for="{{ field.id_for_label }}" class="font-medium p-1 px-3 bg-gray-200 capitalize">
+                        {{ field.label }}
                     </label>
+                    {{ field }}
                     <button type="button" class="p-1 rounded-lg bg-gray-200 active:bg-gray-400">➕</button>
                 </div>
+                {% endfor %}
+            </article>
+            <article class="bg-gray-800/70 justify-center items-center">
+                <button class="p-2 bg-gray-400 w-fit" type="submit">Mandar</button>
             </article>
             <article class="absolute bg-gray-800/70 p-5 w-full h-full justify-center items-center hidden">
                 <section class="p-2 bg-gray-400 w-fit">
@@ -100,4 +61,21 @@
 {% endblock %}
 
 {% block extra_js %}
+<script>
+    const itemsSelects = document.getElementsByClassName("ct-select-op")
+    const options = itemsSelects.item(0).getElementsByTagName("option")
+    const values = []
+
+    for (let i = 0; i < options.length; i++) {
+        if (options.item(i).value) {
+            values.push(options.item(i).value)
+        }
+    }
+
+    values.sort()
+
+    for (let i = 0; i < itemsSelects.length; i++) {
+        itemsSelects.item(i).value = values[i]
+    }
+</script>
 {% endblock %}

tecnicas/views/configuration_panel_basic.py

@@ -1,16 +1,26 @@
 from django.shortcuts import render, redirect
 from django.http import HttpRequest
 from django.urls import reverse
-from ..forms import SesionFirtsForm
+from ..forms import SesionBasicForm
 from ..models import TipoTecnica
 
 def configuracionPanelBasic(req: HttpRequest):
     if req.method == "POST":
-        form = SesionFirtsForm(req.POST)
+        form = SesionBasicForm(req.POST)
+
         if form.is_valid():
-            return redirect("/cata")
-        else:
-            return render(req, "tecnicas/configuracion-panel-basic.html", { "form_sesion": form })
+            values = {}
+            
+            for name, value in form.cleaned_data.items():
+                if not name == "tipo_escala":
+                    values[name] = value
+                else:
+                    values[name] = value.id
+            
+            req.session['datos_formulario'] = values
+            return redirect(reverse("cata_system:panel_configuracion_tags"))
+
+        return render(req, "tecnicas/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"]
@@ -21,7 +31,7 @@ def configuracionPanelBasic(req: HttpRequest):
             return redirect(reverse("cata_system:seleccion_tecnica") + "?error=tecnica_no_establecida")
 
         if tecnica:
-            form_sesion = SesionFirtsForm()
+            form_sesion = SesionBasicForm(id_tecnica_new=id_tecnica)
             return render(req, "tecnicas/configuracion-panel-basic.html", { "form_sesion": form_sesion })
         else:
             return redirect(reverse("cata_system:seleccion_tecnica") + "?error=la_tecnica_no_existe")

tecnicas/views/configuration_panel_tags.py

@@ -1,5 +1,13 @@
 from django.http import HttpRequest
-from django.shortcuts import render
+from django.shortcuts import redirect, render
+from django.urls import reverse
+from ..forms import SesionTagsForm
 
 def configuracionPanelTags(req: HttpRequest):
-    return render(req, "tecnicas/configuracion-panel-tags.html")
+    # basic_data = req.session.get("basic_form", None)
+
+    # if basic_data is None:
+    #     return redirect(reverse('cata_system:panel_configuracion_basic'))
+
+    etiquetas = SesionTagsForm(segmentos=5)
+    return render(req, "tecnicas/configuracion-panel-tags.html", {"form_tags":etiquetas})