From 5f49e3b9c7d980614ba68d0c8400ce7cbd924f1a Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 11:57:45 -0300 Subject: [PATCH 01/14] Fixes #1309 --- sapl/templates/sessao/pauta_sessao_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/templates/sessao/pauta_sessao_detail.html b/sapl/templates/sessao/pauta_sessao_detail.html index e4f41f312..1c31aa973 100644 --- a/sapl/templates/sessao/pauta_sessao_detail.html +++ b/sapl/templates/sessao/pauta_sessao_detail.html @@ -3,7 +3,7 @@ {% load crispy_forms_tags %} {% block base_content %} -
> PDF
+
> Impressão PDF
Identificação Básica From 494775980a6fa668370b14c6a2db9fdfd59a0039 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 25 Jul 2017 15:55:46 -0300 Subject: [PATCH 02/14] =?UTF-8?q?Conserta=20anula=C3=A7=C3=A3o=20de=20vota?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/sessao/views.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 16ca533e3..009d4d350 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -1400,9 +1400,8 @@ class VotacaoEditView(SessaoPermissionMixin): ordem_id = kwargs['oid'] if(int(request.POST['anular_votacao']) == 1): - RegistroVotacao.objects.filter( - materia_id=materia_id, - ordem_id=ordem_id).last().delete() + for r in RegistroVotacao.objects.filter(ordem_id=ordem_id): + r.delete() ordem = OrdemDia.objects.get( sessao_plenaria_id=self.object.id, @@ -2165,14 +2164,8 @@ class VotacaoExpedienteEditView(SessaoPermissionMixin): expediente_id = kwargs['oid'] if(int(request.POST['anular_votacao']) == 1): - try: - RegistroVotacao.objects.get( - materia_id=materia_id, - expediente_id=expediente_id).delete() - except MultipleObjectsReturned: - RegistroVotacao.objects.filter( - materia_id=materia_id, - expediente_id=expediente_id).last().delete() + for r in RegistroVotacao.objects.filter(expediente_id=expediente_id): + r.delete() expediente = ExpedienteMateria.objects.get( sessao_plenaria_id=self.object.id, From 58441a0c6aa3a85d80a68fbaea90cd178d0614bc Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 25 Jul 2017 15:56:18 -0300 Subject: [PATCH 03/14] Conserta bug e melhora visual do Painel --- sapl/templates/painel/index.html | 45 ++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html index b78fb7774..98eabb6ab 100644 --- a/sapl/templates/painel/index.html +++ b/sapl/templates/painel/index.html @@ -181,25 +181,38 @@ else if (data["presentes_expediente"] != null){ presentes_ordem_dia = data["presentes_expediente"] } - if( (data["tipo_resultado"] == "Aprovado por unanimidade") || (data["tipo_resultado"] == "Aprovado por maioria") || (data["tipo_resultado"] == "Rejeitado")){ - if(data["tipo_votacao"] == "Nominal") { - jQuery.each(data["votos"], function(index, parlamentar) { - $('
  • ', {text: parlamentar.parlamentar + ' - ' + parlamentar.partido + ' - Voto: ' + parlamentar.voto}).appendTo(presentes); + presentes.append('
    • '); + if( (data["tipo_resultado"] == "Aprovado por Unanimidade") || (data["tipo_resultado"] == "Aprovado por maioria") || (data["tipo_resultado"] == "Rejeitado")) { + if (data["tipo_votacao"] == "Nominal") { + jQuery.each(data["votos"], function (index, parlamentar) { + $('#parlamentares_list').append('') }); } - else{ - jQuery.each(presentes_ordem_dia, function(index, parlamentar) { - $('
  • ', {text: parlamentar.nome + ' - ' + parlamentar.partido}).appendTo(presentes); - }); + else { + jQuery.each(data["votos"], function (index, parlamentar) { + $('#parlamentares_list').append('
    • ') + }); } } else{ - jQuery.each(presentes_ordem_dia, function(index, parlamentar) { - $('
  • ', {text: parlamentar.nome + ' - ' + parlamentar.partido}).appendTo(presentes); - }); + jQuery.each(presentes_ordem_dia, function (index, parlamentar) { + $('#parlamentares_list').append('
    • ') + }); } + presentes.append('
    ' + + parlamentar.parlamentar + + ' ' + + parlamentar.partido + ' ' + + show_voto(parlamentar.voto) + '
    ' + + parlamentar.parlamentar + + ' ' + + parlamentar.partido + '
    ' + + parlamentar.nome + + ' ' + + parlamentar.partido + '
    '); + //console.debug(presentes_ordem_dia) var votacao = $("#votacao") if (data["num_presentes_ordem_dia"] != null) { @@ -280,5 +293,15 @@ }) })(); }); + + function show_voto(voto) { + if (voto == "Sim"){ + return ' Sim ' + } + else if (voto == "Não"){ + return ' Não ' + } + return voto + } From 6ce9d5357fdcdd9e25b35e52ee0a01e7b8b6d326 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 25 Jul 2017 16:33:00 -0300 Subject: [PATCH 04/14] Fix #1275 Fix #1293 --- sapl/painel/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index b6abd9cc5..57ecf5c0e 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -439,7 +439,7 @@ def get_votos(response, materia): def get_votos_nominal(response, materia): - votos = {} + votos = [] if materia.tipo_votacao == 1: tipo_votacao = 'Simbólica' @@ -468,7 +468,7 @@ def get_votos_nominal(response, materia): else: votos_parlamentares = VotoParlamentar.objects.filter( - votacao_id=registro.id) + votacao_id=registro.id).order_by('parlamentar__nome_parlamentar') filiacao = Filiacao.objects.filter( data_desfiliacao__isnull=True, parlamentar__ativo=True) @@ -481,18 +481,18 @@ def get_votos_nominal(response, materia): try: parlamentar_partido[v.parlamentar.nome_parlamentar] except KeyError: - votos.update({v.parlamentar.id: { + votos.append({ 'parlamentar': v.parlamentar.nome_parlamentar, 'voto': str(v.voto), 'partido': str(_('Sem Registro')) - }}) + }) else: - votos.update({v.parlamentar.id: { + votos.append({ 'parlamentar': v.parlamentar.nome_parlamentar, 'voto': str(v.voto), 'partido': parlamentar_partido[ v.parlamentar.nome_parlamentar] - }}) + }) total = (registro.numero_votos_sim + registro.numero_votos_nao + From 0452697d95f6c86278cc4722ebe08c64e9c8d6b6 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 25 Jul 2017 16:54:43 -0300 Subject: [PATCH 05/14] Fix #1299 --- sapl/templates/sessao/mesa.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sapl/templates/sessao/mesa.html b/sapl/templates/sessao/mesa.html index 311a76b87..5f21556f6 100644 --- a/sapl/templates/sessao/mesa.html +++ b/sapl/templates/sessao/mesa.html @@ -20,7 +20,9 @@
    - Escolha da Composição da Mesa Diretora da Sessão Plenária + {% if perms.parlamentares.add_cargomesa %} + Escolha da Composição da Mesa Diretora da Sessão Plenária + {% endif %}
    From 06e04b4b2ccd70a3a40c25bd783a8250fb79dd4c Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Wed, 26 Jul 2017 09:36:21 -0300 Subject: [PATCH 06/14] Fix #1303 --- sapl/templates/sessao/mesa.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sapl/templates/sessao/mesa.html b/sapl/templates/sessao/mesa.html index 5f21556f6..9e046761d 100644 --- a/sapl/templates/sessao/mesa.html +++ b/sapl/templates/sessao/mesa.html @@ -20,7 +20,7 @@
    - {% if perms.parlamentares.add_cargomesa %} + {% if perms.sessao.add_integrantemesa %} Escolha da Composição da Mesa Diretora da Sessão Plenária {% endif %}
    @@ -37,12 +37,12 @@


    - {% if perms.parlamentares.add_cargomesa %} + {% if perms.sessao.add_integrantemesa %} {% endif %}

    - {% if perms.parlamentares.add_composicaomesa %} + {% if perms.sessao.add_integrantemesa %} {% endif %}
    From 6f046b9f4acb98dd3a7951f11e5c52ed4d41e246 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 12:08:54 -0300 Subject: [PATCH 07/14] Novo release --- docker-compose.yml | 2 +- sapl/settings.py | 4 ++-- sapl/templates/protocoloadm/protocolo_list.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a06f2c81c..9b4326ce1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ sapldb: ports: - "5532:5432" sapl: - image: interlegis/sapl:3.1.12-BETA + image: interlegis/sapl:3.1.13-BETA volumes: - sapl_data:/var/interlegis/sapl/data - sapl_media:/var/interlegis/sapl/media diff --git a/sapl/settings.py b/sapl/settings.py index 9bb544a15..5e390d6ee 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -205,8 +205,8 @@ LANGUAGES = ( TIME_ZONE = 'America/Sao_Paulo' USE_I18N = True -USE_L10N = False -USE_TZ = False +USE_L10N = True +USE_TZ = True # DATE_FORMAT = 'N j, Y' DATE_FORMAT = 'd/m/Y' SHORT_DATE_FORMAT = 'd/m/Y' diff --git a/sapl/templates/protocoloadm/protocolo_list.html b/sapl/templates/protocoloadm/protocolo_list.html index 4ae55baf0..8abcb0d7c 100644 --- a/sapl/templates/protocoloadm/protocolo_list.html +++ b/sapl/templates/protocoloadm/protocolo_list.html @@ -20,7 +20,7 @@ Etiqueta Individual
    Assunto: {{ p.assunto_ementa }}
    - Data Protocolo: {{ p.data|date:"d/m/Y" }} - Horário: {{ p.timestamp|date:"H:m:s" }}
    + Data Protocolo: {{ p.data|date:"d/m/Y" }} - Horário: {{ p.hora|date:"H:m:s" }}
    Natureza do Processo: {% if p.tipo_processo == 0 %} Administrativo
    From e506f8f8fb5ed8236f0a4eaf0c4dd372c26f3acb Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 13:35:22 -0300 Subject: [PATCH 08/14] Fixes #1308 --- sapl/sessao/views.py | 10 +++++++--- sapl/templates/sessao/pauta_sessao_detail.html | 18 +++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 009d4d350..9e82b4e0e 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -2289,11 +2289,13 @@ class PautaSessaoDetailView(DetailView): ementa = o.observacao titulo = o.materia numero = o.numero_ordem - + situacao = o.materia.tramitacao_set.last().status + if situacao is None: + situacao = _("Não informada") # Verificar resultado - resultado = o.registrovotacao_set.all() + rv = o.registrovotacao_set.all() if resultado: - resultado = resultado[0].tipo_resultado_votacao.nome + resultado = rv[0].tipo_resultado_votacao.nome else: resultado = _('Matéria não votada') @@ -2306,6 +2308,8 @@ class PautaSessaoDetailView(DetailView): 'titulo': titulo, 'numero': numero, 'resultado': resultado, + 'resultado_observacao': resultado_observacao, + 'situacao': situacao, 'autor': autor } materias_ordem.append(mat) diff --git a/sapl/templates/sessao/pauta_sessao_detail.html b/sapl/templates/sessao/pauta_sessao_detail.html index 1c31aa973..4664e8638 100644 --- a/sapl/templates/sessao/pauta_sessao_detail.html +++ b/sapl/templates/sessao/pauta_sessao_detail.html @@ -25,7 +25,7 @@ {{e.tipo}}:
    -

    {{e.conteudo}}

    +

    {{e.conteudo|safe}}

    {% endfor %} @@ -36,7 +36,7 @@
    Matérias do Expediente - + @@ -45,13 +45,13 @@ {% for m in materia_expediente %} - - - + + {% endfor %}
    Matéria Ementa
    + {{m.numero}} - {{m.titulo}}
    Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }}     		{{m.ementa|safe}}{{m.situacao}}{{m.ementa|safe}}{{m.situacao}}
    @@ -78,7 +78,7 @@
    Matérias da Ordem do Dia - + @@ -87,13 +87,13 @@ {% for m in materias_ordem %} - - - + + {% endfor %}
    Matéria Ementa
    + {{m.numero}} - {{m.titulo}}
    Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }}     		{{m.ementa|safe}}{{m.situacao}}{{m.ementa|safe}}{{m.situacao}}
    From 743c44eb90d5b88575be64a7c25671d443f6d825 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 13:54:32 -0300 Subject: [PATCH 09/14] =?UTF-8?q?Ajusta=20preenchimento=20de=20campos=20de?= =?UTF-8?q?=20protocolo=20mat=C3=A9ria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/protocoloadm/views.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index c478b6f62..e11def026 100644 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -419,12 +419,10 @@ class ProtocoloMateriaView(PermissionRequiredMixin, CreateView): protocolo.numero = ( numero['numero__max'] + 1) if numero['numero__max'] else 1 protocolo.ano = datetime.now().year - protocolo.data = datetime.strptime(datetime.now().strftime("%Y-%m-%d"), - '%Y-%m-%d') - protocolo.hora = datetime.strptime(datetime.now().strftime("%H:%M"), - '%H:%M') - protocolo.timestamp = datetime.strptime( - datetime.now().strftime("%Y-%m-%d %H:%M"), "%Y-%m-%d %H:%M") + protocolo.data = datetime.now().date() + protocolo.hora = datetime.now().time() + protocolo.timestamp = datetime.now() + protocolo.tipo_protocolo = 0 protocolo.tipo_processo = '1' # TODO validar o significado protocolo.anulado = False From 669181cbc379ba1067fd0c93d6a4ab502e367ef1 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 13:57:40 -0300 Subject: [PATCH 10/14] =?UTF-8?q?Conserta=20erro=20de=20portugu=C3=AAs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/protocoloadm/MateriaTemplate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/templates/protocoloadm/MateriaTemplate.html b/sapl/templates/protocoloadm/MateriaTemplate.html index fc490fcc5..05d1f65ad 100644 --- a/sapl/templates/protocoloadm/MateriaTemplate.html +++ b/sapl/templates/protocoloadm/MateriaTemplate.html @@ -3,7 +3,7 @@ {% block base_content %}
    From a38d06da2cd09d4d36a2a6763d57f3fe3265a724 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 14:05:22 -0300 Subject: [PATCH 11/14] =?UTF-8?q?Revertendo=20configura=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20timezone=20do=20settings.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sapl/settings.py b/sapl/settings.py index 5e390d6ee..cefd6b2a8 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -204,9 +204,9 @@ LANGUAGES = ( ) TIME_ZONE = 'America/Sao_Paulo' -USE_I18N = True -USE_L10N = True -USE_TZ = True +USE_I18N = False +USE_L10N = False +USE_TZ = False # DATE_FORMAT = 'N j, Y' DATE_FORMAT = 'd/m/Y' SHORT_DATE_FORMAT = 'd/m/Y' From ca060f0458d785fced46d12995cea82bcaaff0d6 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 14:06:17 -0300 Subject: [PATCH 12/14] Novo release --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9b4326ce1..8b71fe686 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ sapldb: ports: - "5532:5432" sapl: - image: interlegis/sapl:3.1.13-BETA + image: interlegis/sapl:3.1.14-BETA volumes: - sapl_data:/var/interlegis/sapl/data - sapl_media:/var/interlegis/sapl/media From df9eb1c635a035c332792ffe0c6389e35ed971d7 Mon Sep 17 00:00:00 2001 From: Edward Date: Wed, 26 Jul 2017 16:52:15 -0300 Subject: [PATCH 13/14] =?UTF-8?q?HOT-FIX:=20reseta=20valores=20de=20i18n?= =?UTF-8?q?=20e=20localiza=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit reseta valores originais de i18n e localização. --- sapl/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapl/settings.py b/sapl/settings.py index cefd6b2a8..d6590c5b4 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -204,8 +204,8 @@ LANGUAGES = ( ) TIME_ZONE = 'America/Sao_Paulo' -USE_I18N = False -USE_L10N = False +USE_I18N = True +USE_L10N = True USE_TZ = False # DATE_FORMAT = 'N j, Y' DATE_FORMAT = 'd/m/Y' From bbaae5a5bd74b469d1349b4433aebafc26fe79f9 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Jul 2017 16:56:12 -0300 Subject: [PATCH 14/14] Novo Release --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8b71fe686..7b97b49f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ sapldb: ports: - "5532:5432" sapl: - image: interlegis/sapl:3.1.14-BETA + image: interlegis/sapl:3.1.15-BETA volumes: - sapl_data:/var/interlegis/sapl/data - sapl_media:/var/interlegis/sapl/media