diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 6f322c09c..cfcb71ffc 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -16,6 +16,7 @@ from sapl.comissoes.models import Comissao from sapl.compilacao.models import (PerfilEstruturalTextoArticulado, TextoArticulado) from sapl.parlamentares.models import Parlamentar +#from sapl.protocoloadm.models import Protocolo from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, SaplGenericForeignKey, SaplGenericRelation, restringe_tipos_de_arquivo_txt, texto_upload_path) diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 509904623..a6ee40e22 100755 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -42,7 +42,7 @@ from .forms import (AdicionarVariasMateriasFilterSet, BancadaForm, BlocoForm, MesaForm, OradorExpedienteForm, OradorForm, PautaSessaoFilterSet, PresencaForm, ResumoOrdenacaoForm, SessaoPlenariaFilterSet, SessaoPlenariaForm, VotacaoEditForm, VotacaoForm, - VotacaoNominalForm, VotacaoEmBlocoFilterSet) + VotacaoNominalForm) from .models import (Bancada, Bloco, CargoBancada, CargoMesa, ExpedienteMateria, ExpedienteSessao, JustificativaAusencia, OcorrenciaSessao, IntegranteMesa, MateriaLegislativa, Orador, OradorExpediente, OrdemDia, @@ -3225,8 +3225,6 @@ class VotacaoEmBlocoExpediente(PermissionRequiredForAppCrudMixin, app_label = AppConfig.label logger = logging.getLogger(__name__) - import ipdb; ipdb.set_trace() - def get_filterset_kwargs(self, filterset_class): super(VotacaoEmBlocoExpediente, self).get_filterset_kwargs(filterset_class) @@ -3317,7 +3315,7 @@ class VotacaoEmBlocoOrdemDia(ListView): template_name = 'sessao/votacao/votacao_bloco_ordem.html' app_label = AppConfig.label logger = logging.getLogger(__name__) - context_object_name = 'ordemdia' + context_object_name = 'ordem_dia' def get_queryset(self): kwargs = self.kwargs @@ -3326,12 +3324,8 @@ class VotacaoEmBlocoOrdemDia(ListView): def get_context_data(self, **kwargs): context = super(VotacaoEmBlocoOrdemDia, self).get_context_data(**kwargs) - import ipdb; ipdb.set_trace() - # paginator = context['paginator'] - context['page_obj'] = context['object_list'] - - # context['page_range'] = make_pagination( - # page_obj.number, paginator.num_pages) + context['turno_choices'] = Tramitacao.TURNO_CHOICES + return context diff --git a/sapl/templates/auth/user_list.html b/sapl/templates/auth/user_list.html index b24cb764e..949e544cb 100644 --- a/sapl/templates/auth/user_list.html +++ b/sapl/templates/auth/user_list.html @@ -29,7 +29,6 @@ {% endif %} - Criar Usuário + Criar Usuário - {% include 'paginacao.html'%} {% endblock base_content %} diff --git a/sapl/templates/sessao/votacao/votacao_bloco_expediente.html b/sapl/templates/sessao/votacao/votacao_bloco_expediente.html index bee161829..33b5c8c8f 100644 --- a/sapl/templates/sessao/votacao/votacao_bloco_expediente.html +++ b/sapl/templates/sessao/votacao/votacao_bloco_expediente.html @@ -58,12 +58,14 @@ - {% for m in page_obj %} + {% for m in ordem_dia %}