DGNum/kadenios
17
0
Fork 0
Code Issues 12 Pull requests Projects Wiki Activity

Rajoute la liste des élections non archivées

Browse source
This commit is contained in:
Tom Hubrecht 2021-03-20 12:25:01 +01:00
parent dcbfbfd77b
commit 79f5cdfc2b
4 changed files with 82 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
elections/templates/elections/election_created.html Normal file
View file

@ -0,0 +1,62 @@
{% extends "base.html" %}
{% load i18n %}
{% block content %}
<div class="level">
<div class="level-left">
<div class="level-item">
<h1 class="title">{% trans "Liste des élections créées" %}</h1>
</div>
</div>
<div class="level-right">
<div class="level-item">
<a class="button is-light is-outlined is-primary" href={% url 'election.create' %}>
<span class="icon">
<i class="fas fa-plus"></i>
</span>
<span>{% trans "Créer une élection" %}</span>
</a>
</div>
</div>
</div>
<hr>
{% for e in election_list %}
<div class="message is-primary">
<div class="message-header is-size-6 is-radiusless">
<div>
<span class="mr-2">{{ e.name }}</span>
<span class="tag is-primary is-light">{{ e.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon has-text-primary-light">
<i class="fas fa-long-arrow-alt-right"></i>
</span>
<span class="tag is-primary is-light">{{ e.end_date|date:"d/m/Y H:i" }}</span>
{% if e.tallied %}
<span class="tag is-success is-light ml-3">{% trans "Élection dépouillée" %}</span>
{% endif %}
{% if e.results_public %}
<span class="tag is-info is-light ml-3">{% trans "Élection publiée" %}</span>
{% endif %}
{% if e.archived %}
<span class="tag is-danger is-light ml-3">{% trans "Élection archivée" %}</span>
{% endif %}
</div>
<a class="has-text-primary-light" href="{% url 'election.admin' e.pk %}">
<span class="icon">
<i class="fas fa-tools"></i>
</span>
<span>{% trans "" %}</span>
</a>
</div>
<p class="message-body">
{{ e.description|linebreaksbr }}
</p>
</div>
{% endfor %}
{% endblock %}

34
elections/templates/elections/election_list.html
View file

@ -4,36 +4,22 @@
{% block content %}
<div class="level">
<div class="level-left">
<div class="level-item">
<h1 class="title">{% trans "Liste des élections créées" %}</h1>
</div>
</div>
<div class="level-right">
<div class="level-item">
<a class="button is-light is-outlined is-primary" href={% url 'election.create' %}>
<span class="icon">
<i class="fas fa-plus"></i>
</span>
<span>{% trans "Créer une élection" %}</span>
</a>
</div>
</div>
</div>
<h1 class="title">{% trans "Liste des élections" %}</h1>
<hr>
{% for e in election_list %}
<div class="message is-primary">
<div class="message-header is-size-6 is-radiusless">
<div>
<span class="mr-2">{{ e.name }}</span>
<span class="tag is-primary is-light">{{ e.start_date|date:"d/m/Y H:i" }}</span>
<a href="{% url 'election.view' e.pk %}">{{ e.name }}</a>
<span class="tag is-primary is-light ml-3">{{ e.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon has-text-primary-light">
<i class="fas fa-long-arrow-alt-right"></i>
</span>
<span class="tag is-primary is-light">{{ e.end_date|date:"d/m/Y H:i" }}</span>
</div>
<div>
{% if e.tallied %}
<span class="tag is-success is-light ml-3">{% trans "Élection dépouillée" %}</span>
{% endif %}
@ -41,17 +27,7 @@
{% if e.results_public %}
<span class="tag is-info is-light ml-3">{% trans "Élection publiée" %}</span>
{% endif %}
{% if e.archived %}
<span class="tag is-danger is-light ml-3">{% trans "Élection archivée" %}</span>
{% endif %}
</div>
<a class="has-text-primary-light" href="{% url 'election.admin' e.pk %}">
<span class="icon">
<i class="fas fa-tools"></i>
</span>
<span>{% trans "" %}</span>
</a>
</div>
<p class="message-body">
{{ e.description|linebreaksbr }}

3
elections/urls.py
View file

@ -5,7 +5,7 @@ from . import views
urlpatterns = [
# Admin views
path("create/", views.ElectionCreateView.as_view(), name="election.create"),
path("created/", views.ElectionListView.as_view(), name="election.created"),
path("created/", views.ElectionCreatedView.as_view(), name="election.created"),
path("admin/<int:pk>", views.ElectionAdminView.as_view(), name="election.admin"),
path(
"mail-voters/<int:pk>",
@ -60,6 +60,7 @@ urlpatterns = [
name="election.del-option",
),
# Common views
path("list", views.ElectionListView.as_view(), name="election.list"),
path("view/<int:pk>", views.ElectionView.as_view(), name="election.view"),
path(
"view/<int:pk>/voters",

16
elections/views.py
View file

@ -157,9 +157,9 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
return super().form_valid(form)
class ElectionListView(CreatorOnlyMixin, ListView):
class ElectionCreatedView(CreatorOnlyMixin, ListView):
model = Election
template_name = "elections/election_list.html"
template_name = "elections/election_created.html"
class ElectionUpdateView(CreatorOnlyEditMixin, SuccessMessageMixin, UpdateView):
@ -195,7 +195,9 @@ class ElectionTallyView(CreatorOnlyMixin, SingleObjectMixin, BackgroundUpdateVie
return super().get(request, *args, **kwargs)
class ElectionChangePublicationView(CreatorOnlyEditMixin, BackgroundUpdateView):
class ElectionChangePublicationView(
CreatorOnlyMixin, SingleObjectMixin, BackgroundUpdateView
):
model = Election
pattern_name = "election.admin"
@ -332,6 +334,14 @@ class DelOptionView(CreatorOnlyEditMixin, BackgroundUpdateView):
# #############################################################################
class ElectionListView(ListView):
model = Election
template_name = "elections/election_list.html"
def get_queryset(self):
return super().get_queryset().filter(archived=False)
class ElectionView(DetailView):
model = Election
template_name = "elections/election.html"