diff --git a/sapl/materia/migrations/0058_remove_tramitacao_turno.py b/sapl/materia/migrations/0058_remove_tramitacao_turno.py new file mode 100644 index 000000000..301572bbd --- /dev/null +++ b/sapl/materia/migrations/0058_remove_tramitacao_turno.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-09-06 13:02 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0057_auto_20190905_1135'), + ] + + operations = [ + migrations.RemoveField( + model_name='tramitacao', + name='turno', + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 6955b2e92..bb8b5c4f4 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -1074,9 +1074,6 @@ class Tramitacao(models.Model): urgente = models.BooleanField(verbose_name=_('Urgente ?'), choices=YES_NO_CHOICES, default=False) - turno = models.CharField( - max_length=1, blank=True, verbose_name=_('Turno'), - choices=TURNO_CHOICES) tipo_turno = models.ForeignKey( TipoTurnoTramitacao, on_delete=models.PROTECT, diff --git a/sapl/templates/sessao/votacao/votacao_bloco.html b/sapl/templates/sessao/votacao/votacao_bloco.html index 27523e894..a86784ec8 100644 --- a/sapl/templates/sessao/votacao/votacao_bloco.html +++ b/sapl/templates/sessao/votacao/votacao_bloco.html @@ -61,13 +61,13 @@ {% endfor %}
{% if o.materia.numero_protocolo %} - Protocolo:   {{o.materia.numero_protocolo}}
+ Protocolo: {{o.materia.numero_protocolo}}
{% endif %} {% if o.materia.tramitacao_set.last and o.materia.tramitacao_set.last.tipo_turno %} Turno:  {{o.materia.tramitacao_set.last.tipo_turno.nome}} +
{% endif %} -
Ementa: {{ o.materia.ementa|safe }}