From 10550f96a512da8766551a2097daeb0fe0b53721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <cont.joaorodrigues@gmail.com>
Date: Tue, 10 Dec 2019 16:15:10 -0300
Subject: [PATCH] =?UTF-8?q?Adiciona=20corre=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/comissoes/forms.py                       |  4 ++--
 ...204_2004.py => 0023_auto_20191210_1532.py} | 11 +++++++---
 .../0023_cargocomissao_id_ordenacao.py        | 20 -------------------
 sapl/comissoes/models.py                      |  8 ++------
 sapl/comissoes/views.py                       |  2 +-
 5 files changed, 13 insertions(+), 32 deletions(-)
 rename sapl/comissoes/migrations/{0024_auto_20191204_2004.py => 0023_auto_20191210_1532.py} (64%)
 delete mode 100644 sapl/comissoes/migrations/0023_cargocomissao_id_ordenacao.py

diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py
index 622b50380..93b3b78f5 100644
--- a/sapl/comissoes/forms.py
+++ b/sapl/comissoes/forms.py
@@ -81,7 +81,7 @@ class ComposicaoForm(forms.ModelForm):
 
 def choices_posicao():
     posicoes = list(range(1, len(CargoComissao.objects.all())+1))
-    choices = [(posicao, f"{posicao}º") for posicao in posicoes]
+    choices = [(posicao, str(posicao)+"º") for posicao in posicoes]
     choices.insert(0, (0, "Não definida"))
     return choices
 
@@ -130,7 +130,7 @@ class CargosComissaoOrdenacaoForm(forms.Form):
         posicao = cleaned_data['posicao']
 
         if posicao == '0':
-            cargo.id_ordenacao = "Não definido"
+            cargo.id_ordenacao = None
         else:
             if CargoComissao.objects.filter(id_ordenacao=posicao).exists():
                 outro_cargo = CargoComissao.objects.get(id_ordenacao=posicao)
diff --git a/sapl/comissoes/migrations/0024_auto_20191204_2004.py b/sapl/comissoes/migrations/0023_auto_20191210_1532.py
similarity index 64%
rename from sapl/comissoes/migrations/0024_auto_20191204_2004.py
rename to sapl/comissoes/migrations/0023_auto_20191210_1532.py
index 22329678d..59e842ca9 100644
--- a/sapl/comissoes/migrations/0024_auto_20191204_2004.py
+++ b/sapl/comissoes/migrations/0023_auto_20191210_1532.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-04 23:04
+# Generated by Django 1.11.20 on 2019-12-10 18:32
 from __future__ import unicode_literals
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('comissoes', '0023_cargocomissao_id_ordenacao'),
+        ('comissoes', '0022_auto_20191120_1440'),
     ]
 
     operations = [
@@ -20,4 +20,9 @@ class Migration(migrations.Migration):
             name='participacao',
             options={'ordering': ['-titular', 'cargo__id_ordenacao'], 'verbose_name': 'Participação em Comissão', 'verbose_name_plural': 'Participações em Comissão'},
         ),
+        migrations.AddField(
+            model_name='cargocomissao',
+            name='id_ordenacao',
+            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='Id de Ordenacao'),
+        ),
     ]
diff --git a/sapl/comissoes/migrations/0023_cargocomissao_id_ordenacao.py b/sapl/comissoes/migrations/0023_cargocomissao_id_ordenacao.py
deleted file mode 100644
index 9095ae3f3..000000000
--- a/sapl/comissoes/migrations/0023_cargocomissao_id_ordenacao.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-02 22:46
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('comissoes', '0022_auto_20191120_1440'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cargocomissao',
-            name='id_ordenacao',
-            field=models.CharField(default='Não definido', max_length=50, verbose_name='Id de Ordenacao'),
-        ),
-    ]
diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py
index 1c6bcb236..44b4c3446 100644
--- a/sapl/comissoes/models.py
+++ b/sapl/comissoes/models.py
@@ -121,12 +121,8 @@ class Periodo(models.Model):  # PeriodoCompComissao
 
 @reversion.register()
 class CargoComissao(models.Model):
-    # O CharField é utilizado para evitar definir um valor máximo de
-    # cargos que podem ser criados e sempre apresentar os cargos não
-    # ordenados por último.
-    id_ordenacao = models.CharField(
-        max_length=50, verbose_name=_('Id de Ordenacao'),
-        default='Não definido'
+    id_ordenacao = models.PositiveIntegerField(
+        blank=True, null=True, verbose_name=_('Id de Ordenacao'),
     )
     nome = models.CharField(max_length=50, verbose_name=_('Cargo'))
     unico = models.BooleanField(
diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py
index 0835525e1..0befb19ac 100644
--- a/sapl/comissoes/views.py
+++ b/sapl/comissoes/views.py
@@ -117,7 +117,7 @@ class CargosComissaoOrdenacaoView(PermissionRequiredMixin, FormView):
             else:
                 tabela_ordenacao.append((posicao, ""))
 
-        cargos_desordenados = cargos.filter(id_ordenacao="Não definido")
+        cargos_desordenados = cargos.filter(id_ordenacao=None)
         for cargo_desordenado in cargos_desordenados:
             tabela_ordenacao.append(("Não definida", cargo_desordenado))