Browse Source

Adiciona telas de confirmação e exclusão de acompanhamento matéria

pull/222/head
Edward Ribeiro 10 years ago
parent
commit
324ad5fba7
  1. 10
      materia/urls.py
  2. 41
      materia/views.py

10
materia/urls.py

@ -1,6 +1,8 @@
from django.conf.urls import include, url from django.conf.urls import include, url
from materia.views import (AcompanhamentoMateriaView, AutoriaEditView, from materia.views import (AcompanhamentoConfirmarView,
AcompanhamentoExcluirView,
AcompanhamentoMateriaView, AutoriaEditView,
AutoriaView, DespachoInicialEditView, AutoriaView, DespachoInicialEditView,
DespachoInicialView, DocumentoAcessorioEditView, DespachoInicialView, DocumentoAcessorioEditView,
DocumentoAcessorioView, FormularioCadastroView, DocumentoAcessorioView, FormularioCadastroView,
@ -99,4 +101,10 @@ urlpatterns = [
PesquisaMateriaListView.as_view(), name='pesquisar_materia_list'), PesquisaMateriaListView.as_view(), name='pesquisar_materia_list'),
url(r'^materia/(?P<pk>\d+)/acompanhar-materia/$', url(r'^materia/(?P<pk>\d+)/acompanhar-materia/$',
AcompanhamentoMateriaView.as_view(), name='acompanhar_materia'), AcompanhamentoMateriaView.as_view(), name='acompanhar_materia'),
url(r'^materia/(?P<pk>\d+)/acompanhar-confirmar$',
AcompanhamentoConfirmarView.as_view(),
name='acompanhar_confirmar'),
url(r'^materia/(?P<pk>\d+)/acompanhar-excluir$',
AcompanhamentoExcluirView.as_view(),
name='acompanhar_excluir'),
] ]

41
materia/views.py

@ -7,10 +7,11 @@ from django.contrib import messages
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core.mail import send_mail from django.core.mail import send_mail
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http.response import HttpResponseRedirect
from django.shortcuts import redirect from django.shortcuts import redirect
from django.utils.html import strip_tags from django.utils.html import strip_tags
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.views.generic import ListView from django.views.generic import ListView, TemplateView
from django.views.generic.edit import FormMixin from django.views.generic.edit import FormMixin
from vanilla.views import GenericView from vanilla.views import GenericView
@ -759,6 +760,40 @@ class DocumentoAcessorioView(FormMixin, GenericView):
return reverse('documento_acessorio', kwargs={'pk': pk}) return reverse('documento_acessorio', kwargs={'pk': pk})
class AcompanhamentoConfirmarView(TemplateView):
def get_redirect_url(self):
return reverse("sessaoplenaria:list_pauta_sessao")
def get(self, request, *args, **kwargs):
materia_id = kwargs['pk']
hash_txt = request.GET.get('hash', '')
acompanhar = AcompanhamentoMateria.objects.get(
materia_id=materia_id,
hash=hash_txt)
acompanhar.confirmado = True
acompanhar.save()
return HttpResponseRedirect(self.get_redirect_url())
class AcompanhamentoExcluirView(TemplateView):
def get_redirect_url(self):
return reverse("sessaoplenaria:list_pauta_sessao")
def get(self, request, *args, **kwargs):
materia_id = kwargs['pk']
hash_txt = request.GET.get('hash', '')
AcompanhamentoMateria.objects.get(materia_id=materia_id,
hash=hash_txt).delete()
return HttpResponseRedirect(self.get_redirect_url())
class DocumentoAcessorioEditView(FormMixin, GenericView): class DocumentoAcessorioEditView(FormMixin, GenericView):
template_name = "materia/documento_acessorio_edit.html" template_name = "materia/documento_acessorio_edit.html"
@ -1011,7 +1046,7 @@ class TramitacaoView(FormMixin, GenericView):
) )
destinatarios = AcompanhamentoMateria.objects.values_list( destinatarios = AcompanhamentoMateria.objects.values_list(
'email', flat=True).filter( 'email', flat=True).filter(
materia=materia) materia=materia, confirmado = True)
send_mail('Mudança de Tramitação', send_mail('Mudança de Tramitação',
corpo_email, corpo_email,
'sapl-test@interlegis.leg.br', 'sapl-test@interlegis.leg.br',
@ -1529,7 +1564,9 @@ class AcompanhamentoMateriaView(FormMixin,
acompanhar.hash = hash_txt acompanhar.hash = hash_txt
acompanhar.materia = materia acompanhar.materia = materia
acompanhar.usuario = usuario.username acompanhar.usuario = usuario.username
acompanhar.confirmado = False
acompanhar.save() acompanhar.save()
else: else:
return self.render_to_response( return self.render_to_response(
{'form': form, {'form': form,

Loading…
Cancel
Save