diff --git a/sapl/comissoes/legacy.yaml b/sapl/comissoes/legacy.yaml index a1093c4d2..05d3ec4d3 100644 --- a/sapl/comissoes/legacy.yaml +++ b/sapl/comissoes/legacy.yaml @@ -43,3 +43,16 @@ Participacao (ComposicaoComissao): observacao: obs_composicao parlamentar: cod_parlamentar titular: ind_titular + +Reuniao: + periodo: periodo_reuniao + comissao: comissao_fk + tipo: tipo_comissao + numero: num_comissao + nome: nom_reuniao + tema: tem_reuniao + data: dat_reuniao + hora_inicio: hora_inicio_reuniao + hora_fim: hora_fim_reuniao + local_reuniao: local + observacao: diff --git a/sapl/templates/comissoes/cadastro_reuniao.html b/sapl/templates/comissoes/cadastro_reuniao.html new file mode 100644 index 000000000..9682c56d5 --- /dev/null +++ b/sapl/templates/comissoes/cadastro_reuniao.html @@ -0,0 +1,7 @@ +{% 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 new file mode 100644 index 000000000..9682c56d5 --- /dev/null +++ b/sapl/templates/comissoes/cadastro_reuniao_edit.html @@ -0,0 +1,7 @@ +{% 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 b5e856b2e..a395b5894 100644 --- a/sapl/templates/comissoes/layouts.yaml +++ b/sapl/templates/comissoes/layouts.yaml @@ -42,4 +42,10 @@ ParticipacaoEdit: - nome_parlamentar cargo titular - data_designacao data_desligamento - motivo_desligamento - - observacao \ No newline at end of file + - observacao + + Reuniao: + {% trans 'Reunião' %}: + - periodo + - comissao + diff --git a/sapl/templates/comissoes/reunioes.html b/sapl/templates/comissoes/reunioes.html deleted file mode 100644 index 6a78b7881..000000000 --- a/sapl/templates/comissoes/reunioes.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "comissoes/comissao_detail.html" %} -{% load i18n %} - -{% block actions %}{% endblock actions %} - -{% block detail_content %} - TODO ... Reuniões -{% endblock detail_content %} diff --git a/sapl/templates/comissoes/subnav.yaml b/sapl/templates/comissoes/subnav.yaml index 02402bfee..72c68c804 100644 --- a/sapl/templates/comissoes/subnav.yaml +++ b/sapl/templates/comissoes/subnav.yaml @@ -6,3 +6,5 @@ urls_extras: participacao_detail participacao_create participacao_edit participacao_delete - title: {% trans 'Matérias em Tramitação' %} url: materias_em_tramitacao +- title: {% trans 'Reunião' %} + url: reuniao_detail