Fix #1801

sapl/sessao/migrations/0024_auto_20180926_1042.py → sapl/sessao/migrations/0024_auto_20181004_0720.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-09-26 13:42
+# Generated by Django 1.9.13 on 2018-10-04 10:20
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -20,10 +20,15 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('data', models.DateField(verbose_name='Data')),
                 ('hora', models.CharField(max_length=5, verbose_name='Horário (hh:mm)')),
-                ('observacao', models.CharField(blank=True, max_length=150, verbose_name='Observação')),
+                ('observacao', models.TextField(blank=True, max_length=150, verbose_name='Observação')),
+                ('ausencia', models.PositiveIntegerField(choices=[(1, 'Sessão'), (2, 'Matéria')], default=1, verbose_name='Ausente em')),
                 ('parlamentar', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Parlamentar')),
-                ('sessao_plenaria', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sessao.SessaoPlenaria')),
+                ('sessao_plenaria', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sessao.SessaoPlenaria', verbose_name='Sessão Plenária')),
             ],
+            options={
+                'verbose_name': 'Justificativa de Ausência',
+                'verbose_name_plural': 'Justificativas de Ausências',
+            },
         ),
         migrations.CreateModel(
             name='TipoJustificativa',
@@ -40,6 +45,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='justificativaausencia',
             name='tipo_ausencia',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sessao.TipoJustificativa', verbose_name='Tipo'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sessao.TipoJustificativa', verbose_name='Tipo de Justificativa'),
         ),
     ]

sapl/sessao/migrations/0025_auto_20180927_1117.py

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-09-27 14:17
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sessao', '0024_auto_20180926_1042'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='justificativaausencia',
-            options={'verbose_name': 'Justificativa de Ausência', 'verbose_name_plural': 'Justificativas de Ausências'},
-        ),
-        migrations.AddField(
-            model_name='justificativaausencia',
-            name='ausencia',
-            field=models.PositiveIntegerField(choices=[(1, 'Sessão'), (2, 'Matéria')], default=1, verbose_name='Ausente em'),
-        ),
-    ]

sapl/sessao/migrations/0026_auto_20181002_1131.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-10-02 14:31
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sessao', '0025_auto_20180927_1117'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='justificativaausencia',
-            name='observacao',
-            field=models.TextField(blank=True, max_length=150, verbose_name='Observação'),
-        ),
-        migrations.AlterField(
-            model_name='justificativaausencia',
-            name='sessao_plenaria',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sessao.SessaoPlenaria', verbose_name='Sessão Plenárias'),
-        ),
-    ]

sapl/sessao/models.py

@@ -589,9 +589,9 @@ class JustificativaAusencia(models.Model):
     parlamentar = models.ForeignKey(Parlamentar, on_delete=models.PROTECT)
     sessao_plenaria = models.ForeignKey(SessaoPlenaria,
                                         on_delete=models.CASCADE,
-                                        verbose_name=_('Sessão Plenárias'))
+                                        verbose_name=_('Sessão Plenária'))
     tipo_ausencia = models.ForeignKey(TipoJustificativa, on_delete=models.PROTECT,
-                                      verbose_name=_('Tipo'))
+                                      verbose_name=_('Tipo de Justificativa'))
     data = models.DateField(verbose_name=_('Data'))
     hora = models.CharField(
         max_length=5, verbose_name=_('Horário (hh:mm)'))