diff --git a/sapl/comissoes/legacy.yaml b/sapl/comissoes/legacy.yaml index 05d3ec4d3..2414df885 100644 --- a/sapl/comissoes/legacy.yaml +++ b/sapl/comissoes/legacy.yaml @@ -46,7 +46,7 @@ Participacao (ComposicaoComissao): Reuniao: periodo: periodo_reuniao - comissao: comissao_fk + comissao: cod_comissao tipo: tipo_comissao numero: num_comissao nome: nom_reuniao @@ -55,4 +55,9 @@ Reuniao: hora_inicio: hora_inicio_reuniao hora_fim: hora_fim_reuniao local_reuniao: local - observacao: + observacao: obs_reuniao + ulr_audio: audio_reuniao + url_video: video_reuniao + upload_pauta: pauta_reuniao + upload_ata: ata_reuniao + upload_anexo: anexo_reuniao diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index 8862fc2ee..23b65bc2c 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -205,8 +205,8 @@ class ReuniaoCrud(Crud): namespace = self.model._meta.app_config.name return reverse('%s:%s' % (namespace, 'reuniao_list')) -class ReuniaoPermissionMixin(PermissionRequiredForAppCrudMixin, - FormMixin, - DetailView): - model = Reuniao - app_label = AppConfig.label, + class DetailView(Crud.DetailView): + + @xframe_options_exempt + def get(self, request, *args, **kwargs): + return super().get(request, *args, **kwargs) diff --git a/sapl/redireciona_urls/views.py b/sapl/redireciona_urls/views.py index 41d58db33..4f1480a13 100644 --- a/sapl/redireciona_urls/views.py +++ b/sapl/redireciona_urls/views.py @@ -31,6 +31,7 @@ parlamentar_mesa_diretora = (app_parlamentares + ':mesa_diretora') comissao_list = (app_comissoes + ':comissao_list') comissao_detail = (app_comissoes + ':comissao_detail') +reuniao_detail = (app_comissoes + ':reuniao_detail') materialegislativa_detail = (app_materia + ':materialegislativa_detail') materialegislativa_list = (app_materia + ':pesquisar_materia') @@ -633,3 +634,51 @@ class RedirecionaMateriasPorAnoAutorTipo(RedirectView): url = has_iframe(url, self.request) return url + +class RedirecionaReuniao(RedirectView): + permanent = True + + def get_redirect_url(self): + pk_reuniao = self.request.GET.get( + 'cod_comissao', + EMPTY_STRING) + url = EMPTY_STRING + if pk_reuniao: + kwargs = {'pk': pk_reuniao} + try: + url = reverse(reuniao_detail, kwargs=kwargs) + except NoReverseMatch: + raise UnknownUrlNameError(reuniao_detail) + + else: + try: + url = reverse(reuniao_list) + except NoReverseMatch: + raise UnknownUrlNameError(reuniao_list) + + year = self.request.GET.get( + 'ano_reuniao', + EMPTY_STRING) + month = self.request.GET.get( + 'mes_reuniao', + EMPTY_STRING) + day = self.request.GET.get( + 'dia_reuniao', + EMPTY_STRING) + tipo_reuniao = self.request.GET.get( + 'tip_reuniao', + EMPTY_STRING) + + # Remove zeros à esquerda + day = day.lstrip("0") + month = month.lstrip("0") + args = EMPTY_STRING + args += "?data_inicio__year=%s" % (year) + args += "&data_inicio__month=%s" % (month) + args += "&data_inicio__day=%s" % (day) + args += "&tipo=%s&salvar=Pesquisar" % (tipo_reuniao) + url = "%s%s" % (url, args) + + url = has_iframe(url, self.request) + + return url diff --git a/sapl/templates/comissoes/cadastro_reuniao.html b/sapl/templates/comissoes/cadastro_reuniao.html deleted file mode 100644 index 9682c56d5..000000000 --- a/sapl/templates/comissoes/cadastro_reuniao.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n %} -{% load crispy_forms_tags %} -{% block actions %}{% endblock %} -{% block detail_content %} - {% crispy form %} -{% endblock detail_content %} diff --git a/sapl/templates/comissoes/cadastro_reuniao_edit.html b/sapl/templates/comissoes/cadastro_reuniao_edit.html deleted file mode 100644 index 9682c56d5..000000000 --- a/sapl/templates/comissoes/cadastro_reuniao_edit.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n %} -{% load crispy_forms_tags %} -{% block actions %}{% endblock %} -{% block detail_content %} - {% crispy form %} -{% endblock detail_content %} diff --git a/sapl/templates/comissoes/layouts.yaml b/sapl/templates/comissoes/layouts.yaml index a395b5894..916b2f339 100644 --- a/sapl/templates/comissoes/layouts.yaml +++ b/sapl/templates/comissoes/layouts.yaml @@ -44,8 +44,16 @@ ParticipacaoEdit: - motivo_desligamento - observacao - Reuniao: +Reuniao: {% trans 'Reunião' %}: - periodo - comissao + - tipo + - numero + - nome + - tema + - data + - hora_inicio + - hora_fim + - local_reuniao