From fd91e3c4bbb07deaf2a05d82716e1eae10aac765 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Mon, 18 Sep 2017 17:13:57 -0300 Subject: [PATCH 1/5] Adiciona teste de vie em SessaoPlenaria --- sapl/base/tests/test_form.py | 1 + sapl/sessao/tests/test_sessao_view.py | 42 +++++++++++++-------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/sapl/base/tests/test_form.py b/sapl/base/tests/test_form.py index 35f1c82bf..03362fdcd 100644 --- a/sapl/base/tests/test_form.py +++ b/sapl/base/tests/test_form.py @@ -1,5 +1,6 @@ import pytest from django.utils.translation import ugettext_lazy as _ +from model_mommy import mommy from sapl.base.forms import CasaLegislativaForm diff --git a/sapl/sessao/tests/test_sessao_view.py b/sapl/sessao/tests/test_sessao_view.py index 50a94d970..cd407dc2f 100644 --- a/sapl/sessao/tests/test_sessao_view.py +++ b/sapl/sessao/tests/test_sessao_view.py @@ -3,30 +3,30 @@ from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ from model_mommy import mommy -from sapl.parlamentares.models import Legislatura, SessaoLegislativa +from sapl.parlamentares.models import Legislatura, Partido, SessaoLegislativa +from sapl.sessao import forms from sapl.sessao.models import SessaoPlenaria, TipoSessaoPlenaria - -@pytest.mark.django_db(transaction=False) +pytest.mark.django_db(transaction=False) def test_incluir_sessao_plenaria_submit(admin_client): - legislatura = mommy.make(Legislatura) - sessao = mommy.make(SessaoLegislativa) - tipo = mommy.make(TipoSessaoPlenaria) - - response = admin_client.post(reverse('sapl.sessao:sessaoplenaria_create'), - {'legislatura': str(legislatura.pk), - 'numero': '1', - 'tipo': str(tipo.pk), - 'sessao_legislativa': str(sessao.pk), - 'data_inicio': '10/11/2017', - 'hora_inicio': '10:10' - }, follow=True) - - assert response.status_code == 200 - - sessao_plenaria = SessaoPlenaria.objects.first() - assert sessao_plenaria.tipo == tipo - + legislatura = mommy.make(Legislatura) + sessao = mommy.make(SessaoLegislativa) + tipo = mommy.make(TipoSessaoPlenaria) + + response = admin_client.post(reverse('sapl.sessao:sessaoplenaria_create'), + {'legislatura': str(legislatura.pk), + 'numero': '1', + 'tipo': str(tipo.pk), + 'sessao_legislativa': str(sessao.pk), + 'data_inicio': '10/11/2017', + 'hora_inicio': '10:10' + }, + follow=True) + + assert response.status_code == 200 + + sessao = SessaoPlenaria.objects.first() + assert sessao.tipo == tipo @pytest.mark.django_db(transaction=False) def test_incluir_sessao_errors(admin_client): From aaf4b4330d34687b2fcafdbf4a71c84d6f32a6d8 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Tue, 19 Sep 2017 13:44:43 -0300 Subject: [PATCH 2/5] Adiciona teste de view no CasaLegislativa e TipoAutor --- sapl/base/tests/test_form.py | 1 - sapl/sessao/tests/test_sessao_view.py | 38 ++++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/sapl/base/tests/test_form.py b/sapl/base/tests/test_form.py index 03362fdcd..35f1c82bf 100644 --- a/sapl/base/tests/test_form.py +++ b/sapl/base/tests/test_form.py @@ -1,6 +1,5 @@ import pytest from django.utils.translation import ugettext_lazy as _ -from model_mommy import mommy from sapl.base.forms import CasaLegislativaForm diff --git a/sapl/sessao/tests/test_sessao_view.py b/sapl/sessao/tests/test_sessao_view.py index cd407dc2f..4c8d18279 100644 --- a/sapl/sessao/tests/test_sessao_view.py +++ b/sapl/sessao/tests/test_sessao_view.py @@ -7,26 +7,28 @@ from sapl.parlamentares.models import Legislatura, Partido, SessaoLegislativa from sapl.sessao import forms from sapl.sessao.models import SessaoPlenaria, TipoSessaoPlenaria + pytest.mark.django_db(transaction=False) def test_incluir_sessao_plenaria_submit(admin_client): - legislatura = mommy.make(Legislatura) - sessao = mommy.make(SessaoLegislativa) - tipo = mommy.make(TipoSessaoPlenaria) - - response = admin_client.post(reverse('sapl.sessao:sessaoplenaria_create'), - {'legislatura': str(legislatura.pk), - 'numero': '1', - 'tipo': str(tipo.pk), - 'sessao_legislativa': str(sessao.pk), - 'data_inicio': '10/11/2017', - 'hora_inicio': '10:10' - }, - follow=True) - - assert response.status_code == 200 - - sessao = SessaoPlenaria.objects.first() - assert sessao.tipo == tipo + legislatura = mommy.make(Legislatura) + sessao = mommy.make(SessaoLegislativa) + tipo = mommy.make(TipoSessaoPlenaria) + + response = admin_client.post(reverse('sapl.sessao:sessaoplenaria_create'), + {'legislatura': str(legislatura.pk), + 'numero': '1', + 'tipo': str(tipo.pk), + 'sessao_legislativa': str(sessao.pk), + 'data_inicio': '10/11/2017', + 'hora_inicio': '10:10' + }, + follow=True) + + assert response.status_code == 200 + + sessao_plenaria = SessaoPlenaria.objects.first() + assert sessao_plenaria.tipo == tipo + @pytest.mark.django_db(transaction=False) def test_incluir_sessao_errors(admin_client): From 915325e74edd49022c44536a4f29fef70180ea27 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Tue, 19 Sep 2017 16:27:38 -0300 Subject: [PATCH 3/5] Corrigi erros relacionados a PEP8 --- sapl/sessao/tests/test_sessao_view.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sapl/sessao/tests/test_sessao_view.py b/sapl/sessao/tests/test_sessao_view.py index 4c8d18279..50a94d970 100644 --- a/sapl/sessao/tests/test_sessao_view.py +++ b/sapl/sessao/tests/test_sessao_view.py @@ -3,12 +3,11 @@ from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ from model_mommy import mommy -from sapl.parlamentares.models import Legislatura, Partido, SessaoLegislativa -from sapl.sessao import forms +from sapl.parlamentares.models import Legislatura, SessaoLegislativa from sapl.sessao.models import SessaoPlenaria, TipoSessaoPlenaria -pytest.mark.django_db(transaction=False) +@pytest.mark.django_db(transaction=False) def test_incluir_sessao_plenaria_submit(admin_client): legislatura = mommy.make(Legislatura) sessao = mommy.make(SessaoLegislativa) @@ -21,8 +20,7 @@ def test_incluir_sessao_plenaria_submit(admin_client): 'sessao_legislativa': str(sessao.pk), 'data_inicio': '10/11/2017', 'hora_inicio': '10:10' - }, - follow=True) + }, follow=True) assert response.status_code == 200 From f67164154c7ef301fba17e2124708cf8101c030b Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Thu, 21 Sep 2017 16:31:47 -0300 Subject: [PATCH 4/5] Adiciona logotipo no painel --- sapl/painel/views.py | 5 +++++ sapl/templates/painel/index.html | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index e4c616512..873c0e93a 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -9,6 +9,7 @@ from django.http.response import Http404, HttpResponseRedirect from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ +from sapl.base.models import CasaLegislativa from sapl.crud.base import Crud from sapl.painel.apps import AppConfig from sapl.parlamentares.models import Votante @@ -368,6 +369,9 @@ def get_votos(response, materia): def get_dados_painel(request, pk): sessao = SessaoPlenaria.objects.get(id=pk) + casa = CasaLegislativa.objects.first() + imagem = casa.logotipo.url + response = { 'sessao_plenaria': str(sessao), 'sessao_plenaria_data': sessao.data_inicio.strftime('%d/%m/%Y'), @@ -375,6 +379,7 @@ def get_dados_painel(request, pk): 'cronometro_aparte': get_cronometro_status(request, 'aparte'), 'cronometro_discurso': get_cronometro_status(request, 'discurso'), 'cronometro_ordem': get_cronometro_status(request, 'ordem'), + 'imagem': imagem, } ordem_dia = get_materia_aberta(pk) diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html index 68e5cdf78..5ae6a7d3a 100644 --- a/sapl/templates/painel/index.html +++ b/sapl/templates/painel/index.html @@ -27,7 +27,13 @@ font-family: Verdana; } } + .center { + margin: auto; + width: 20%; + height: 20%; + } + @@ -45,6 +51,10 @@ +
+ +
+

@@ -168,6 +178,8 @@ $("#message").text(""); } + $("#logo-painel").attr("src", data["imagem"]); + var presentes = $("#parlamentares"); var votacao = $("#votacao"); $("#votacao").text(''); From 736624cde61d3de637c8b3e108e0f6de7d0527c2 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Tue, 26 Sep 2017 14:45:34 -0300 Subject: [PATCH 5/5] Arruma o tamanho do logo --- sapl/templates/painel/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html index 5ae6a7d3a..004d26488 100644 --- a/sapl/templates/painel/index.html +++ b/sapl/templates/painel/index.html @@ -29,14 +29,14 @@ } .center { margin: auto; - width: 20%; - height: 20%; + width: 15%; + } - +

@@ -52,7 +52,7 @@
- +