Adiciona o modelo de instituição, relacionamentos com os diretórios, ajustes no modelos de usefulmodels e Django celery results como dependência

config/settings/base.py

@@ -106,6 +106,7 @@
     "wagtailmenus",
     "rest_framework",
     "widget_tweaks",
+    "django_celery_results",
 ]
 
 LOCAL_APPS = [
@@ -121,10 +122,7 @@
     "core",
     "usefulmodels",
     "location",
-<<<<<<< HEAD
-    "django_celery_results",
-=======
->>>>>>> 7c5856c646a1e46545e841cea751b9cb4bea254c
+    "institution",
 ]
 
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps

disclosure_directory/migrations/0003_auto_20220809_1204.py

@@ -0,0 +1,115 @@
+# Generated by Django 3.2.12 on 2022-08-09 12:04
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('wagtaildocs', '0012_uploadeddocument'),
+        ('disclosure_directory', '0002_auto_20220728_1606'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='disclosuredirectory',
+            options={'verbose_name_plural': 'Diretório de Eventos'},
+        ),
+        migrations.AlterModelOptions(
+            name='disclosuredirectoryfile',
+            options={'verbose_name_plural': 'Diretório de Eventos Upload'},
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Data de criação'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='creator',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='disclosuredirectory_creator', to=settings.AUTH_USER_MODEL, verbose_name='Criador'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='description',
+            field=models.TextField(blank=True, max_length=255, null=True, verbose_name='Descrição'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='end_date',
+            field=models.DateField(blank=True, max_length=255, null=True, verbose_name='Data de fim'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='end_time',
+            field=models.TimeField(blank=True, max_length=255, null=True, verbose_name='Hora final'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='event',
+            field=models.CharField(max_length=255, verbose_name='Evento'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='organization',
+            field=models.TextField(max_length=255, verbose_name='Organização'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='start_date',
+            field=models.DateField(blank=True, max_length=255, null=True, verbose_name='Data de início'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='start_time',
+            field=models.TimeField(blank=True, max_length=255, null=True, verbose_name='Hora inicial'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='updated',
+            field=models.DateTimeField(auto_now=True, verbose_name='Data da última atualização'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectory',
+            name='updated_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='disclosuredirectory_last_mod_user', to=settings.AUTH_USER_MODEL, verbose_name='Atualizador'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='attachment',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.document', verbose_name='Anexo'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Data de criação'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='creator',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='disclosuredirectoryfile_creator', to=settings.AUTH_USER_MODEL, verbose_name='Criador'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='is_valid',
+            field=models.BooleanField(blank=True, default=False, null=True, verbose_name='É válido'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='line_count',
+            field=models.IntegerField(blank=True, default=0, null=True, verbose_name='Número de linhas'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='updated',
+            field=models.DateTimeField(auto_now=True, verbose_name='Data da última atualização'),
+        ),
+        migrations.AlterField(
+            model_name='disclosuredirectoryfile',
+            name='updated_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='disclosuredirectoryfile_last_mod_user', to=settings.AUTH_USER_MODEL, verbose_name='Atualizador'),
+        ),
+    ]

disclosure_directory/migrations/0004_auto_20220815_1838.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.2.12 on 2022-08-15 18:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('institution', '0002_institution_institution_type'),
+        ('location', '0010_alter_location_options'),
+        ('disclosure_directory', '0003_auto_20220809_1204'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='disclosuredirectory',
+            name='institutions',
+            field=models.ManyToManyField(blank=True, to='institution.Institution'),
+        ),
+        migrations.AddField(
+            model_name='disclosuredirectory',
+            name='is_online',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='disclosuredirectory',
+            name='locations',
+            field=models.ManyToManyField(blank=True, to='location.Location'),
+        ),
+    ]

disclosure_directory/models.py

@@ -8,6 +8,8 @@
 from core.models import CommonControlField
 from .forms import DisclosureDirectoryForm, DisclosureDirectoryFileForm
 
+from location.models import Location
+from institution.models import Institution
 
 class DisclosureDirectory(CommonControlField):
     class Meta:
@@ -28,6 +30,12 @@ class Meta:
     end_time = models.TimeField(_("End Time"), max_length=255,
                                 null=True, blank=True)
 
+    locations = models.ManyToManyField(Location, blank=True)
+    institutions = models.ManyToManyField(Institution, blank=True)
+
+    is_online = models.BooleanField(default=False)
+
+
     panels = [
         FieldPanel('event'),
         FieldPanel('link'),
@@ -37,7 +45,9 @@ class Meta:
         FieldPanel('end_date'),
         FieldPanel('start_time'),
         FieldPanel('end_time'),
-
+        FieldPanel('locations'),
+        FieldPanel('institutions'),
+        FieldPanel('is_online'),
     ]
     base_form_class = DisclosureDirectoryForm
 

education_directory/migrations/0002_auto_20220809_1204.py

@@ -0,0 +1,110 @@
+# Generated by Django 3.2.12 on 2022-08-09 12:04
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('wagtaildocs', '0012_uploadeddocument'),
+        ('education_directory', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='educationdirectory',
+            options={'verbose_name_plural': 'Diretório de Educação'},
+        ),
+        migrations.AlterModelOptions(
+            name='educationdirectoryfile',
+            options={'verbose_name_plural': 'Diretório de Educação Upload'},
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Data de criação'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='creator',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='educationdirectory_creator', to=settings.AUTH_USER_MODEL, verbose_name='Criador'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='description',
+            field=models.TextField(blank=True, max_length=255, null=True, verbose_name='Descrição'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='end_date',
+            field=models.DateField(blank=True, max_length=255, null=True, verbose_name='Data de fim'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='end_time',
+            field=models.TimeField(blank=True, max_length=255, null=True, verbose_name='Hora final'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='institution',
+            field=models.TextField(max_length=255, verbose_name='Instituição'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='start_date',
+            field=models.DateField(blank=True, max_length=255, null=True, verbose_name='Data de início'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='start_time',
+            field=models.TimeField(blank=True, max_length=255, null=True, verbose_name='Hora inicial'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='updated',
+            field=models.DateTimeField(auto_now=True, verbose_name='Data da última atualização'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='updated_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='educationdirectory_last_mod_user', to=settings.AUTH_USER_MODEL, verbose_name='Atualizador'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='attachment',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.document', verbose_name='Anexo'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Data de criação'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='creator',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='educationdirectoryfile_creator', to=settings.AUTH_USER_MODEL, verbose_name='Criador'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='is_valid',
+            field=models.BooleanField(blank=True, default=False, null=True, verbose_name='É válido'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='line_count',
+            field=models.IntegerField(blank=True, default=0, null=True, verbose_name='Número de linhas'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='updated',
+            field=models.DateTimeField(auto_now=True, verbose_name='Data da última atualização'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectoryfile',
+            name='updated_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='educationdirectoryfile_last_mod_user', to=settings.AUTH_USER_MODEL, verbose_name='Atualizador'),
+        ),
+    ]

education_directory/migrations/0003_educationdirectory_locations.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-08-15 18:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0010_alter_location_options'),
+        ('education_directory', '0002_auto_20220809_1204'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='educationdirectory',
+            name='locations',
+            field=models.ManyToManyField(blank=True, null=True, to='location.Location'),
+        ),
+    ]

education_directory/migrations/0004_auto_20220815_1827.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.12 on 2022-08-15 18:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('institution', '0002_institution_institution_type'),
+        ('location', '0010_alter_location_options'),
+        ('education_directory', '0003_educationdirectory_locations'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='educationdirectory',
+            name='institutions',
+            field=models.ManyToManyField(blank=True, to='institution.Institution'),
+        ),
+        migrations.AlterField(
+            model_name='educationdirectory',
+            name='locations',
+            field=models.ManyToManyField(blank=True, to='location.Location'),
+        ),
+    ]

education_directory/migrations/0005_educationdirectory_is_online.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-08-15 18:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('education_directory', '0004_auto_20220815_1827'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='educationdirectory',
+            name='is_online',
+            field=models.BooleanField(default=False),
+        ),
+    ]

education_directory/migrations/0006_remove_educationdirectory_institution.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.12 on 2022-08-15 18:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('education_directory', '0005_educationdirectory_is_online'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='educationdirectory',
+            name='institution',
+        ),
+    ]