Skip to content

Novo layout painel de votação #3814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RogerKoala wants to merge 1 commit into
base: 3.1.x
Choose a base branch
from
Open

Novo layout painel de votação #3814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 157 additions & 41 deletions frontend/src/__apps/painel/scss/painel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,159 @@
:root {
--bg-dark: #121212;
--bg-panel: #1e1e1e;
--text-main: #e0e0e0;
--text-highlight: #4fa64d;
}

.painel-principal {
background: #1c1b1b;
font-family: Verdana;
font-size: x-large;
.text-title {
color: #4fa64d;
margin: 0.5rem;
font-weight: bold;
}
.text-subtitle {
color: #459170;
font-weight: bold;
}
.data-hora {
font-size: 180%;
}

.text-value {
color: white;
}

.logo-painel {
max-width: 100%;
}
.painels {
flex-wrap: wrap;
}
.painel{
margin-top: 1rem;
table {
width: 100%;
}
h2 {
margin-bottom: 0.5rem;
}
#votacao, #oradores_list {
text-align: left;
display: inline-block;
margin-bottom: 1rem;
}
}
body {
background-color: var(--bg-dark);
color: var(--text-main);
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
margin-bottom: 0;
}

.separador-vertical {
border-right: 1px solid #333;
min-height: 100vh;
margin: 0;
}

.text-title {
color: var(--text-highlight);
letter-spacing: 1px;
}

.text-subtitle {
color: #81c784;
font-weight: 600;
}

.parlamentares-grid {
display: grid;
grid-template-columns: repeat(auto-fill, 190px);
width: 100%;
}

.parlamentar-card {
width: 150px;
border-radius: 3px;
overflow: hidden;
position: relative;
}

.foto-container {
border-radius: 3px;
overflow: hidden;
height: 150px;
}

.parlamentar-card img {
width: 100%;
height: 150px;
display: block;
object-fit: fill;
}

.parlamentar-card .nome {
font-weight: bold;
font-size: 0.95rem;
color: #fff;
line-height: 1.1;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
margin-bottom: 2px;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}

.parlamentar-card .partido {
font-size: 0.8rem;
color: #ddd;
font-weight: 600;
text-transform: uppercase;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8);
}

.voto-faixa {
position: absolute;
width: 90px;
height: 90px;
top: -45px;
right: -45px;
transform: rotate(45deg);
display: flex;
align-items: flex-end;
justify-content: center;
color: #fff;
font-weight: 700;
box-shadow: -2px 2px 5px rgba(0, 0, 0, 0.2);
z-index: 10;
line-height: 1;
}

.voto-faixa p {
transform: rotate(-45deg);
font-size: 2rem;
text-transform: uppercase;
}

.voto-sim .voto-faixa {
background-color: #27ae60;
}

.voto-nao .voto-faixa {
background-color: #c0392b;
}

.voto-abstencao .voto-faixa {
background-color: #f39c12;
}

.voto-informado .voto-faixa {
background-color: #d35400;
}

.voto-ausente .voto-faixa {
background-color: #7f8c8d;
}

.table-custom {
color: #ddd;
}

.table-custom tbody td {
padding: 8px;
font-size: 1.1rem;
}

.table-sim {
color: #27ae60;
}

.table-nao {
color: #c0392b;
}

.table-abstencao {
color: #f39c12;
}

.table-total {
color: #194BFA;
}

.logo-painel {
max-height: 150px;
width: auto;
}

#oradores_list tr td {
font-size: 1.2rem;
padding: 5px;
text-align: start;
}

.hora-brasao {
border-top: 1px solid #333;
}
18 changes: 17 additions & 1 deletion sapl/painel/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
SessaoPlenaria, SessaoPlenariaPresenca,
VotoParlamentar, RegistroLeitura)
from sapl.utils import filiacao_data, get_client_ip, sort_lista_chave
from image_cropping.utils import get_backend

from .models import Cronometro

Expand Down Expand Up @@ -382,6 +383,7 @@ def get_presentes(pk, response, materia):
})

presentes_list = []

for p in presentes:
legislatura = sessao.legislatura
# Recupera os mandatos daquele parlamentar
Expand All @@ -394,10 +396,24 @@ def get_presentes(pk, response, materia):
else:
partido = filiacao

if p.parlamentar.fotografia:
thumbnail_url = get_backend().get_thumbnail_url(
p.parlamentar.fotografia,
{
'size': (128, 128),
'box': p.parlamentar.cropping,
'crop': True,
'detail': True,
}
)
else:
thumbnail_url = False

presentes_list.append(
{'id': p.id,
'parlamentar_id': p.parlamentar.id,
'nome': p.parlamentar.nome_parlamentar,
'fotografia':thumbnail_url,
'partido': partido,
'voto': ''
})
Expand Down Expand Up @@ -476,7 +492,7 @@ def get_votos(response, materia, mostrar_voto):
'numero_abstencoes': 0,
'registro': None,
'total_votos': 0,
'tipo_resultado': 'Ainda não foi votada.',
'tipo_resultado': 'Em votação.',
})

if materia.tipo_votacao == 2:
Expand Down
Loading