SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge 736624cde6 into 6d5bbcba5c

pull/1501/merge
Mariana Mendes 8 years ago
committed by GitHub
parent
6d5bbcba5c 736624cde6
commit
88785a2907
2 changed files with 18 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      sapl/painel/views.py
  2. 14
      sapl/templates/painel/index.html

5
sapl/painel/views.py
View File

@ -9,6 +9,7 @@ from django.http.response import Http404, HttpResponseRedirect
from django.shortcuts import render from django.shortcuts import render
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from sapl.base.models import CasaLegislativa
from sapl.crud.base import Crud from sapl.crud.base import Crud
from sapl.painel.apps import AppConfig from sapl.painel.apps import AppConfig
from sapl.parlamentares.models import Votante from sapl.parlamentares.models import Votante
@ -368,6 +369,9 @@ def get_votos(response, materia):
def get_dados_painel(request, pk): def get_dados_painel(request, pk):
sessao = SessaoPlenaria.objects.get(id=pk) sessao = SessaoPlenaria.objects.get(id=pk)
casa = CasaLegislativa.objects.first()
imagem = casa.logotipo.url
response = { response = {
'sessao_plenaria': str(sessao), 'sessao_plenaria': str(sessao),
'sessao_plenaria_data': sessao.data_inicio.strftime('%d/%m/%Y'), '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_aparte': get_cronometro_status(request, 'aparte'),
'cronometro_discurso': get_cronometro_status(request, 'discurso'), 'cronometro_discurso': get_cronometro_status(request, 'discurso'),
'cronometro_ordem': get_cronometro_status(request, 'ordem'), 'cronometro_ordem': get_cronometro_status(request, 'ordem'),
'imagem': imagem,
} }
ordem_dia = get_materia_aberta(pk) ordem_dia = get_materia_aberta(pk)

14
sapl/templates/painel/index.html
View File

@ -27,10 +27,16 @@
font-family: Verdana; font-family: Verdana;
} }
} }
.center {
margin: auto;
width: 15%;
}
</style> </style>
</head> </head>
<body> <body>
<audio type="hidden" id="audio" src="{% static 'audio/ring.mp3' %}"> </audio> <audio type="hidden" id="audio" src="{% static 'audio/ring.mp3' %}"></audio>
<h1 id="title"></h1> <h1 id="title"></h1>
<input id="json_url" type="hidden" value="{% url 'sapl.painel:dados_painel' sessao_id %}"> <input id="json_url" type="hidden" value="{% url 'sapl.painel:dados_painel' sessao_id %}">
@ -45,6 +51,10 @@
</tr> </tr>
</table> </table>
<div class="center">
<img src="" id="logo-painel" alt="" width="100%"/>
</div>
<h2><font color="red"><p align="center"><span id="message"></span></p></font></h2> <h2><font color="red"><p align="center"><span id="message"></span></p></font></h2>
<h1><font color="white"><p align="center"><span id="relogio"></span></p></font></h1> <h1><font color="white"><p align="center"><span id="relogio"></span></p></font></h1>
@ -168,6 +178,8 @@
$("#message").text(""); $("#message").text("");
} }
$("#logo-painel").attr("src", data["imagem"]);
var presentes = $("#parlamentares"); var presentes = $("#parlamentares");
var votacao = $("#votacao"); var votacao = $("#votacao");
$("#votacao").text(''); $("#votacao").text('');

Write Preview
Loading…
Cancel
Save