diff --git a/cosiap_api/dynamic_forms/migrations/0006_merge_migrations.py b/cosiap_api/dynamic_forms/migrations/0006_merge_migrations.py new file mode 100644 index 0000000000000000000000000000000000000000..f7664807d8c51b615b1776595ff639aa6b95af9b --- /dev/null +++ b/cosiap_api/dynamic_forms/migrations/0006_merge_migrations.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.7 on 2024-08-08 16:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dynamic_forms', '0005_set_null_ordenes'), + ] + + operations = [ + migrations.AlterField( + model_name='seccion', + name='tipo', + field=models.CharField(choices=[('unico', 'Único'), ('lista', 'Lista')], default='unico', max_length=20, verbose_name='Tipo de sección'), + ), + ] diff --git a/cosiap_api/entrypoint.sh b/cosiap_api/entrypoint.sh index 914602aab7bcc9dca8f29022e89a359e0b954ce5..b25058d09909fe96d9f07d4787af298b41f41396 100644 --- a/cosiap_api/entrypoint.sh +++ b/cosiap_api/entrypoint.sh @@ -18,7 +18,7 @@ done #Django commands >&2 echo "Ejecutando Migraciones" #python3 manage.py makemigrations --name -python3 manage.py migrate +#python3 manage.py migrate #python3 manage.py collectstatic --no-input cron diff --git a/cosiap_api/modalidades/migrations/0002_dynamic_form_modalidades.py b/cosiap_api/modalidades/migrations/0003_merge_migrations.py similarity index 57% rename from cosiap_api/modalidades/migrations/0002_dynamic_form_modalidades.py rename to cosiap_api/modalidades/migrations/0003_merge_migrations.py index a8fd08838fd23cc952a8694356dc85df578e10f2..6e82323f3fd78e324ea6ca5062d32c52b01f332e 100644 --- a/cosiap_api/modalidades/migrations/0002_dynamic_form_modalidades.py +++ b/cosiap_api/modalidades/migrations/0003_merge_migrations.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.7 on 2024-07-29 17:17 +# Generated by Django 5.0.7 on 2024-08-08 16:14 import django.db.models.deletion from django.db import migrations, models @@ -7,14 +7,14 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dynamic_forms', '0002_creacion_modelos_formularios_dinamicos_02'), - ('modalidades', '0001_creacion_inicial_modulos_dynamic_formats__modalidades__solicitudes'), + ('dynamic_forms', '0006_merge_migrations'), + ('modalidades', '0002_relacion_modalidad_dynamicForm'), ] operations = [ - migrations.AddField( + migrations.AlterField( model_name='modalidad', name='dynamic_form', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='dynamic_forms.dynamicform', verbose_name='Dynamic Form'), + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='dynamic_forms.dynamicform', verbose_name='Formulario'), ), ] diff --git a/cosiap_api/modalidades/models.py b/cosiap_api/modalidades/models.py index 0f85d785adacabb9a0d83d8ebcef9fd78d132d1f..9d10bd7eb055c2d181db6abd59dfb8cc8e09b06a 100644 --- a/cosiap_api/modalidades/models.py +++ b/cosiap_api/modalidades/models.py @@ -28,7 +28,7 @@ class Modalidad(models.Model): descripcion = models.TextField(verbose_name="Descripción", null=False) mostrar = models.BooleanField(default=True) archivado = models.BooleanField(default=False) - dynamic_form = models.ForeignKey('dynamic_forms.DynamicForm', on_delete=models.SET_NULL, verbose_name="Modalidad", null=True, blank=False) + dynamic_form = models.ForeignKey('dynamic_forms.DynamicForm', on_delete=models.SET_NULL, verbose_name="Formulario", null=True, blank=False) def __str__(self): return f'{self.nombre}'