Merge pull request EGCETSII#23 from Decide-Part-Rota/Rota1-005

Rota1-005
Decide-Part-Rota · Nov 24, 2022 · 37efa48 · 37efa48
2 parents ecd1647 + 7e10a81
commit 37efa48
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 3 deletions.
diff --git a/decide/booth/templates/booth/booth.html b/decide/booth/templates/booth/booth.html
@@ -81,7 +81,7 @@ <h2>[[ voting.question.desc ]]</h2>
     <script src="{% static "crypto/elgamal.js" %}"></script>
 
     <!-- Vuejs -->
-    <script src="https://unpkg.com/vue"></script>
+    <script src="https://unpkg.com/vue@2.7.10"></script>
     <script src="https://unpkg.com/babel-polyfill@latest/dist/polyfill.min.js"></script>
     <script src="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.js"></script>
 

diff --git a/decide/visualizer/templates/visualizer/visualizer.html b/decide/visualizer/templates/visualizer/visualizer.html
@@ -48,7 +48,7 @@ <h2 class="heading">Resultados:</h2>
 
 {% block extrabody %}
     <!-- Vuejs -->
-    <script src="https://unpkg.com/vue"></script>
+    <script src="https://unpkg.com/vue@2.7.10"></script>
     <script src="https://unpkg.com/babel-polyfill@latest/dist/polyfill.min.js"></script>
     <script src="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.js"></script>
 

diff --git a/decide/voting/filters.py b/decide/voting/filters.py
@@ -11,6 +11,7 @@ def lookups(self, request, model_admin):
             ('S', 'Started'),
             ('R', 'Running'),
             ('F', 'Finished'),
+            ('V', 'Visibility')
         ]
 
     def queryset(self, request, queryset):

diff --git a/decide/voting/migrations/0004_voting_visibility.py b/decide/voting/migrations/0004_voting_visibility.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0 on 2022-11-22 18:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('voting', '0003_auto_20180605_0842'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='voting',
+            name='visibility',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/decide/voting/migrations/0005_auto_20221122_1928.py b/decide/voting/migrations/0005_auto_20221122_1928.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0 on 2022-11-22 19:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('voting', '0004_voting_visibility'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='voting',
+            name='visibility',
+            field=models.BooleanField(),
+        ),
+    ]
diff --git a/decide/voting/models.py b/decide/voting/models.py
@@ -36,6 +36,8 @@ class Voting(models.Model):
     start_date = models.DateTimeField(blank=True, null=True)
     end_date = models.DateTimeField(blank=True, null=True)
 
+    visibility = models.BooleanField()
+
     pub_key = models.OneToOneField(Key, related_name='voting', blank=True, null=True, on_delete=models.SET_NULL)
     auths = models.ManyToManyField(Auth, related_name='votings')
 

diff --git a/decide/voting/static/voting/style.css b/decide/voting/static/voting/style.css
@@ -0,0 +1,17 @@
+.boton-personalizado {
+    text-decoration: none;
+    font-weight: 600;
+    font-size: 20px;
+    color: #333;
+    padding: 5px 20px;
+    background-color: #ffd27d;
+    border-color: #d8d8d8;
+    border-width: 3px;
+    border-style: solid;
+    border-radius: 35px;
+}
+
+/* Este es el estilo al poner el cursor encima del boton */
+.boton-personalizado:hover {
+    background-color: #000;
+}
diff --git a/decide/voting/templates/voting/listVoting.html b/decide/voting/templates/voting/listVoting.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+
+{% load i18n static %}
+
+{% block extrahead %}
+    <link type="text/css" rel="stylesheet"
+         href="https://unpkg.com/bootstrap/dist/css/bootstrap.min.css" />
+    <link type="text/css" rel="stylesheet"
+         href="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.css" />
+    <link type="text/css" rel="stylesheet" href="{% static "voting/style.css" %}" />
+{% endblock %}
+
+
+{% block content %}
+
+    <h1 style="text-align:center">Listado de Votaciones</h1>
+
+    <body>
+
+        <table class="table table-bordered">
+
+            <thead>
+
+                <tr>
+
+                    <td>ID</td>
+                    <td>Name</td>
+                    <td>Description</td>
+                    <td>Visibility</td>
+                    <td></td>
+
+                </tr>
+
+            </thead>
+
+            <tbody>
+
+                {% if votaciones %}
+
+                    <!-- Cojo la colección votaciones que le paso en views.py --> 
+                    {% for votacion in votaciones %} 
+
+                        <tr>
+
+                            <td>{{votacion.id}}</td>
+                            <td>{{votacion.name}}</td>
+                            <td>{{votacion.desc}}</td>
+                            <td>{{votacion.visibility}}</td>
+
+                            <td>
+
+                                <a class="boton-personalizado" href="http://127.0.0.1:8000/booth/{{votacion.id}}">
+
+                                    Go Vote
+
+                                </a>
+
+                            </td>
+
+                        </tr>
+
+                    {% endfor %}
+
+                {% else %}
+
+                <h3 style="text-align:center">Listado de Votaciones</h3>
+
+                {% endif %}
+
+            </tbody>
+
+        </table>
+
+    </body>
+
+{% endblock %}
diff --git a/decide/voting/urls.py b/decide/voting/urls.py
@@ -3,6 +3,8 @@
 
 
 urlpatterns = [
+    #Acceder al listado con localhost:8000/voting/listadoVotaciones
+    path('listadoVotaciones', views.VotacionList.mostrarVotacionesPublicas),
     path('', views.VotingView.as_view(), name='voting'),
     path('<int:voting_id>/', views.VotingUpdate.as_view(), name='voting'),
 ]
diff --git a/decide/voting/views.py b/decide/voting/views.py
@@ -1,15 +1,30 @@
 import django_filters.rest_framework
 from django.conf import settings
 from django.utils import timezone
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, render
 from rest_framework import generics, status
 from rest_framework.response import Response
+from django.views.generic import TemplateView
+
 
 from .models import Question, QuestionOption, Voting
 from .serializers import SimpleVotingSerializer, VotingSerializer
 from base.perms import UserIsStaff
 from base.models import Auth
 
+#Clase para listar todas las votaciones.
+class VotacionList(TemplateView):
+    template_name = 'voting/listVoting.html'
+
+    #Método para mostrar un listado de todas las votaciones.
+    def mostrarVotacionesPublicas(request):
+        votaciones = Voting.objects.all()
+
+        data={
+            'votaciones': votaciones
+        }
+
+        return render(request, 'voting/listVoting.html', data)
 
 class VotingView(generics.ListCreateAPIView):
     queryset = Voting.objects.all()