Browse Source

Permite acesso da tela de presenca para todos e cria restricoes para as roles

pull/585/head
Eduardo Calil 8 years ago
parent
commit
4ef868ec99
  1. 10
      sapl/sessao/views.py
  2. 19
      sapl/templates/sessao/presenca.html

10
sapl/sessao/views.py

@ -2,6 +2,7 @@ from datetime import datetime
from re import sub from re import sub
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import user_passes_test
from django.contrib.auth.mixins import PermissionRequiredMixin from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@ -43,6 +44,10 @@ OrdemDiaCrud = Crud.build(OrdemDia, '')
RegistroVotacaoCrud = Crud.build(RegistroVotacao, '') RegistroVotacaoCrud = Crud.build(RegistroVotacao, '')
def check_permission(user):
return user.has_perms(permissoes_sessao())
def reordernar_materias_expediente(request, pk): def reordernar_materias_expediente(request, pk):
expedientes = ExpedienteMateria.objects.filter( expedientes = ExpedienteMateria.objects.filter(
sessao_plenaria_id=pk) sessao_plenaria_id=pk)
@ -449,15 +454,14 @@ class PresencaMixin:
yield (parlamentar, False) yield (parlamentar, False)
class PresencaView(PermissionRequiredMixin, class PresencaView(FormMixin,
FormMixin,
PresencaMixin, PresencaMixin,
SessaoCrud.CrudDetailView): SessaoCrud.CrudDetailView):
template_name = 'sessao/presenca.html' template_name = 'sessao/presenca.html'
form_class = PresencaForm form_class = PresencaForm
model = SessaoPlenaria model = SessaoPlenaria
permission_required = permissoes_sessao()
@user_passes_test(check_permission)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
self.object = self.get_object() self.object = self.get_object()
form = self.get_form() form = self.get_form()

19
sapl/templates/sessao/presenca.html

@ -1,7 +1,10 @@
{% extends "crud/detail.html" %} {% extends "crud/detail.html" %}
{% load i18n %} {% load i18n %}
{% load common_tags %}
{% block detail_content %} {% block detail_content %}
{% if perms|get_add_perm:view %}
<form method="POST"> <form method="POST">
{% csrf_token %} {% csrf_token %}
@ -24,6 +27,22 @@
<br /> <br />
<input type="submit" value="Salvar" class="btn btn-primary" /> <input type="submit" value="Salvar" class="btn btn-primary" />
</form> </form>
{% else %}
<div class="row">
<div class="col-md-6"><h2>Parlamentares presentes</div>
</div>
</br>
{% for parlamentar, check in view.get_presencas %}
<div class="row">
<div class="col-md-6"><label for="parlamentar">{{ forloop.counter }} - {{ parlamentar }}</label></div>
</div>
{% endfor %}
{% endif %}
{% endblock detail_content %} {% endblock detail_content %}
{% block extra_js %} {% block extra_js %}

Loading…
Cancel
Save