Conserta QA e conflitos de merge com master

painel/urls.py

@@ -8,7 +8,8 @@ from .views import (cronometro_painel, get_dados_painel, painel_mensagem_view,
 app_name = AppConfig.name
 
 urlpatterns = [
-    url(r'^painel_principal/(?P<pk>\d+)$', painel_view, name="painel_principal"),
+    url(r'^painel_principal/(?P<pk>\d+)$', painel_view,
+        name="painel_principal"),
     url(r'^painel/(?P<pk>\d+)/dados$', get_dados_painel, name='dados_painel'),
     url(r'^painel/controlador$',
         controlador_painel, name='painel_controlador'),

sessao/forms.py

@@ -1,12 +1,29 @@
-import django_filters
+from datetime import datetime
 
+import django_filters
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Fieldset, Layout
 from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.forms import ModelForm
-from .models import ExpedienteMateria
-from materia.models import TipoMateriaLegislativa, MateriaLegislativa
-from datetime import datetime
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.forms import ModelForm
+from django.utils.translation import ugettext_lazy as _
+
+import crispy_layout_mixin
+from crispy_layout_mixin import form_actions
+from materia.models import MateriaLegislativa, TipoMateriaLegislativa
+from sapl.utils import RANGE_DIAS_MES, RANGE_MESES
+
+from .models import ExpedienteMateria, SessaoPlenaria
+
+
+def pega_anos():
+    anos_list = SessaoPlenaria.objects.all().dates('data_inicio', 'year')
+    anos = [(k.year, k.year) for k in anos_list]
+    return anos
+
+ANO_CHOICES = [('', '---------')] + pega_anos()
+MES_CHOICES = [('', '---------')] + RANGE_MESES
+DIA_CHOICES = [('', '---------')] + RANGE_DIAS_MES
 
 
 class ExpedienteMateriaForm(ModelForm):
@@ -58,26 +75,6 @@ class ExpedienteMateriaForm(ModelForm):
         expediente.save()
         return expediente
 
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Fieldset, Layout
-
-import crispy_layout_mixin
-from crispy_layout_mixin import form_actions
-
-from sapl.utils import RANGE_MESES, RANGE_DIAS_MES
-
-from .models import SessaoPlenaria
-
-
-def pega_anos():
-    anos_list = SessaoPlenaria.objects.all().dates('data_inicio', 'year')
-    anos = [(k.year, k.year) for k in anos_list]
-    return anos
-
-ANO_CHOICES = [('', '---------')] + pega_anos()
-MES_CHOICES = [('', '---------')] + RANGE_MESES
-DIA_CHOICES = [('', '---------')] + RANGE_DIAS_MES
-
 
 class PresencaForm(forms.Form):
     presenca = forms.CharField(required=False, initial=False)

sessao/urls.py

@@ -2,22 +2,21 @@ from django.conf.urls import include, url
 from django.views.static import serve
 
 from sapl import settings
-from sessao.views import (EditMateriaOrdemDiaView,
-                          ExpedienteView,
-                          ListMateriaOrdemDiaView,
+from sessao.views import (EditMateriaOrdemDiaView, ExpedienteMateriaCrud,
+                          ExpedienteView, ListMateriaOrdemDiaView,
                           MateriaOrdemDiaView, MesaView, OradorCrud,
                           OradorExpedienteCrud, PainelView,
                           PautaExpedienteDetail, PautaOrdemDetail,
                           PautaSessaoDetailView, PautaSessaoListView,
-                          PesquisarSessaoPlenariaView,
-                          PresencaOrdemDiaView, PresencaView, ResumoView,
-                          SessaoCrud, SessaoPlenariaView, TipoExpedienteCrud,
+                          PesquisarSessaoPlenariaView, PresencaOrdemDiaView,
+                          PresencaView, ResumoView, SessaoCrud,
+                          SessaoPlenariaView, TipoExpedienteCrud,
                           TipoResultadoVotacaoCrud, TipoSessaoCrud,
                           VotacaoEditView, VotacaoExpedienteEditView,
                           VotacaoExpedienteView, VotacaoNominalEditView,
                           VotacaoNominalExpedienteEditView,
                           VotacaoNominalExpedienteView, VotacaoNominalView,
-                          VotacaoView, ExpedienteMateriaCrud, abrir_votacao_view)
+                          VotacaoView, abrir_votacao_view)
 
 from .apps import AppConfig
 

sessao/views.py

@@ -5,6 +5,7 @@ from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.urlresolvers import reverse
 from django.forms.utils import ErrorList
+from django.http.response import HttpResponseRedirect
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import ListView, TemplateView
@@ -21,12 +22,11 @@ from materia.models import (Autoria, DocumentoAcessorio,
 from norma.models import NormaJuridica
 from parlamentares.models import Parlamentar
 from sessao.serializers import SessaoPlenariaSerializer
-from django.http.response import HttpResponseRedirect
 
-from .forms import (ExpedienteForm, ListMateriaForm, MateriaOrdemDiaForm,
-                    MesaForm, PresencaForm, SessaoPlenariaFilterSet,
-                    VotacaoEditForm, VotacaoForm,
-                    VotacaoNominalForm, ExpedienteMateriaForm)
+from .forms import (ExpedienteForm, ExpedienteMateriaForm, ListMateriaForm,
+                    MateriaOrdemDiaForm, MesaForm, PresencaForm,
+                    SessaoPlenariaFilterSet, VotacaoEditForm, VotacaoForm,
+                    VotacaoNominalForm)
 from .models import (CargoMesa, ExpedienteMateria, ExpedienteSessao,
                      IntegranteMesa, MateriaLegislativa, Orador,
                      OradorExpediente, OrdemDia, PresencaOrdemDia,
@@ -120,7 +120,7 @@ class ExpedienteMateriaCrud(MasterDetailCrud):
                             url = reverse('sessao:votacaonominalexpedit',
                                           kwargs={
                                             'pk': obj.sessao_plenaria_id,
-                                            'oid': bj.materia_id,
+                                            'oid': obj.materia_id,
                                             'mid': obj.pk})
                     elif obj.tipo_votacao == 3:
                         url = reverse('sessao:votacaosecretaexpedit',