From ffd527d6c205badcde8c81a9b605ebf764bd6127 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 17 May 2016 15:23:22 -0300 Subject: [PATCH] =?UTF-8?q?Adiciona=20bot=C3=A3o=20para=20reordenar=20mat?= =?UTF-8?q?=C3=A9rias=20do=20expediente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sessao/urls.py | 5 ++++- sessao/views.py | 13 +++++++++++++ templates/sessao/expedientemateria_list.html | 9 +++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 templates/sessao/expedientemateria_list.html diff --git a/sessao/urls.py b/sessao/urls.py index 1d924154b..222837042 100644 --- a/sessao/urls.py +++ b/sessao/urls.py @@ -16,7 +16,8 @@ from sessao.views import (EditMateriaOrdemDiaView, ExpedienteMateriaCrud, VotacaoExpedienteView, VotacaoNominalEditView, VotacaoNominalExpedienteEditView, VotacaoNominalExpedienteView, VotacaoNominalView, - VotacaoView, abrir_votacao_view) + VotacaoView, abrir_votacao_view, + reordernar_materias_expediente) from .apps import AppConfig @@ -32,6 +33,8 @@ urlpatterns = [ url(r'^(?P\d+)/(?P\d+)/abrir-votacao$', abrir_votacao_view, name="abrir_votacao"), + url(r'^(?P\d+)/reordenar-expediente$', reordernar_materias_expediente, + name="reordenar_expediente"), url(r'^media/(?P.*)$', serve, {'document_root': settings.MEDIA_ROOT}), diff --git a/sessao/views.py b/sessao/views.py index 49c352c4a..cd91ca171 100644 --- a/sessao/views.py +++ b/sessao/views.py @@ -42,6 +42,19 @@ TipoExpedienteCrud = Crud.build(TipoExpediente, 'tipo_expediente') RegistroVotacaoCrud = Crud.build(RegistroVotacao, '') +def reordernar_materias_expediente(request, pk): + expedientes = ExpedienteMateria.objects.filter( + sessao_plenaria_id=pk) + exp_num = 1 + for e in expedientes: + e.numero_ordem = exp_num + e.save() + exp_num += 1 + + return HttpResponseRedirect( + reverse('sessao:expedientemateria_list', kwargs={'pk': pk})) + + def abrir_votacao_view(request, pk, spk): existe_votacao_aberta = ExpedienteMateria.objects.filter( sessao_plenaria_id=spk, votacao_aberta=True diff --git a/templates/sessao/expedientemateria_list.html b/templates/sessao/expedientemateria_list.html new file mode 100644 index 000000000..60b803627 --- /dev/null +++ b/templates/sessao/expedientemateria_list.html @@ -0,0 +1,9 @@ +{% extends "crud/list.html" %} +{% load i18n %} + + +{% block more_buttons %} + + {% blocktrans with verbose_name=view.verbose_name %} Reordenar Matérias {% endblocktrans %} + +{% endblock more_buttons %}