Se agregan nuevos modelos y se actualizan otros

.gitignore

@@ -166,7 +166,7 @@ dmypy.json
 cython_debug/
 
 # Others files
-chu.py
+some_test
 
 # PyCharm
 #  JetBrains specific template is maintained in a separate JetBrains.gitignore that can

tecnicas/migrations/0003_initial.py

@@ -0,0 +1,221 @@
+# Generated by Django 5.2.1 on 2025-07-15 16:58
+
+import django.db.models.deletion
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('tecnicas', '0002_remove_listapalabra_id_atributos_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Catador',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('usuarioCatador', models.CharField(max_length=255, unique=True)),
+                ('nombre', models.CharField(max_length=255)),
+                ('apellido', models.CharField(max_length=255)),
+                ('telefono', models.BigIntegerField()),
+                ('correo', models.EmailField(max_length=254)),
+                ('fechaNacimiento', models.DateField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CategoriaTecnica',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nombre_categoria', models.CharField(max_length=255, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='EstiloPalabra',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nombre_estilo', models.CharField(max_length=255, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Etiqueta',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('valor_etiqueta', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Palabra',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nombre_palabra', models.CharField(max_length=255, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Presentador',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nombre', models.CharField(max_length=255)),
+                ('apellido', models.CharField(max_length=255)),
+                ('nombre_usuario', models.CharField(max_length=255)),
+                ('contrasena', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Producto',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('codigoProducto', models.CharField(max_length=3)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TipoEscala',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nombre_escala', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Calificacion',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('num_repeticion', models.IntegerField(max_length=3)),
+                ('id_catador', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='calificacion_catador', to='tecnicas.catador')),
+                ('id_producto', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='calificacion_producto', to='tecnicas.producto')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Escala',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('longitud', models.IntegerField(max_length=3)),
+                ('etiquetas', models.ManyToManyField(to='tecnicas.etiqueta')),
+                ('id_tipo_escala', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='escala_tipo_escala', to='tecnicas.tipoescala')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Orden',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id_catador', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orden_catador', to='tecnicas.catador')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Dato',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id_calificacion', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='dato_calificacion', to='tecnicas.calificacion')),
+                ('id_palabra', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='dato_palabra', to='tecnicas.palabra')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Posicion',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('posicion', models.IntegerField(max_length=2)),
+                ('id_orden', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='posicion_orden', to='tecnicas.orden')),
+                ('id_producto', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='posicion_producto', to='tecnicas.producto')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Tecnica',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('repeticiones_max', models.IntegerField(default=0)),
+                ('repecion', models.IntegerField(default=0)),
+                ('limite_catadores', models.IntegerField()),
+                ('instrucciones', models.CharField(max_length=255)),
+                ('id_estilo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='estilo_tecnica', to='tecnicas.estilopalabra')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SesionSensorial',
+            fields=[
+                ('codigo_sesion', models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False)),
+                ('nombre_sesion', models.CharField(max_length=255, null=True)),
+                ('fechaCreacion', models.DateTimeField(verbose_name='date published')),
+                ('activo', models.BooleanField(default=False)),
+                ('creadoPor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='presentador_sesion', to='tecnicas.presentador')),
+                ('tecnica', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sesion_tecnica', to='tecnicas.tecnica')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='EsAtributo',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('palabras', models.ManyToManyField(related_name='estilo_atributo_palabras', to='tecnicas.palabra')),
+                ('id_tecnica', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_esatributo', to='tecnicas.tecnica')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TecnicaIntensidad',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id_escala', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='escala_intensidad', to='tecnicas.escala')),
+                ('id_tecnica', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_intensidad', to='tecnicas.tecnica')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='producto',
+            name='id_intensidad',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='producto_tecnica_intensidad', to='tecnicas.tecnicaintensidad'),
+        ),
+        migrations.AddField(
+            model_name='orden',
+            name='id_intensidad',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orden_tecnica_intensidad', to='tecnicas.tecnicaintensidad'),
+        ),
+        migrations.AddField(
+            model_name='calificacion',
+            name='id_intensidad',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='calificacion_tec_intensidad', to='tecnicas.tecnicaintensidad'),
+        ),
+        migrations.CreateModel(
+            name='TipoTecnica',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nombre_tecnica', models.CharField(max_length=255)),
+                ('id_categoria_tecnica', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tipo_tecnica_categoria_tecnica', to='tecnicas.categoriatecnica')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='tecnica',
+            name='tipo_tecnica',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_tipo_tecnica', to='tecnicas.tipotecnica'),
+        ),
+        migrations.CreateModel(
+            name='ValorBooleano',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('valor', models.BooleanField()),
+                ('id_dato', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='dato_boolean', to='tecnicas.dato')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ValorDecimal',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('valor', models.FloatField()),
+                ('id_dato', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='dato_decimal', to='tecnicas.dato')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Vocabulario',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nomre_vocabulario', models.CharField(max_length=255, unique=True)),
+                ('palabras', models.ManyToManyField(related_name='vovabulario_palabras', to='tecnicas.palabra')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='EsVocabulario',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id_tecnica', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_esvacabulario', to='tecnicas.tecnica')),
+                ('id_vocabulario', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vocabulario_esvocabulario', to='tecnicas.vocabulario')),
+            ],
+        ),
+    ]

tecnicas/models/__init__.py

@@ -1,15 +1,28 @@
-# from .presentador import Presentador
-# from .palabra import Palabra
-# from .vocabulario import Vocabulario
-# from .estilo_palabra import EstiloPalabra
-# from .es_atributo import EsAtributo
-# from .lista_palabra import ListaPalabra
-# from .es_vocabulario import EsVocabulario
-# from .tipo_tecnica import TipoTecnica
-# from .tecnica import Tecnica
-# from .sesion_sensorial import SesionSensorial
-
-# from .producto import Producto
-# from .etiqueta import Etiqueta
-# from .tipo_escala import TipoEscala
-# from .escala import Escala
+from .categoria_tecnica import CategoriaTecnica
+from .etiqueta import Etiqueta
+from .tipo_escala import TipoEscala
+from .tipo_tecnica import TipoTecnica
+from .estilo_palabra import EstiloPalabra
+
+from .presentador import Presentador
+from .catador import Catador
+
+from .palabra import Palabra
+from .vocabulario import Vocabulario
+
+from .tecnica import Tecnica
+from .es_vocabulario import EsVocabulario
+from .es_atributo import EsAtributo
+from .sesion_sensorial import SesionSensorial
+
+from .escala import Escala
+from .tecnica_intensidad import TecnicaIntensidad
+from .producto import Producto
+
+from .calificacion import Calificacion
+from .dato import Dato
+from .dato_valor import ValorDecimal
+from .dato_valor import ValorBooleano
+
+from .orden import Orden
+from .orden import Posicion

tecnicas/models/calificacion.py

@@ -0,0 +1,11 @@
+from django.db import models
+
+from .producto import Producto
+from .tecnica_intensidad import TecnicaIntensidad
+from .catador import Catador
+
+class Calificacion(models.Model):
+    num_repeticion = models.IntegerField(max_length=3)
+    id_producto = models.ForeignKey(Producto, on_delete=models.CASCADE, related_name="calificacion_producto")
+    id_intensidad = models.ForeignKey(TecnicaIntensidad, on_delete=models.CASCADE, related_name="calificacion_tec_intensidad")
+    id_catador = models.ForeignKey(Catador, on_delete=models.CASCADE, related_name="calificacion_catador")

tecnicas/models/catador.py

@@ -1,8 +1,12 @@
 from django.db import models
 
-class Catador():
+class Catador(models.Model):
     usuarioCatador = models.CharField(max_length=255, unique=True)
     nombre = models.CharField(max_length=255)
     apellido = models.CharField(max_length=255)
     telefono = models.BigIntegerField()
-    correo = models.EmailField()
+    correo = models.EmailField()
+    fechaNacimiento = models.DateField()
+
+    def __str__(self):
+        return self.usuarioCatador

tecnicas/models/categoria_tecnica.py

@@ -0,0 +1,7 @@
+from django.db import models
+
+class CategoriaTecnica(models.Model):
+    nombre_categoria = models.CharField(max_length=255, unique=True)
+
+    def __str__(self):
+        return self.nombre_categoria

tecnicas/models/{lista_palabra.py → dato.py}

@@ -1,8 +1,8 @@
 from django.db import models
 
 from .palabra import Palabra
-from .es_atributo import EsAtributo
+from .calificacion import Calificacion
 
-class ListaPalabra(models.Model):
-    id_palabra = models.ForeignKey(Palabra, on_delete=models.CASCADE, related_name="palabra_listapalabras")
-    id_atributos = models.ForeignKey(EsAtributo, on_delete=models.CASCADE, related_name="atributo_listapalabras")
+class Dato(models.Model):
+    id_palabra = models.ForeignKey(Palabra, on_delete=models.CASCADE, related_name="dato_palabra")
+    id_calificacion = models.ForeignKey(Calificacion, on_delete=models.CASCADE, related_name="dato_calificacion")

tecnicas/models/dato_valor.py

@@ -0,0 +1,17 @@
+from django.db import models
+
+from .dato import Dato
+
+class ValorDecimal(models.Model):
+    id_dato = models.OneToOneField(Dato, on_delete=models.CASCADE, related_name="dato_decimal")
+    valor = models.FloatField()
+
+    def __str__(self):
+        return self.valor
+
+class ValorBooleano(models.Model):
+    id_dato = models.OneToOneField(Dato, on_delete=models.CASCADE, related_name="dato_boolean")
+    valor = models.BooleanField()
+
+    def __str__(self):
+        return self.valor

tecnicas/models/es_atributo.py

@@ -1,6 +1,8 @@
 from django.db import models
 
-from .estilo_palabra import EstiloPalabra
+from .tecnica import Tecnica
+from .palabra import Palabra
 
 class EsAtributo(models.Model):
-    id_estilo = models.ForeignKey(EstiloPalabra, on_delete=models.CASCADE, related_name="estilo_esatributo")
+    id_tecnica = models.OneToOneField(Tecnica, on_delete=models.CASCADE, related_name="tecnica_esatributo")
+    palabras = models.ManyToManyField(Palabra, related_name="estilo_atributo_palabras")

tecnicas/models/es_vocabulario.py

@@ -1,8 +1,8 @@
 from django.db import models
 
-from .estilo_palabra import EstiloPalabra
+from .tecnica import Tecnica
 from .vocabulario import Vocabulario
 
 class EsVocabulario(models.Model):
-    id_estilo = models.ForeignKey(EstiloPalabra, on_delete=models.CASCADE, related_name="estilo_esvacabulario")
+    id_tecnica = models.OneToOneField(Tecnica, on_delete=models.CASCADE, related_name="tecnica_esvacabulario")
     id_vocabulario = models.ForeignKey(Vocabulario, on_delete=models.CASCADE, related_name="vocabulario_esvocabulario")

tecnicas/models/escala.py

@@ -4,8 +4,8 @@ from .etiqueta import Etiqueta
 from .tipo_escala import TipoEscala
 
 class Escala(models.Model):
-    longitud = models.IntegerField()
-    id_tipo_escala = models.ForeignKey(TipoEscala)
+    id_tipo_escala = models.ForeignKey(TipoEscala, on_delete=models.CASCADE, related_name="escala_tipo_escala")
+    longitud = models.IntegerField(max_length=3)
     etiquetas = models.ManyToManyField(Etiqueta)
 
     def __str__(self):

tecnicas/models/orden.py

@@ -0,0 +1,14 @@
+from django.db import models
+
+from .tecnica_intensidad import TecnicaIntensidad
+from .catador import Catador
+from .producto import Producto
+
+class Orden(models.Model):
+    id_intensidad = models.ForeignKey(TecnicaIntensidad, on_delete=models.CASCADE, related_name="orden_tecnica_intensidad")
+    id_catador = models.ForeignKey(Catador, on_delete=models.CASCADE, related_name="orden_catador")
+
+class Posicion(models.Model):
+    id_producto = models.ForeignKey(Producto, on_delete=models.CASCADE, related_name="posicion_producto")
+    id_orden = models.ForeignKey(Orden, on_delete=models.CASCADE, related_name="posicion_orden")
+    posicion = models.IntegerField(max_length=2)

tecnicas/models/producto.py

@@ -1,10 +1,10 @@
 from django.db import models
 
-from .sesion_sensorial import SesionSensorial
+from .tecnica_intensidad import TecnicaIntensidad
 
 class Producto(models.Model):
     codigoProducto = models.CharField(max_length=3)
-    id_sesion = models.ForeignKey(SesionSensorial, on_delete=models.CASCADE, related_name="productos_sesion")
+    id_intensidad = models.ForeignKey(TecnicaIntensidad, on_delete=models.CASCADE, related_name="producto_tecnica_intensidad")
 
     def __str__(self):
         return self.codigoProducto

tecnicas/models/sesion_sensorial.py

@@ -1,10 +1,16 @@
+import shortuuid
 from django.db import models
 
 from .presentador import Presentador
 from .tecnica import Tecnica
 
 class SesionSensorial(models.Model):
+    codigo_sesion =  models.CharField(primary_key=True, default=shortuuid.uuid, editable=False, max_length=22)
+    nombre_sesion = models.CharField(max_length=255, null=True)
     fechaCreacion = models.DateTimeField("date published")
     activo = models.BooleanField(default=False)
     creadoPor = models.ForeignKey(Presentador, on_delete=models.CASCADE, related_name="presentador_sesion")
-    tecnica = models.ForeignKey(Tecnica, on_delete=models.CASCADE, related_name="sesion_tecnica")
+    tecnica = models.ForeignKey(Tecnica, on_delete=models.CASCADE, related_name="sesion_tecnica")
+
+    def __str__(self):
+        return self.codigo_sesion

tecnicas/models/tecnica.py

@@ -5,7 +5,7 @@ from .tipo_tecnica import TipoTecnica
 
 class Tecnica(models.Model):
     tipo_tecnica = models.ForeignKey(TipoTecnica, on_delete=models.CASCADE, related_name="tecnica_tipo_tecnica")
-    maximas_repeticiones = models.IntegerField(default=0)
+    repeticiones_max = models.IntegerField(default=0)
     repecion = models.IntegerField(default=0)
     limite_catadores = models.IntegerField()
     instrucciones = models.CharField(max_length=255)

tecnicas/models/tecnica_intensidad.py

@@ -1,6 +1,8 @@
 from django.db import models
 
 from .escala import Escala
+from .tecnica import Tecnica
 
 class TecnicaIntensidad(models.Model):
-    id_escala = models.ForeignKey(Escala)
+    id_tecnica = models.OneToOneField(Tecnica, on_delete=models.CASCADE, related_name="tecnica_intensidad")
+    id_escala = models.OneToOneField(Escala, on_delete=models.CASCADE, related_name="escala_intensidad")

tecnicas/models/tipo_escala.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-class TipoEscala():
+class TipoEscala(models.Model):
     nombre_escala = models.CharField(max_length=255)
 
     def __str__(self):

tecnicas/models/tipo_tecnica.py

@@ -1,7 +1,10 @@
 from django.db import models
 
+from .categoria_tecnica import CategoriaTecnica
+
 class TipoTecnica(models.Model):
     nombre_tecnica = models.CharField(max_length=255)
+    id_categoria_tecnica = models.ForeignKey(CategoriaTecnica, on_delete=models.CASCADE, related_name="tipo_tecnica_categoria_tecnica")
 
     def __str__(self):
         return self.nombre_tecnica

tecnicas/models/vocabulario.py

@@ -4,7 +4,7 @@ from .palabra import Palabra
 
 class Vocabulario(models.Model):
     nomre_vocabulario = models.CharField(max_length=255, unique=True)
-    palabras = models.ManyToManyField(Palabra)
+    palabras = models.ManyToManyField(Palabra, related_name="vovabulario_palabras")
 
     def __str__(self):
         return self.nomre_vocabulario