|
|
@ -1,16 +1,16 @@ |
|
|
|
|
|
|
|
import logging |
|
|
|
from collections import OrderedDict |
|
|
|
from re import sub |
|
|
|
import logging |
|
|
|
|
|
|
|
from django.contrib import messages |
|
|
|
from django.contrib.auth.decorators import permission_required |
|
|
|
from django.contrib.auth.mixins import PermissionRequiredMixin |
|
|
|
from django.core.exceptions import ObjectDoesNotExist |
|
|
|
from django.urls import reverse |
|
|
|
from django.db.models import Max, Q |
|
|
|
from django.http import JsonResponse |
|
|
|
from django.http.response import Http404, HttpResponseRedirect |
|
|
|
from django.urls import reverse |
|
|
|
from django.utils import timezone |
|
|
|
from django.utils.datastructures import MultiValueDictKeyError |
|
|
|
from django.utils.decorators import method_decorator |
|
|
@ -52,7 +52,6 @@ from .models import (Bancada, CargoBancada, CargoMesa, |
|
|
|
RetiradaPauta, TipoJustificativa, JustificativaAusencia, OradorOrdemDia, |
|
|
|
ORDENACAO_RESUMO, RegistroLeitura) |
|
|
|
|
|
|
|
|
|
|
|
TipoSessaoCrud = CrudAux.build(TipoSessaoPlenaria, 'tipo_sessao_plenaria') |
|
|
|
TipoJustificativaCrud = CrudAux.build(TipoJustificativa, 'tipo_justificativa') |
|
|
|
CargoBancadaCrud = CrudAux.build(CargoBancada, '') |
|
|
@ -2190,6 +2189,7 @@ def get_ocorrencias_da_sessao(sessao_plenaria): |
|
|
|
context = {'ocorrencias_da_sessao': ocorrencias_sessao} |
|
|
|
return context |
|
|
|
|
|
|
|
|
|
|
|
def get_consideracoes_finais(sessao_plenaria): |
|
|
|
consideracoes_finais = ConsideracoesFinais.objects.filter( |
|
|
|
sessao_plenaria_id=sessao_plenaria.id) |
|
|
@ -2358,7 +2358,6 @@ class ResumoView(DetailView): |
|
|
|
class ResumoAtaView(ResumoView): |
|
|
|
template_name = 'sessao/resumo_ata.html' |
|
|
|
logger = logging.getLogger(__name__) |
|
|
|
logger.debug('Gerando Resumo.') |
|
|
|
|
|
|
|
|
|
|
|
class ExpedienteView(FormMixin, DetailView): |
|
|
@ -2518,6 +2517,7 @@ class OcorrenciaSessaoView(FormMixin, DetailView): |
|
|
|
pk = self.kwargs['pk'] |
|
|
|
return reverse('sapl.sessao:ocorrencia_sessao', kwargs={'pk': pk}) |
|
|
|
|
|
|
|
|
|
|
|
class ConsideracoesFinaisView(FormMixin, DetailView): |
|
|
|
template_name = 'sessao/consideracoes_finais.html' |
|
|
|
form_class = OcorrenciaSessaoForm |
|
|
@ -2583,6 +2583,7 @@ class ConsideracoesFinaisView(FormMixin, DetailView): |
|
|
|
pk = self.kwargs['pk'] |
|
|
|
return reverse('sapl.sessao:consideracoes_finais', kwargs={'pk': pk}) |
|
|
|
|
|
|
|
|
|
|
|
class VotacaoEditView(SessaoPermissionMixin): |
|
|
|
|
|
|
|
''' |
|
|
@ -3867,7 +3868,6 @@ class PesquisarPautaSessaoView(PesquisarSessaoPlenariaView): |
|
|
|
template_name = 'sessao/pauta_sessao_filter.html' |
|
|
|
|
|
|
|
logger = logging.getLogger(__name__) |
|
|
|
logger.debug('Pesquisa de PautaSessao.') |
|
|
|
|
|
|
|
def get_context_data(self, **kwargs): |
|
|
|
context = super().get_context_data(**kwargs) |
|
|
|