Browse Source

Iniciando mudança de tela ordenar resumo

pull/2831/head
ulyssesBML 7 years ago
parent
commit
91648517d6
  1. 8
      sapl/sessao/urls.py
  2. 55
      sapl/sessao/views.py
  3. 69
      sapl/templates/sessao/resumo_ordenacao_v2.html

8
sapl/sessao/urls.py

@ -33,7 +33,8 @@ from sapl.sessao.views import (AdicionarVariasMateriasExpediente,
renumerar_materias_expediente,
sessao_legislativa_legislatura_ajax,
VotacaoEmBlocoOrdemDia, VotacaoEmBlocoExpediente,
VotacaoEmBlocoSimbolicaView, VotacaoEmBlocoNominalView)
VotacaoEmBlocoSimbolicaView, VotacaoEmBlocoNominalView,
resumo_ordenacao)
from .apps import AppConfig
@ -101,6 +102,11 @@ urlpatterns = [
url(r'^sistema/resumo-ordenacao/',
ResumoOrdenacaoView.as_view(),
name='resumo_ordenacao'),
url(r'^sistema/resumo-ordenacao_v2/',
resumo_ordenacao,
name='resumo_ordenacao_v2'),
url(r'^sessao/(?P<pk>\d+)/adicionar-varias-materias-expediente/',
AdicionarVariasMateriasExpediente.as_view(),
name='adicionar_varias_materias_expediente'),

55
sapl/sessao/views.py

@ -1,6 +1,6 @@
import logging
from re import sub
from re import sub, search
import ast
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
@ -22,6 +22,8 @@ from django.views.generic.base import RedirectView
from django.views.generic.detail import DetailView
from django.views.generic.edit import FormMixin
from django_filters.views import FilterView
from django.shortcuts import render
from sapl.base.models import AppConfig as AppsAppConfig
from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
@ -1318,6 +1320,55 @@ class ResumoOrdenacaoView(PermissionRequiredMixin, FormView):
form.save()
return HttpResponseRedirect(self.get_success_url())
def resumo_ordenacao(request):
def get_tupla(tupla_key):
for tupla in ORDENACAO_RESUMO:
if tupla[0] == tupla_key:
return tupla
ordenacao = ResumoOrdenacao.objects.get_or_create()[0]
initial = [
get_tupla(ordenacao.primeiro),
get_tupla(ordenacao.segundo),
get_tupla(ordenacao.terceiro),
get_tupla(ordenacao.quarto),
get_tupla(ordenacao.quinto),
get_tupla(ordenacao.sexto),
get_tupla(ordenacao.setimo),
get_tupla(ordenacao.oitavo),
get_tupla(ordenacao.nono),
get_tupla(ordenacao.decimo),
get_tupla(ordenacao.decimo_primeiro),
get_tupla(ordenacao.decimo_segundo),
get_tupla(ordenacao.decimo_terceiro),
get_tupla(ordenacao.decimo_quarto)
]
context = {
'ordenacao': initial
}
if request.method == 'GET':
return render(request, 'sessao/resumo_ordenacao_v2.html', context)
elif request.method == 'POST':
ordenacao.primeiro = ast.literal_eval(request.POST['0'])[0]
ordenacao.segundo = ast.literal_eval(request.POST['1'])[0]
ordenacao.terceiro = ast.literal_eval(request.POST['2'])[0]
ordenacao.quarto = ast.literal_eval(request.POST['3'])[0]
ordenacao.quinto = ast.literal_eval(request.POST['4'])[0]
ordenacao.sexto = ast.literal_eval(request.POST['5'])[0]
ordenacao.setimo = ast.literal_eval(request.POST['6'])[0]
ordenacao.oitavo = ast.literal_eval(request.POST['7'])[0]
ordenacao.nono = ast.literal_eval(request.POST['8'])[0]
ordenacao.decimo = ast.literal_eval(request.POST['9'])[0]
ordenacao.decimo_primeiro =ast.literal_eval(request.POST['10'])[0]
ordenacao.decimo_segundo = ast.literal_eval(request.POST['11'])[0]
ordenacao.decimo_terceiro = ast.literal_eval(request.POST['12'])[0]
ordenacao.decimo_quarto = ast.literal_eval(request.POST['13'])[0]
ordenacao.save()
return render(request, 'sessao/resumo_ordenação_v2.html', context)
def get_turno(turno):
for i in Tramitacao.TURNO_CHOICES:

69
sapl/templates/sessao/resumo_ordenacao_v2.html

@ -0,0 +1,69 @@
{% extends "base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
{% block title %}
<h1 class="page-header">Ordenação do Resumo</h1>
{% endblock %}
{% block base_content %}
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script>
$( function() {
$( "#sortable" ).sortable();
$( "#sortable" ).disableSelection();
} );
</script>
<script>
$(function() {
let revalue = () => {
let aux = 0;
$("#sortable li input").each((index,obj) => {
obj.name = aux;
aux++;
})
$("#form").submit()
}
document.getElementById("submit").onclick = revalue
});
</script>
<form id="form" method="post">
{% csrf_token %}
<div class="container" style="margin-top20px; padding:30px;background-color: #444444; border-radius: 15px;">
<div class="row">
<div class="col-sm-1">
<h3 style="color:white;margin-bottom: 20px">Ordem</h3>
<ul class="list-group">
{% for item in ordenacao %}
<li class="list-group-item list-group-item-dark">
{{forloop.counter}}º
</li>
{% endfor %}
<ul>
</div>
<div class="col-sm">
<h3 style="color:white; margin-bottom: 20px;">Tópico</h3>
<ul class="list-group" id="sortable">
{% for item in ordenacao %}
<li class="list-group-item d-flex justify-content-between align-items-center ">
<input type="hidden" name="{{forloop.counter0}}" value="{{item}}">
{{item.1}}
<spam class="ui-icon ui-icon-arrowthick-2-n-s"></spam>
</li>
{% endfor %}
<ul>
</div>
</div>
</div>
<a class="btn btn-primary" id="submit">Salvar</a>
</form>
{% endblock %}
Loading…
Cancel
Save