From 74d02b8f94ab055ab01966555332711a8372cea9 Mon Sep 17 00:00:00 2001
From: AlGouvea <alvarohsgouvea@gmail.com>
Date: Wed, 14 Jul 2021 11:21:18 -0300
Subject: [PATCH] Alteracoes na apresentacao de votos parlamentares

---
 frontend/src/__apps/painel/main.js |  2 +-
 sapl/templates/painel/index.html   | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frontend/src/__apps/painel/main.js b/frontend/src/__apps/painel/main.js
index 1440336bc..d4da987a3 100644
--- a/frontend/src/__apps/painel/main.js
+++ b/frontend/src/__apps/painel/main.js
@@ -93,7 +93,7 @@ const v = new Vue({ // eslint-disable-line
     },
     fetchData () {
       // TODO: how to get no hardcoded URL?
-      $.get('/painel/704/dados', function (response) {
+      $.get('/painel/2867/dados', function (response) {
         this.brasao = response.brasao
         this.painel_aberto = response.status_painel
         this.sessao_finalizada = response.sessao_finalizada
diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html
index 4a753909f..4a800ac30 100644
--- a/sapl/templates/painel/index.html
+++ b/sapl/templates/painel/index.html
@@ -36,6 +36,17 @@
     <div id="app-painel">
       <audio type="hidden" id="audio" src="{% webpack_static 'audio/ring.mp3' %}"></audio>
 
+      <div class="row justify-content-center" v-if="brasao != ''">
+        <img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% webpack_static 'img/logo.png' %}{% endif %}"
+          alt="Logo" class="img-responsive" style="height: 20vh">
+        </span>
+      </div>
+      <div class="row d-flex justify-content-center" v-if="brasao != ''">
+        <div class="col-md-4" style="text-align: center;">
+          {% if nome %}{{ nome }}{% else %}{% trans 'Câmara/Assembléia não configurada'%}{% endif %}
+        </div>
+      </div>
+
       <div class="d-flex justify-content-center">
         <h1 id="sessao_plenaria" class="title text-title">[[ sessao_plenaria ]]</h1>
       </div>
@@ -46,12 +57,6 @@
         <div class="col text-center">
           <span id="sessao_plenaria_hora_inicio" class="text-value">[[ sessao_plenaria_hora_inicio ]]</span>
         </div>
-      </div>    
-
-      <div class="row justify-content-center" v-if="brasao != ''">
-        <div class="col-1">
-          <img v-bind:src="brasao" id="logo-painel" class="logo-painel" alt="Brasão"/>
-        </div>
       </div>
 
       <div class="row justify-content-center">
@@ -70,7 +75,7 @@
               <h2 class="text-subtitle">Parlamentares</h2>
               <div v-if="painel_aberto">
                 <table>
-                    <tbody v-for="(p, voto) in presentes">
+                    <tbody v-for="p in presentes">
                     <tr>
                         <td style="padding-right:20px;" v-bind:style="{ color: p.color}">
                           [[ p.nome]]
@@ -78,8 +83,8 @@
                         <td style="padding-right:20px;" v-bind:style="{ color: p.color}">
                           [[ p.partido ]]
                         </td>
-                        <td v-if="p.voto !== ''">
-                            [[p.color]]
+                        <td v-if="p.voto !== ''" style="padding-right:20px;" v-bind:style="{ color: p.color}">
+                            [[p.voto]]
                         </td>
                     </tr>
                     </tbody>