From 9c78b60ddc95e5c853ad8ef2ce2a3f56283891e1 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 16 Dec 2016 18:59:15 +0100 Subject: [PATCH] adds provisional content on booths show and officers assign --- app/assets/stylesheets/admin.scss | 10 +++ app/views/admin/poll/booths/show.html.erb | 87 ++++++++++++++++++- app/views/admin/poll/polls/_officers.html.erb | 62 +++++++++++++ 3 files changed, 155 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index adc166d96..89bed6d21 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -5,6 +5,7 @@ // 03. List elements // 04. Stats // 05. Management +// 06. Polls // // 01. Global styles @@ -474,3 +475,12 @@ table.investment-projects-summary { background: #e0e0e0; } } + +// 06. Polls +// ----------------- + +.count-error { + background: $alert-bg !important; + color: $color-alert; + font-weight: bold; +} diff --git a/app/views/admin/poll/booths/show.html.erb b/app/views/admin/poll/booths/show.html.erb index 4d21f32e3..c72fd525d 100644 --- a/app/views/admin/poll/booths/show.html.erb +++ b/app/views/admin/poll/booths/show.html.erb @@ -3,13 +3,92 @@

- <%= @booth.name %> + Poll 3: <%= @booth.name %>

-<%= link_to t("admin.actions.edit"), - edit_admin_booth_path(@booth), - class: "button hollow float-right" %>

<%= t("admin.booths.show.location") %>: <%= @booth.location %>

+ +
+ + +
+

Lista de presidentes de mesa

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
FechaPresidente de mesaEmail
13/02/2016Clemente Padilla Oterouser5@consul.dev
13/02/2016Ana Luisa Ceja Benítezuser7@consul.dev
14/02/2016Clemente Padilla Oterouser5@consul.dev
+
+ +
+

Lista de recuentos

+ + + + + + + + + + + + + + + + + + + + + + + + + +
FechaVotos (Presidente de mesa)Votos (Admin)
13/02/2016320320
14/02/2016160140
15/02/2016226226
+
+
diff --git a/app/views/admin/poll/polls/_officers.html.erb b/app/views/admin/poll/polls/_officers.html.erb index 11b4cce50..106bff526 100644 --- a/app/views/admin/poll/polls/_officers.html.erb +++ b/app/views/admin/poll/polls/_officers.html.erb @@ -26,3 +26,65 @@ <% end %> + + +

Clemente padilla Otero

+

user2@consul.dev

+ + +
+ Nuevo turno +
+ + +
+ +
+ + +
+ +
+ +
+
+ +Añadir nuevo turno + +

Turnos asignados

+ + + + + + + + + + + + + + + + + + + + + + + + +
FechaUrna
13/02/2016Urna Moncloa + <%= link_to "Eliminar turno", "#", class: "button hollow alert" %> +
14/02/2016Urna Moncloa + <%= link_to "Eliminar turno", "#", class: "button hollow alert" %> +
15/02/2016Urna Chamartín + <%= link_to "Eliminar turno", "#", class: "button hollow alert" %> +
+