Compare commits
5 commits
main
...
thubrecht/
| Author | SHA1 | Date | |
|---|---|---|---|
| 3438b32749 | |||
| 867f8f86d6 | |||
| d975792cde | |||
| 6d98f63f0b | |||
| f4f5611eaf |
109 changed files with 1730 additions and 3406 deletions
|
|
@ -1 +0,0 @@
|
|||
localhost
|
||||
|
|
@ -1 +0,0 @@
|
|||
Kadenios <kadenios@localhost>
|
||||
|
|
@ -1 +0,0 @@
|
|||
insecure-secret-key
|
||||
|
|
@ -1 +0,0 @@
|
|||
kadenios@localhost
|
||||
1
.envrc
1
.envrc
|
|
@ -1 +0,0 @@
|
|||
use nix
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -11,9 +11,7 @@
|
|||
|
||||
venv/
|
||||
.python-version
|
||||
pyrightconfig.json
|
||||
|
||||
*.sqlite3
|
||||
|
||||
.vscode
|
||||
.direnv
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
diff --git a/src/authens/utils.py b/src/authens/utils.py
|
||||
index 7306506..36063b6 100644
|
||||
--- a/src/authens/utils.py
|
||||
+++ b/src/authens/utils.py
|
||||
@@ -16,7 +16,7 @@ def get_cas_client(request):
|
||||
service_url=urlunparse(
|
||||
(request.scheme, request.get_host(), request.path, "", "", "")
|
||||
),
|
||||
- server_url="https://cas.eleves.ens.fr/",
|
||||
+ server_url="https://cas-eleves.dgnum.eu/",
|
||||
)
|
||||
21
LICENSE
21
LICENSE
|
|
@ -1,21 +0,0 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2023 Klub Dev ENS
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
19
README.md
19
README.md
|
|
@ -15,7 +15,7 @@ Debian et dérivées (Ubuntu, ...) :
|
|||
sudo apt-get install python3-pip python3-dev python3-venv sqlite3
|
||||
|
||||
Si vous décidez d'utiliser un environnement virtuel Python (virtualenv;
|
||||
fortement conseillé), déplacez-vous dans le dossier où est installé kadenios
|
||||
fortement conseillé), déplacez-vous dans le dossier où est installé GestioCOF
|
||||
(le dossier où se trouve ce README), et créez-le maintenant :
|
||||
|
||||
python3 -m venv venv
|
||||
|
|
@ -26,18 +26,11 @@ Pour l'activer, il faut taper
|
|||
|
||||
depuis le même dossier.
|
||||
|
||||
Une autre solution est d'utiliser [`pyenv`](https://github.com/pyenv/pyenv) et
|
||||
[`pyenv-virtualenv`](https://github.com/pyenv/pyenv-virtualenv).
|
||||
|
||||
pyenv install 3.7.3
|
||||
pyenv virtualenv 3.7.3 kadenios
|
||||
pyenv local kadenios
|
||||
|
||||
Vous pouvez maintenant installer les dépendances Python depuis le fichier
|
||||
`requirements-dev.txt` :
|
||||
`requirements-devel.txt` :
|
||||
|
||||
pip install -U pip
|
||||
pip install -r requirements-dev.txt
|
||||
pip install -U pip # parfois nécessaire la première fois
|
||||
pip install -r requirements-devel.txt
|
||||
|
||||
Nous avons un git hook de pre-commit pour formatter et vérifier que votre code
|
||||
vérifie nos conventions. Pour bénéficier des mises à jour du hook, préférez
|
||||
|
|
@ -53,11 +46,11 @@ Il ne vous reste plus qu'à initialiser les modèles de Django :
|
|||
|
||||
Il vous faut ensuite créer un superutilisateur :
|
||||
|
||||
./manage.py createadmin {username} {password} --superuser
|
||||
./manage.py createsuperuser
|
||||
|
||||
Vous êtes prêts à développer ! Lancer Kadenios en faisant
|
||||
|
||||
./manage.py runserver
|
||||
python manage.py runserver
|
||||
|
||||
## Fonctionnalités
|
||||
|
||||
|
|
|
|||
210
app/settings.py
210
app/settings.py
|
|
@ -1,210 +0,0 @@
|
|||
"""
|
||||
Django settings for the kadenios project
|
||||
"""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from loadcredential import Credentials
|
||||
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
credentials = Credentials(env_prefix="KADENIOS_")
|
||||
|
||||
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
|
||||
# WARNING: keep the secret key used in production secret!
|
||||
SECRET_KEY = credentials["SECRET_KEY"]
|
||||
|
||||
# WARNING: don't run with debug turned on in production!
|
||||
DEBUG = credentials.get_json("DEBUG", False)
|
||||
|
||||
ALLOWED_HOSTS = credentials.get_json("ALLOWED_HOSTS", [])
|
||||
|
||||
ADMINS = credentials.get_json("ADMINS", [])
|
||||
|
||||
|
||||
###
|
||||
# List the installed applications
|
||||
|
||||
INSTALLED_APPS = [
|
||||
"django.contrib.admin",
|
||||
"django.contrib.auth",
|
||||
"django.contrib.contenttypes",
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.messages",
|
||||
"shared.IgnoreSrcStaticFilesConfig",
|
||||
"background_task",
|
||||
"shared",
|
||||
"elections",
|
||||
"faqs",
|
||||
"authens",
|
||||
]
|
||||
|
||||
|
||||
###
|
||||
# List the installed middlewares
|
||||
|
||||
MIDDLEWARE = [
|
||||
"django.middleware.security.SecurityMiddleware",
|
||||
"django.contrib.sessions.middleware.SessionMiddleware",
|
||||
"django.middleware.locale.LocaleMiddleware",
|
||||
"django.middleware.common.CommonMiddleware",
|
||||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||
"django.contrib.messages.middleware.MessageMiddleware",
|
||||
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
||||
]
|
||||
|
||||
|
||||
###
|
||||
# The main url configuration
|
||||
|
||||
ROOT_URLCONF = "app.urls"
|
||||
|
||||
|
||||
###
|
||||
# Template configuration:
|
||||
# - Django Templating Language is used
|
||||
# - Application directories can be used
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
"BACKEND": "django.template.backends.django.DjangoTemplates",
|
||||
"DIRS": [],
|
||||
"APP_DIRS": True,
|
||||
"OPTIONS": {
|
||||
"context_processors": [
|
||||
"django.template.context_processors.debug",
|
||||
"django.template.context_processors.request",
|
||||
"django.contrib.auth.context_processors.auth",
|
||||
"django.contrib.messages.context_processors.messages",
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
###
|
||||
# WSGI application configuration
|
||||
|
||||
WSGI_APPLICATION = "app.wsgi.application"
|
||||
|
||||
|
||||
###
|
||||
# E-Mail configuration
|
||||
|
||||
DEFAULT_FROM_EMAIL = credentials["FROM_EMAIL"]
|
||||
EMAIL_HOST = credentials.get("EMAIL_HOST", "localhost")
|
||||
EMAIL_HOST_PASSWORD = credentials.get("EMAIL_HOST_PASSWORD", "")
|
||||
EMAIL_HOST_USER = credentials.get("EMAIL_HOST_USER", "")
|
||||
EMAIL_USE_SSL = credentials.get("EMAIL_USE_SSL", False)
|
||||
SERVER_EMAIL = credentials["SERVER_EMAIL"]
|
||||
|
||||
|
||||
###
|
||||
# Default primary key field type
|
||||
# -> https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
|
||||
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
|
||||
|
||||
|
||||
###
|
||||
# Database configuration
|
||||
# -> https://docs.djangoproject.com/en/4.2/ref/settings/#databases
|
||||
|
||||
DATABASES = credentials.get_json(
|
||||
"DATABASES",
|
||||
{
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.sqlite3",
|
||||
"NAME": BASE_DIR / "db.sqlite3",
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
###
|
||||
# Authentication configuration
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
|
||||
},
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
|
||||
},
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
|
||||
},
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
|
||||
},
|
||||
]
|
||||
|
||||
AUTH_USER_MODEL = "elections.User"
|
||||
AUTHENTICATION_BACKENDS = [
|
||||
"shared.auth.backends.PwdBackend",
|
||||
"shared.auth.backends.CASBackend",
|
||||
"shared.auth.backends.ElectionBackend",
|
||||
]
|
||||
|
||||
LOGIN_URL = reverse_lazy("authens:login")
|
||||
LOGIN_REDIRECT_URL = "/"
|
||||
|
||||
AUTHENS_USE_OLDCAS = False
|
||||
|
||||
|
||||
###
|
||||
# Internationalization configuration
|
||||
# -> https://docs.djangoproject.com/en/4.2/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = "fr-fr"
|
||||
TIME_ZONE = "Europe/Paris"
|
||||
|
||||
USE_I18N = True
|
||||
USE_L10N = True
|
||||
USE_TZ = True
|
||||
|
||||
LANGUAGES = [
|
||||
("fr", _("Français")),
|
||||
("en", _("Anglais")),
|
||||
]
|
||||
|
||||
LOCALE_PATHS = [BASE_DIR / "shared" / "locale"]
|
||||
|
||||
|
||||
###
|
||||
# Static files (CSS, JavaScript, Images) configuration
|
||||
# -> https://docs.djangoproject.com/en/4.2/howto/static-files/
|
||||
|
||||
STATIC_URL = "/static/"
|
||||
STATIC_ROOT = credentials["STATIC_ROOT"]
|
||||
|
||||
|
||||
###
|
||||
# Background tasks configuration
|
||||
# -> https://django4-background-tasks.readthedocs.io/en/latest/#settings
|
||||
|
||||
BACKGROUND_TASK_RUN_ASYNC = True
|
||||
BACKGROUND_TASK_ASYNC_THREADS = 4
|
||||
|
||||
|
||||
if DEBUG:
|
||||
# Print the e-mails in the console
|
||||
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
|
||||
|
||||
INSTALLED_APPS += [
|
||||
"debug_toolbar",
|
||||
"django_browser_reload",
|
||||
]
|
||||
|
||||
MIDDLEWARE += [
|
||||
"debug_toolbar.middleware.DebugToolbarMiddleware",
|
||||
"django_browser_reload.middleware.BrowserReloadMiddleware",
|
||||
]
|
||||
|
||||
INTERNAL_IPS = ["127.0.0.1"]
|
||||
|
||||
DEBUG_TOOLBAR_CONFIG = {"INSERT_BEFORE": "</footer>"}
|
||||
67
default.nix
67
default.nix
|
|
@ -1,67 +0,0 @@
|
|||
{
|
||||
sources ? import ./npins,
|
||||
pkgs ? import sources.nixpkgs { },
|
||||
}:
|
||||
|
||||
let
|
||||
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
|
||||
|
||||
python3 = pkgs.python3.override {
|
||||
packageOverrides = _: _: {
|
||||
inherit (nix-pkgs)
|
||||
django-background-tasks
|
||||
django-browser-reload
|
||||
django-bulma-forms
|
||||
django-translated-fields
|
||||
loadcredential
|
||||
pyrage
|
||||
;
|
||||
|
||||
authens = nix-pkgs.authens.overridePythonAttrs (old: {
|
||||
patches = [ ./01-authens.patch ];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
devShell = pkgs.mkShell {
|
||||
name = "cas-eleves.dev";
|
||||
|
||||
packages = [
|
||||
(python3.withPackages (ps: [
|
||||
ps.django
|
||||
ps.ipython
|
||||
ps.django-stubs
|
||||
|
||||
ps.markdown
|
||||
ps.numpy
|
||||
ps.networkx
|
||||
|
||||
ps.authens
|
||||
ps.django-background-tasks
|
||||
ps.django-browser-reload
|
||||
ps.django-bulma-forms
|
||||
ps.django-debug-toolbar
|
||||
ps.django-translated-fields
|
||||
ps.loadcredential
|
||||
ps.pyrage
|
||||
]))
|
||||
|
||||
pkgs.gettext
|
||||
pkgs.gtranslator
|
||||
];
|
||||
|
||||
env = {
|
||||
CREDENTIALS_DIRECTORY = builtins.toString ./.credentials;
|
||||
KADENIOS_DEBUG = "true";
|
||||
KADENIOS_STATIC_ROOT = builtins.toString ./.static;
|
||||
};
|
||||
|
||||
shellHook = ''
|
||||
if [ ! -d .static ]; then
|
||||
mkdir .static
|
||||
fi
|
||||
'';
|
||||
};
|
||||
}
|
||||
12
elections/admin.py
Normal file
12
elections/admin.py
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
from django.contrib import admin
|
||||
from django.apps import apps
|
||||
|
||||
# FIXME: this is a temp workaround to help for development
|
||||
|
||||
models = apps.get_models()
|
||||
|
||||
for model in models:
|
||||
try:
|
||||
admin.site.register(model)
|
||||
except admin.sites.AlreadyRegistered:
|
||||
pass
|
||||
|
|
@ -14,9 +14,6 @@ class ElectionForm(forms.ModelForm):
|
|||
|
||||
def clean(self):
|
||||
cleaned_data = super().clean()
|
||||
|
||||
assert cleaned_data is not None
|
||||
|
||||
if cleaned_data["start_date"] < timezone.now():
|
||||
self.add_error(
|
||||
"start_date", _("Impossible de faire débuter l'élection dans le passé")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Generated by Django 3.2.6 on 2021-08-19 22:23
|
||||
# Generated by Django 3.2.4 on 2021-06-19 16:45
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ from django.db import migrations, models
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("elections", "0031_alter_election_options"),
|
||||
("elections", "0029_alter_election_visible"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# Generated by Django 3.2.4 on 2021-06-28 20:03
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("elections", "0029_alter_election_visible"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="election",
|
||||
name="time_published",
|
||||
field=models.DateTimeField(
|
||||
default=None, null=True, verbose_name="date de publication"
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="election",
|
||||
name="time_tallied",
|
||||
field=models.DateTimeField(
|
||||
default=None, null=True, verbose_name="date du dépouillement"
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# Generated by Django 3.2.4 on 2021-07-12 16:37
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("elections", "0030_timestamps"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name="election",
|
||||
options={
|
||||
"ordering": ["-start_date", "-end_date"],
|
||||
"permissions": [("election_admin", "Peut administrer des élections")],
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# Generated by Django 3.2.6 on 2021-10-04 07:49
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def set_users_inactive(apps, schema_editor):
|
||||
db_alias = schema_editor.connection.alias
|
||||
User = apps.get_model("elections", "User")
|
||||
|
||||
User.objects.using(db_alias).filter(election__isnull=False).update(is_active=False)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("elections", "0032_auto_20210820_0023"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(set_users_inactive, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# Generated by Django 4.2.12 on 2024-07-11 12:01
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('elections', '0033_inactive_users'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='vote',
|
||||
name='pseudonymous_user',
|
||||
field=models.CharField(blank=True, max_length=16),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='vote',
|
||||
name='user',
|
||||
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
# Generated by Django 4.2.12 on 2024-07-11 12:24
|
||||
|
||||
import random
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
alphabet = "abcdefghjkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"
|
||||
|
||||
|
||||
def generate_password(size):
|
||||
random.seed()
|
||||
|
||||
return "".join(random.choice(alphabet) for _ in range(size))
|
||||
|
||||
|
||||
def pseudonymize_users(apps, _):
|
||||
Question = apps.get_model("elections", "Question")
|
||||
Vote = apps.get_model("elections", "Vote")
|
||||
|
||||
votes = set()
|
||||
|
||||
for q in Question.objects.filter(election__tallied=True).prefetch_related(
|
||||
"options__vote_set"
|
||||
):
|
||||
|
||||
for v in q.voters.all():
|
||||
pseudonym = generate_password(16)
|
||||
|
||||
for opt in q.options.all():
|
||||
for vote in opt.vote_set.filter(user=v):
|
||||
vote.pseudonymous_user = pseudonym
|
||||
vote.user = None
|
||||
votes.add(vote)
|
||||
|
||||
Vote.objects.bulk_update(votes, ["pseudonymous_user", "user"])
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("elections", "0034_vote_pseudonymous_user_alter_vote_user"),
|
||||
]
|
||||
|
||||
operations = [migrations.RunPython(pseudonymize_users)]
|
||||
|
|
@ -1,32 +1,23 @@
|
|||
from typing import Any
|
||||
|
||||
from django.contrib.auth.mixins import PermissionRequiredMixin
|
||||
from django.db.models import Q, QuerySet
|
||||
from django.http.request import HttpRequest
|
||||
from django.db.models import Q
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.views.generic.detail import SingleObjectMixin
|
||||
|
||||
from elections.typing import AuthenticatedRequest
|
||||
|
||||
from .models import Election, Option, Question
|
||||
|
||||
|
||||
class AdminOnlyMixin(PermissionRequiredMixin):
|
||||
"""Restreint l'accès aux admins"""
|
||||
|
||||
request: AuthenticatedRequest
|
||||
|
||||
permission_required = "elections.election_admin"
|
||||
permission_required = "elections.is_admin"
|
||||
|
||||
|
||||
class SelectElectionMixin:
|
||||
"""Sélectionne automatiquement les foreignkeys voulues"""
|
||||
|
||||
model: type
|
||||
|
||||
def get_queryset(self) -> QuerySet:
|
||||
qs = super().get_queryset() # pyright: ignore
|
||||
def get_queryset(self):
|
||||
qs = super().get_queryset()
|
||||
if self.model is Question:
|
||||
return qs.select_related("election")
|
||||
elif self.model is Option:
|
||||
|
|
@ -37,19 +28,15 @@ class SelectElectionMixin:
|
|||
class RestrictAccessMixin(SelectElectionMixin):
|
||||
"""Permet de restreindre l'accès à des élections/questions/options"""
|
||||
|
||||
f_prefixes = {
|
||||
Election: "",
|
||||
Question: "election__",
|
||||
Option: "question__election__",
|
||||
}
|
||||
f_prefixes = {Election: "", Question: "election__", Option: "question__election__"}
|
||||
|
||||
def get_f_prefix(self) -> str:
|
||||
return self.f_prefixes.get(self.model, "")
|
||||
def get_f_prefix(self):
|
||||
return self.f_prefixes.get(self.model, None)
|
||||
|
||||
def get_filters(self) -> dict[str, Any]:
|
||||
def get_filters(self):
|
||||
return {}
|
||||
|
||||
def get_queryset(self) -> QuerySet:
|
||||
def get_queryset(self):
|
||||
qs = super().get_queryset()
|
||||
if self.model in self.f_prefixes:
|
||||
return qs.filter(**self.get_filters())
|
||||
|
|
@ -60,7 +47,7 @@ class RestrictAccessMixin(SelectElectionMixin):
|
|||
class OpenElectionOnlyMixin(RestrictAccessMixin):
|
||||
"""N'autorise la vue que lorsque l'élection est ouverte"""
|
||||
|
||||
def get_filters(self) -> dict[str, Any]:
|
||||
def get_filters(self):
|
||||
f_prefix = self.get_f_prefix()
|
||||
# On ne peut modifier que les élections qui n'ont pas commencé, et
|
||||
# accessoirement qui ne sont pas dépouillées ou archivées
|
||||
|
|
@ -80,7 +67,7 @@ class CreatorOnlyMixin(AdminOnlyMixin, RestrictAccessMixin, SingleObjectMixin):
|
|||
def get_next_url(self):
|
||||
return reverse("kadenios")
|
||||
|
||||
def get_filters(self) -> dict[str, Any]:
|
||||
def get_filters(self):
|
||||
filters = super().get_filters()
|
||||
# TODO: change the way we collect the user according to the model used
|
||||
filters[self.get_f_prefix() + "created_by"] = self.request.user
|
||||
|
|
@ -90,7 +77,7 @@ class CreatorOnlyMixin(AdminOnlyMixin, RestrictAccessMixin, SingleObjectMixin):
|
|||
class CreatorOnlyEditMixin(CreatorOnlyMixin):
|
||||
"""Permet au créateurice de modifier l'élection implicitement"""
|
||||
|
||||
def get_filters(self) -> dict[str, Any]:
|
||||
def get_filters(self):
|
||||
# On ne peut modifier que les élections qui n'ont pas commencé
|
||||
filters = super().get_filters()
|
||||
filters[self.get_f_prefix() + "start_date__gt"] = timezone.now()
|
||||
|
|
@ -100,7 +87,7 @@ class CreatorOnlyEditMixin(CreatorOnlyMixin):
|
|||
class ClosedElectionMixin(CreatorOnlyMixin):
|
||||
"""Permet d'agir sur une élection terminée"""
|
||||
|
||||
def get_filters(self) -> dict[str, Any]:
|
||||
def get_filters(self):
|
||||
f_prefix = self.get_f_prefix()
|
||||
# L'élection doit être terminée et non archivée
|
||||
filters = super().get_filters()
|
||||
|
|
@ -115,11 +102,9 @@ class NotArchivedMixin:
|
|||
ou dont on est l'admin
|
||||
"""
|
||||
|
||||
request: HttpRequest
|
||||
|
||||
def get_queryset(self) -> QuerySet:
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = super().get_queryset() # pyright: ignore
|
||||
qs = super().get_queryset()
|
||||
if user.is_authenticated:
|
||||
return qs.filter(Q(archived=False, visible=True) | Q(created_by=user))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,17 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from translated_fields import TranslatedFieldWithFallback
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models, transaction
|
||||
from django.http.request import HttpRequest
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from shared.auth import CONNECTION_METHODS
|
||||
from shared.auth.utils import generate_password
|
||||
from shared.json import Serializer
|
||||
from shared.utils import choices_length
|
||||
|
||||
from .staticdefs import (
|
||||
BALLOT_TYPE,
|
||||
CAST_FUNCTIONS,
|
||||
CONNECTION_METHODS,
|
||||
QUESTION_TYPES,
|
||||
TALLY_FUNCTIONS,
|
||||
VALIDATE_FUNCTIONS,
|
||||
|
|
@ -29,20 +24,12 @@ from .utils import (
|
|||
ValidateFunctions,
|
||||
)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from django.db.models.fields.related_descriptors import ManyRelatedManager
|
||||
from django.utils.functional import _StrPromise
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Models regarding an election
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class Election(models.Model):
|
||||
registered_voters: models.Manager["User"]
|
||||
questions: models.Manager["Question"]
|
||||
|
||||
name = TranslatedFieldWithFallback(models.CharField(_("nom"), max_length=255))
|
||||
short_name = models.SlugField(_("nom bref"), unique=True)
|
||||
description = TranslatedFieldWithFallback(
|
||||
|
|
@ -85,24 +72,14 @@ class Election(models.Model):
|
|||
|
||||
archived = models.BooleanField(_("archivée"), default=False)
|
||||
|
||||
time_tallied = models.DateTimeField(
|
||||
_("date du dépouillement"), null=True, default=None
|
||||
)
|
||||
time_published = models.DateTimeField(
|
||||
_("date de publication"), null=True, default=None
|
||||
)
|
||||
|
||||
class Meta:
|
||||
permissions = [
|
||||
("election_admin", _("Peut administrer des élections")),
|
||||
("is_admin", _("Peut administrer des élections")),
|
||||
]
|
||||
ordering = ["-start_date", "-end_date"]
|
||||
|
||||
|
||||
class Question(Serializer, models.Model):
|
||||
options: models.Manager["Option"]
|
||||
duels: models.Manager["Duel"]
|
||||
|
||||
class Question(models.Model):
|
||||
election = models.ForeignKey(
|
||||
Election, related_name="questions", on_delete=models.CASCADE
|
||||
)
|
||||
|
|
@ -126,44 +103,22 @@ class Question(Serializer, models.Model):
|
|||
blank=True,
|
||||
)
|
||||
|
||||
serializable_fields = ["text_en", "text_fr", "type"]
|
||||
|
||||
def is_form_valid(self, vote_form) -> bool:
|
||||
def is_form_valid(self, vote_form):
|
||||
validate_function = getattr(ValidateFunctions, VALIDATE_FUNCTIONS[self.type])
|
||||
return vote_form.is_valid() and validate_function(vote_form)
|
||||
|
||||
@transaction.atomic
|
||||
def cast_ballot(self, user: "User", vote_form) -> None:
|
||||
def cast_ballot(self, user, vote_form):
|
||||
cast_function = getattr(CastFunctions, CAST_FUNCTIONS[self.type])
|
||||
cast_function(user, vote_form)
|
||||
|
||||
@transaction.atomic
|
||||
def tally(self) -> None:
|
||||
def tally(self):
|
||||
tally_function = getattr(TallyFunctions, TALLY_FUNCTIONS[self.type])
|
||||
tally_function(self)
|
||||
|
||||
@transaction.atomic
|
||||
def pseudonymize(self):
|
||||
"""
|
||||
Generates a random id for each voter
|
||||
"""
|
||||
|
||||
options = list(self.options.prefetch_related("vote_set"))
|
||||
votes: set[Vote] = set()
|
||||
|
||||
for v in self.voters.all():
|
||||
pseudonym = generate_password(16)
|
||||
|
||||
for opt in options:
|
||||
for vote in opt.vote_set.filter(user=v):
|
||||
vote.pseudonymous_user = pseudonym
|
||||
vote.user = None
|
||||
votes.add(vote)
|
||||
|
||||
Vote.objects.bulk_update(votes, ["pseudonymous_user", "user"])
|
||||
|
||||
@property
|
||||
def results(self) -> str:
|
||||
def results(self):
|
||||
return render_to_string(
|
||||
f"elections/results/{self.vote_type}_export.txt", {"question": self}
|
||||
)
|
||||
|
|
@ -185,16 +140,14 @@ class Question(Serializer, models.Model):
|
|||
def vote_type(self):
|
||||
return BALLOT_TYPE[self.type]
|
||||
|
||||
def __str__(self) -> str:
|
||||
return str(self.text)
|
||||
def __str__(self):
|
||||
return self.text
|
||||
|
||||
class Meta:
|
||||
ordering = ["id"]
|
||||
|
||||
|
||||
class Option(Serializer, models.Model):
|
||||
vote_set: models.Manager["Vote"]
|
||||
|
||||
class Option(models.Model):
|
||||
question = models.ForeignKey(
|
||||
Question, related_name="options", on_delete=models.CASCADE
|
||||
)
|
||||
|
|
@ -205,27 +158,22 @@ class Option(Serializer, models.Model):
|
|||
voters = models.ManyToManyField(
|
||||
settings.AUTH_USER_MODEL,
|
||||
related_name="votes",
|
||||
through="elections.Vote",
|
||||
through="Vote",
|
||||
blank=True,
|
||||
)
|
||||
# For now, we store the amount of votes received after the election is tallied
|
||||
nb_votes = models.PositiveSmallIntegerField(_("nombre de votes reçus"), default=0)
|
||||
|
||||
serializable_fields = ["text_fr", "text_en", "abbreviation"]
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
# On enlève les espaces et on passe tout en majuscules
|
||||
self.abbreviation = "".join(self.abbreviation.upper().split())
|
||||
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
def get_abbr(self, default: str) -> str:
|
||||
return self.abbreviation or default
|
||||
|
||||
def __str__(self) -> str:
|
||||
def __str__(self):
|
||||
if self.abbreviation:
|
||||
return f"{self.abbreviation} - {self.text}"
|
||||
return str(self.text)
|
||||
return self.abbreviation + " - " + self.text
|
||||
return self.text
|
||||
|
||||
class Meta:
|
||||
ordering = ["id"]
|
||||
|
|
@ -233,22 +181,12 @@ class Option(Serializer, models.Model):
|
|||
|
||||
class Vote(models.Model):
|
||||
option = models.ForeignKey(Option, on_delete=models.CASCADE)
|
||||
user = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True
|
||||
)
|
||||
pseudonymous_user = models.CharField(max_length=16, blank=True)
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
ordering = ["option"]
|
||||
|
||||
|
||||
class RankedVote(Vote):
|
||||
rank: "Rank"
|
||||
|
||||
class Meta:
|
||||
abstract = True
|
||||
|
||||
|
||||
class Rank(models.Model):
|
||||
vote = models.OneToOneField(Vote, on_delete=models.CASCADE)
|
||||
rank = models.PositiveSmallIntegerField(_("rang de l'option"))
|
||||
|
|
@ -276,10 +214,6 @@ class Duel(models.Model):
|
|||
|
||||
|
||||
class User(AbstractUser):
|
||||
cast_elections: "ManyRelatedManager[Election]"
|
||||
cast_questions: "ManyRelatedManager[Question]"
|
||||
votes: "ManyRelatedManager[Vote]"
|
||||
|
||||
election = models.ForeignKey(
|
||||
Election,
|
||||
related_name="registered_voters",
|
||||
|
|
@ -291,30 +225,25 @@ class User(AbstractUser):
|
|||
has_valid_email = models.BooleanField(_("email valide"), null=True, default=None)
|
||||
|
||||
@property
|
||||
def base_username(self) -> str:
|
||||
def base_username(self):
|
||||
return "__".join(self.username.split("__")[1:])
|
||||
|
||||
def can_vote(self, request: HttpRequest, election: Election) -> bool:
|
||||
def can_vote(self, request, election):
|
||||
# Si c'est un·e utilisateur·ice CAS, iel peut voter dans les élections
|
||||
# ouvertes à tou·te·s
|
||||
if self.election is None:
|
||||
# If the user is connected via CAS, request.session["CASCONNECTED"] is set
|
||||
# to True by authens
|
||||
return not election.restricted and request.session.get(
|
||||
"CASCONNECTED", False
|
||||
)
|
||||
return not election.restricted and request.session.get("CASCONNECTED")
|
||||
|
||||
# Pour les élections restreintes, il faut y être associé
|
||||
return election.restricted and (self.election == election)
|
||||
|
||||
def is_admin(self, election: Election) -> bool:
|
||||
return election.created_by == self or self.is_staff
|
||||
|
||||
def get_prefix(self) -> str:
|
||||
def get_prefix(self):
|
||||
return self.username.split("__")[0]
|
||||
|
||||
@property
|
||||
def connection_method(self) -> "_StrPromise":
|
||||
def connection_method(self):
|
||||
method = self.username.split("__")[0]
|
||||
return CONNECTION_METHODS.get(method, _("identifiants spécifiques"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,31 @@
|
|||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
MAIL_VOTERS = """Dear {full_name},
|
||||
MAIL_VOTERS = (
|
||||
"Dear {full_name},\n"
|
||||
"\n"
|
||||
"\n"
|
||||
"Election URL: {election_url}\n"
|
||||
"\n"
|
||||
"Your voter ID: {username}\n"
|
||||
"Your password: {password}\n"
|
||||
"\n"
|
||||
"-- \n"
|
||||
"Kadenios"
|
||||
)
|
||||
|
||||
Election URL: {election_url}
|
||||
The election will take place from {start} to {end}.
|
||||
MAIL_VOTE_DELETED = (
|
||||
"Dear {full_name},\n"
|
||||
"\n"
|
||||
"Your vote for {election_name} has been removed."
|
||||
"\n"
|
||||
"-- \n"
|
||||
"Kadenios"
|
||||
)
|
||||
|
||||
Your voter ID: {username}
|
||||
Your password: {password}
|
||||
|
||||
--
|
||||
Kadenios
|
||||
"""
|
||||
|
||||
MAIL_VOTE_DELETED = """Dear {full_name},
|
||||
|
||||
Your vote for {election_name} has been removed.
|
||||
|
||||
--
|
||||
Kadenios
|
||||
"""
|
||||
CONNECTION_METHODS = {
|
||||
"pwd": _("mot de passe"),
|
||||
"cas": _("CAS"),
|
||||
}
|
||||
|
||||
QUESTION_TYPES = [
|
||||
("assentiment", _("Assentiment")),
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
from background_task import background
|
||||
from celery import shared_task
|
||||
|
||||
from .models import Election
|
||||
from .utils import send_mail
|
||||
|
||||
|
||||
@background
|
||||
def send_election_mail(election_pk: int, subject: str, body: str, reply_to: str):
|
||||
@shared_task
|
||||
def send_election_mail(election_pk, subject, body, reply_to):
|
||||
election = Election.objects.get(pk=election_pk)
|
||||
send_mail(election, subject, body, reply_to)
|
||||
election.sent_mail = True
|
||||
election.save(update_fields=["sent_mail"])
|
||||
|
||||
|
||||
@background
|
||||
def pseudonimize_election(election_pk: int):
|
||||
election = Election.objects.get(pk=election_pk)
|
||||
|
||||
for q in election.questions.all():
|
||||
q.pseudonymize()
|
||||
election.save()
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
{% load i18n markdown %}
|
||||
|
||||
<div class="panel-block" id="o_{{ o.pk }}">
|
||||
{% if o.question.election.start_date > current_time %}
|
||||
<span class="tags has-addons mb-0">
|
||||
<a class="tag is-danger is-light is-outlined has-tooltip-primary mb-0 del" data-tooltip="{% trans "Supprimer" %}" data-url="{% url 'election.del-option' o.pk %}" data-target="o_{{ o.pk }}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<a class="tag is-info is-light is-outlined has-tooltip-primary mb-0 modal-button" data-tooltip="{% trans "Modifier" %}" data-post_url="{% url 'election.mod-option' o.pk %}" data-target="modal-option" data-json='{{ o.to_json }}' data-title="{% trans "Modifier l'option" %}" data-parent="o_{{ o.pk }}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
</a>
|
||||
</span>
|
||||
|
||||
{% elif o.question.election.tallied %}
|
||||
<span class="tag {% if o.winner %}is-success{% else %}is-primary{% endif %}">
|
||||
<span class="icon-text">
|
||||
{% if q.vote_type == "select" %}
|
||||
<span class="icon">
|
||||
<i class="fas fa-vote-yea"></i>
|
||||
</span>
|
||||
<span>{{ o.nb_votes }}</span>
|
||||
|
||||
{% elif q.vote_type == "rank" %}
|
||||
|
||||
<span class="icon">
|
||||
<i class="fas fa-layer-group"></i>
|
||||
</span>
|
||||
<span>{% if o.abbreviation %}{{ o.abbreviation }}{% else %}{{ forloop.counter }}{% endif %}</span>
|
||||
{% endif %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</span>
|
||||
|
||||
<span class="ml-2">{{ o }}</span>
|
||||
</div>
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
{% load i18n markdown %}
|
||||
|
||||
<div class="panel" id="q_{{ q.pk }}">
|
||||
<div class="panel-heading is-size-6">
|
||||
<div class="level is-mobile">
|
||||
<div class="level-left is-flex-shrink-1 mr-2">
|
||||
<span class="mr-2">
|
||||
<span class="icon">
|
||||
<i class="fas fa-poll-h"></i>
|
||||
</span>
|
||||
<span>{{ q }}</span>
|
||||
</span>
|
||||
|
||||
{% if q.election.start_date > current_time %}
|
||||
<a class="tag is-outlined is-light is-danger del" data-url="{% url 'election.del-question' q.pk %}" data-target="q_{{ q.pk }}">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
<span>{% trans "Supprimer" %}</span>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<a class="tag is-outlined is-light is-info ml-1 modal-button" data-post_url="{% url 'election.mod-question' q.pk %}" data-target="modal-question" data-json='{{ q.to_json }}' data-title="{% trans "Modifier la question" %}" data-parent="q_{{ q.pk }}">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
<span>{% trans "Modifier" %}</span>
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
<span class="tag is-outlined is-primary is-light">{{ q.get_type_display }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# Liste des options possibles #}
|
||||
<div id="options_{{ q.pk }}">
|
||||
{% for o in q.options.all %}
|
||||
{% include 'elections/admin/option.html' %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{# Permet d'afficher une ligne #}
|
||||
<div class="panel-block py-0"></div>
|
||||
|
||||
{# Affiche plus d'informations sur le résultat #}
|
||||
{% if q.election.tallied %}
|
||||
{{ q.get_results_data }}
|
||||
{% endif %}
|
||||
|
||||
{# Rajout d'une option #}
|
||||
{% if q.election.start_date > current_time %}
|
||||
<div class="panel-block">
|
||||
<button class="button modal-button is-primary is-outlined is-fullwidth option" data-post_url="{% url 'election.add-option' q.pk %}" data-target="modal-option" data-title="{% trans "Rajouter une option" %}" data-json='{"text_fr": "", "text_en": "", "abbreviation": ""}' data-next="options_{{ q.pk }}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-plus"></i>
|
||||
</span>
|
||||
<span>{% trans "Rajouter une option" %}</span>
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
<thead>
|
||||
<tr>
|
||||
{% for o in options %}
|
||||
<th class="has-text-centered">{{ o }}</th>
|
||||
<th>{{ o }}</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for ballot in ballots %}
|
||||
{% for ballot in ballots.values %}
|
||||
<tr>
|
||||
{% for r in ballot %}
|
||||
<td class="has-text-centered">{{ r }}</td>
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
<thead>
|
||||
<tr>
|
||||
{% for o in options %}
|
||||
<th class="has-text-centered">{{ o }}</th>
|
||||
<th>{{ o }}</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for ballot in ballots %}
|
||||
{% for ballot in ballots.values %}
|
||||
<tr>
|
||||
{% for v in ballot %}
|
||||
<td class="has-text-centered">
|
||||
|
|
|
|||
|
|
@ -4,16 +4,38 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<div class="level mb-2 is-mobile">
|
||||
<div class="level">
|
||||
{# Titre de l'élection #}
|
||||
<div class="level-left is-flex-shrink-1 pr-3">
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<h1 class="title">{{ election.name }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="level-right is-flex is-flex-shrink-1">
|
||||
{# Statut de l'élection #}
|
||||
<div class="level-right">
|
||||
{# Liste des votant·e·s #}
|
||||
<div class="level-item">
|
||||
<a class="button is-primary is-light is-outlined" href="{% url 'election.voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-clipboard-list"></i>
|
||||
</span>
|
||||
<span>{% trans "Votant·e·s" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{# Liste des bulletins #}
|
||||
{% if election.results_public %}
|
||||
<div class="level-item">
|
||||
<a class="button is-primary is-light is-outlined" href="{% url 'election.ballots' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-list"></i>
|
||||
</span>
|
||||
<span>{% trans "Bulletins" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if election.start_date < current_time %}
|
||||
<div class="level-item is-flex-shrink-1">
|
||||
{# Statut de l'élection #}
|
||||
<div class="level-item">
|
||||
<span class="tag is-medium is-outlined is-light is-primary">
|
||||
{% if election.end_date < current_time %}
|
||||
{% trans "Élection terminée" %}
|
||||
|
|
@ -24,111 +46,56 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# Lien vers la page d'administration #}
|
||||
{% if election.created_by == user %}
|
||||
<div class="level-item">
|
||||
<div class="dropdown is-right">
|
||||
<div class="dropdown-trigger">
|
||||
<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
|
||||
<span class="icon">
|
||||
<i class="fas fa-ellipsis-v" aria-hidden="true"></i>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="dropdown-menu" id="dropdown-menu" role="menu">
|
||||
<div class="dropdown-content">
|
||||
{# Lien vers la page d'administration #}
|
||||
{% if election.created_by == user %}
|
||||
<a class="dropdown-item" href="{% url 'election.admin' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-cog"></i>
|
||||
</span>
|
||||
<span>{% trans "Administrer" %}</span>
|
||||
</a>
|
||||
|
||||
<hr class="dropdown-divider">
|
||||
{% endif %}
|
||||
|
||||
{# Liste des votant·e·s #}
|
||||
<a class="dropdown-item" href="{% url 'election.voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-clipboard-list"></i>
|
||||
</span>
|
||||
<span>{% trans "Votant·e·s" %}</span>
|
||||
</a>
|
||||
|
||||
{# Liste des bulletins #}
|
||||
{% if election.results_public %}
|
||||
<a class="dropdown-item" href="{% url 'election.ballots' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-list"></i>
|
||||
</span>
|
||||
<span>{% trans "Bulletins" %}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<a class="button has-tooltip-primary" href="{% url 'election.admin' election.pk %}" data-tooltip="{% trans "Administrer" %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-cog"></i>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="level">
|
||||
{# Dates d'ouverture de l'élection #}
|
||||
<div class="level-left is-flex-shrink-1 pr-3">
|
||||
<div class="level is-mobile">
|
||||
<div class="level-item">
|
||||
<span class="tag is-medium is-primary">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<span class="tag is-medium is-primary">
|
||||
<span class="icon-text">
|
||||
<span>{{ election.start_date|date:"d/m/Y H:i" }}</span>
|
||||
<span class="icon">
|
||||
<i class="fas fa-long-arrow-alt-right"></i>
|
||||
</span>
|
||||
<span>{{ election.end_date|date:"d/m/Y H:i" }}</span>
|
||||
</span>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{# Créateurice de l'élection #}
|
||||
<div class="level-item is-flex-shrink-1">
|
||||
<span class="tag is-primary is-light is-outlined">{% blocktrans with creator=election.created_by.full_name %}Créé par {{ creator }}{% endblocktrans %}</span>
|
||||
</div>
|
||||
{# Créateurice de l'élection #}
|
||||
<div class="level-item">
|
||||
<span class="tag is-primary is-light is-outlined">{% blocktrans with creator=election.created_by.full_name %}Créé par {{ creator }}{% endblocktrans %}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# Confirmation de vote #}
|
||||
{% if has_voted %}
|
||||
<div class="level-right is-flex-shrink-1">
|
||||
<div class="level-item is-flex-shrink-1">
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<div class="tag is-medium is-outlined is-success is-light">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
<span>{% trans "Votre vote a bien été enregistré." %}</span>
|
||||
</span>
|
||||
<span>{% trans "Votre vote a bien été enregistré." %}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="level">
|
||||
<div class="level-left is-flex">
|
||||
{# Date du dépouillement #}
|
||||
{% if election.time_tallied %}
|
||||
<div class="level-item is-flex-grow-1 mb-0">
|
||||
<span class="tag is-success is-light is-outlined">
|
||||
{% blocktrans with timestamp=election.time_tallied|date:"d/m/Y H:i" %}Dépouillé le {{ timestamp }}{% endblocktrans %}
|
||||
</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# Date de la publication #}
|
||||
{% if election.time_published %}
|
||||
<div class="level-item is-flex-grow-1 mb-0">
|
||||
<span class="tag is-info is-light is-outlined">
|
||||
{% blocktrans with timestamp=election.time_published|date:"d/m/Y H:i" %}Publié le {{ timestamp }}{% endblocktrans %}
|
||||
</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{# Précisions sur les modalités de vote #}
|
||||
|
|
@ -139,23 +106,7 @@
|
|||
{% endif %}
|
||||
|
||||
{# Indications de connexion #}
|
||||
{% if election.start_date > current_time %}
|
||||
<div class="tile is-ancestor">
|
||||
<div class="tile is-parent">
|
||||
<div class="tile is-child notification is-primary is-light">
|
||||
<div class="has-text-centered mb-2">
|
||||
<p class="subtitle">
|
||||
<span class="icon">
|
||||
<i class="fas fa-clock"></i>
|
||||
</span>
|
||||
<span class="ml-3">{% blocktrans with _date=election.start_date|date:"d/m/Y" _time=election.start_date|date:_("H:i") %}Le vote ouvrira le <b>{{ _date }}</b> à <b>{{ _time }}</b>.{% endblocktrans %}</span>
|
||||
</p>
|
||||
<p>{% trans "Revenez sur cette page quand le vote sera ouvert pour vous connecter et participer." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% elif election.end_date > current_time %}
|
||||
{% if election.start_date < current_time and election.end_date > current_time %}
|
||||
{% if can_vote %}
|
||||
<div class="columns is-centered tile is-ancestor">
|
||||
<div class="column is-one-third tile is-parent">
|
||||
|
|
@ -199,7 +150,7 @@
|
|||
</div>
|
||||
</a>
|
||||
{% else %}
|
||||
<a class="tile is-child notification is-primary" href="{% url 'authens:login.cas' %}?next={% url 'election.view' election.pk %}">
|
||||
<a class="tile is-child notification is-primary" href="{% url 'authens:login.cas' %}">
|
||||
<div class="subtitle has-text-centered mb-2">
|
||||
<span class="icon-text">
|
||||
<span class="icon has-text-white">
|
||||
|
|
@ -228,9 +179,9 @@
|
|||
{% for q in election.questions.all %}
|
||||
<div class="panel" id="q_{{ q.pk }}">
|
||||
<div class="panel-heading is-size-6">
|
||||
<div class="level is-mobile">
|
||||
<div class="level">
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<span class="mr-3">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-poll-h"></i>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -2,64 +2,27 @@
|
|||
{% load i18n markdown %}
|
||||
|
||||
|
||||
{% block custom_js %}
|
||||
{% block extra_head %}
|
||||
<script>
|
||||
const _fm = b => {
|
||||
b.addEventListener('click', () => {
|
||||
const f = _$('form', _id(b.dataset.target), false);
|
||||
f.dataset.next = b.dataset.next;
|
||||
f.dataset.origin = b.dataset.parent
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
var $modalButtons = document.querySelectorAll('.modal-button') || [];
|
||||
|
||||
const d = JSON.parse(b.dataset.json);
|
||||
$modalButtons.forEach($el => {
|
||||
$el.addEventListener('click', () => {
|
||||
var $target = document.getElementById($el.dataset.target);
|
||||
var $target_form = $target.querySelector("form");
|
||||
var modal_title = '';
|
||||
$target_form.action = $el.dataset.post_url;
|
||||
$target.querySelector('.modal-card-title').innerHTML = $el.dataset.title;
|
||||
|
||||
for (const [k, v] of Object.entries(d)) {
|
||||
_$(`[name='${k}']`, f, false).value = v;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
_$('.modal-button').forEach(_fm);
|
||||
|
||||
const _del = d => {
|
||||
d.addEventListener('click', () => {
|
||||
_get(d.dataset.url, r => {
|
||||
if (r.success && r.action == 'delete') {
|
||||
_id(d.dataset.target).remove()
|
||||
}
|
||||
|
||||
if (r.message) {
|
||||
_notif(r.message.content, r.message.class);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
_$('.del').forEach(_del);
|
||||
|
||||
_$('form').forEach(f => {
|
||||
f.addEventListener('submit', event => {
|
||||
event.preventDefault();
|
||||
|
||||
_post(f.action, f, r => {
|
||||
if (r.success) {
|
||||
const e = document.createElement('div');
|
||||
e.innerHTML = r.html;
|
||||
// On initialise les boutons
|
||||
_$('.modal-button', e).forEach(b => {
|
||||
_om(b);
|
||||
_fm(b);
|
||||
});
|
||||
_$('.del', e).forEach(_del);
|
||||
|
||||
if (r.action == 'create') {
|
||||
_id(f.dataset.next).appendChild(e.firstElementChild);
|
||||
} else if (r.action == 'update') {
|
||||
const n = _id(f.dataset.origin);
|
||||
n.parentNode.replaceChild(e.firstElementChild, n);
|
||||
}
|
||||
// On ferme le modal
|
||||
document.documentElement.classList.remove('is-clipped');
|
||||
_id(f.dataset.modal).classList.remove('is-active');
|
||||
if ($el.classList.contains('question')) {
|
||||
$target_form.querySelector('#id_text_fr').value = $el.dataset.q_fr || '';
|
||||
$target_form.querySelector('#id_text_en').value = $el.dataset.q_en || '';
|
||||
$target_form.querySelector('#id_type').value = $el.dataset.type || 'assentiment';
|
||||
} else if ($el.classList.contains('option')) {
|
||||
$target_form.querySelector('#id_text_fr').value = $el.dataset.o_fr || '';
|
||||
$target_form.querySelector('#id_text_en').value = $el.dataset.o_en || '';
|
||||
$target_form.querySelector('#id_abbreviation').value = $el.dataset.abbr || '';
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -80,142 +43,142 @@
|
|||
<div class="level-right">
|
||||
{# Visibilité de l'élection #}
|
||||
<div class="level-item">
|
||||
<div class="level is-mobile">
|
||||
<div class="level-item">
|
||||
{% if not election.visible %}
|
||||
<span class="tag is-medium is-outlined is-warning is-light">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye-slash"></i>
|
||||
{% if not election.visible %}
|
||||
<span class="tag is-medium is-outlined is-warning is-light">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye-slash"></i>
|
||||
</span>
|
||||
<span>{% trans "Élection invisible" %}</span>
|
||||
</span>
|
||||
{% else %}
|
||||
<span class="tag is-medium is-outlined is-primary is-light">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye"></i>
|
||||
</span>
|
||||
<span>{% trans "Élection visible" %}</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{# Menu d'actions #}
|
||||
<div class="level-item">
|
||||
<div class="dropdown is-right">
|
||||
<div class="dropdown-trigger">
|
||||
<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-cog" aria-hidden="true"></i>
|
||||
</span>
|
||||
<span>{% trans "Actions" %}</span>
|
||||
</span>
|
||||
<span>{% trans "Élection invisible" %}</span>
|
||||
</span>
|
||||
{% else %}
|
||||
<span class="tag is-medium is-outlined is-primary is-light">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye"></i>
|
||||
</span>
|
||||
<span>{% trans "Élection visible" %}</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{# Menu d'actions #}
|
||||
<div class="level-item">
|
||||
<div class="dropdown is-right">
|
||||
<div class="dropdown-trigger">
|
||||
<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
|
||||
<span class="icon">
|
||||
<i class="fas fa-cog" aria-hidden="true"></i>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="dropdown-menu" id="dropdown-menu" role="menu">
|
||||
<div class="dropdown-content">
|
||||
{# Vue classique #}
|
||||
<a class="dropdown-item" href="{% url 'election.view' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-exchange-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Vue classique" %}
|
||||
</a>
|
||||
|
||||
<div class="dropdown-menu" id="dropdown-menu" role="menu">
|
||||
<div class="dropdown-content">
|
||||
{# Vue classique #}
|
||||
<a class="dropdown-item" href="{% url 'election.view' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-exchange-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Vue classique" %}
|
||||
</a>
|
||||
<hr class="dropdown-divider">
|
||||
|
||||
<hr class="dropdown-divider">
|
||||
{% if not election.visible %}
|
||||
{# Rend l'élection visible par tout le monde #}
|
||||
<a class="dropdown-item" href="{% url 'election.set-visible' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye"></i>
|
||||
</span>
|
||||
<span>{% trans "Rendre l'élection visible" %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
{% if not election.visible %}
|
||||
{# Rend l'élection visible par tout le monde #}
|
||||
<a class="dropdown-item" href="{% url 'election.set-visible' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye"></i>
|
||||
</span>
|
||||
<span>{% trans "Rendre l'élection visible" %}
|
||||
</a>
|
||||
{% endif %}
|
||||
{# Téléchargement de la liste des votant·e·s #}
|
||||
<a class="dropdown-item" href="{% url 'election.export-voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-file-download"></i>
|
||||
</span>
|
||||
<span>{% trans "Exporter les votant·e·s" %}
|
||||
</a>
|
||||
|
||||
{# Téléchargement de la liste des votant·e·s #}
|
||||
<a class="dropdown-item" href="{% url 'election.export-voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-file-download"></i>
|
||||
</span>
|
||||
<span>{% trans "Exporter les votant·e·s" %}
|
||||
</a>
|
||||
{% if election.start_date > current_time %}
|
||||
{# Modification de l'élection #}
|
||||
<a class="dropdown-item" href="{% url 'election.update' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
<span>{% trans "Modifier" %}</span>
|
||||
</a>
|
||||
|
||||
{% if election.start_date > current_time %}
|
||||
{# Modification de l'élection #}
|
||||
<a class="dropdown-item" href="{% url 'election.update' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
<span>{% trans "Modifier" %}</span>
|
||||
</a>
|
||||
{# Gestion des votant·e·s #}
|
||||
{% if election.restricted %}
|
||||
<a class="dropdown-item" href="{% url 'election.upload-voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-file-import"></i>
|
||||
</span>
|
||||
<span>{% trans "Gestion de la liste de votant·e·s" %}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
{# Gestion des votant·e·s #}
|
||||
{% if election.restricted %}
|
||||
<a class="dropdown-item" href="{% url 'election.upload-voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-file-import"></i>
|
||||
</span>
|
||||
<span>{% trans "Gestion de la liste de votant·e·s" %}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% elif election.end_date < current_time %}
|
||||
|
||||
{% elif election.end_date < current_time %}
|
||||
{% if not election.tallied %}
|
||||
{# Liste des votants #}
|
||||
<a class="dropdown-item" href="{% url 'election.voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-list"></i>
|
||||
</span>
|
||||
<span>{% trans "Liste des votant·e·s" %}</span>
|
||||
</a>
|
||||
|
||||
{% if not election.tallied %}
|
||||
{# Liste des votants #}
|
||||
<a class="dropdown-item" href="{% url 'election.voters' election.pk %}?prev=admin">
|
||||
<span class="icon">
|
||||
<i class="fas fa-list"></i>
|
||||
</span>
|
||||
<span>{% trans "Liste des votant·e·s" %}</span>
|
||||
</a>
|
||||
{# Dépouillement #}
|
||||
<a class="dropdown-item" href="{% url 'election.tally' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-poll-h"></i>
|
||||
</span>
|
||||
<span>{% trans "Dépouiller" %}</span>
|
||||
</a>
|
||||
|
||||
{# Dépouillement #}
|
||||
<a class="dropdown-item" href="{% url 'election.tally' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-poll-h"></i>
|
||||
</span>
|
||||
<span>{% trans "Dépouiller" %}</span>
|
||||
</a>
|
||||
{% else %}
|
||||
|
||||
{% else %}
|
||||
{# Publication des résultats #}
|
||||
{% if not election.archived %}
|
||||
<a class="dropdown-item" href="{% url 'election.publish' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
{% if not election.results_public %}
|
||||
<span>{% trans "Publier" %}</span>
|
||||
{% else %}
|
||||
<span>{% trans "Dépublier" %}</span>
|
||||
{% endif %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
{# Publication des résultats #}
|
||||
{% if not election.archived %}
|
||||
<a class="dropdown-item" href="{% url 'election.publish' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
{% if not election.results_public %}
|
||||
<span>{% trans "Publier" %}</span>
|
||||
{% else %}
|
||||
<span>{% trans "Dépublier" %}</span>
|
||||
{% endif %}
|
||||
</a>
|
||||
{% endif %}
|
||||
{# Export des résultats #}
|
||||
<a class="dropdown-item" href="{% url 'election.download-results' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-save"></i>
|
||||
</span>
|
||||
<span>{% trans "Télécharger les résultats" %}</span>
|
||||
</a>
|
||||
|
||||
{# Export des résultats #}
|
||||
<a class="dropdown-item" href="{% url 'election.download-results' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-save"></i>
|
||||
</span>
|
||||
<span>{% trans "Télécharger les résultats" %}</span>
|
||||
</a>
|
||||
{# Archivage #}
|
||||
{% if not election.archived %}
|
||||
<a class="dropdown-item" href="{% url 'election.archive' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-archive"></i>
|
||||
</span>
|
||||
<span>{% trans "Archiver" %}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{# Archivage #}
|
||||
{% if not election.archived %}
|
||||
<a class="dropdown-item" href="{% url 'election.archive' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-archive"></i>
|
||||
</span>
|
||||
<span>{% trans "Archiver" %}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -256,11 +219,109 @@
|
|||
{% endif %}
|
||||
|
||||
{# Liste des questions #}
|
||||
<div id="questions" class="block">
|
||||
{% for q in election.questions.all %}
|
||||
{% include 'elections/admin/question.html' %}
|
||||
{% for q in election.questions.all %}
|
||||
<div class="panel" id="q_{{ q.pk }}">
|
||||
<div class="panel-heading is-size-6">
|
||||
<div class="level">
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<div class="level-item is-flex-shrink-1">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-poll-h"></i>
|
||||
</span>
|
||||
<span>{{ q }}</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{% if election.start_date > current_time %}
|
||||
<div class="level-item">
|
||||
<a class="tag is-outlined is-light is-danger" href="{% url 'election.del-question' q.pk %}">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
<span>{% trans "Supprimer" %}</span>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<a class="tag is-outlined is-light is-info ml-1 modal-button question" data-post_url="{% url 'election.mod-question' q.pk %}" data-target="modal-question" data-type="{{ q.type }}" data-q_en="{{ q.text_en }}" data-q_fr="{{ q.text_fr }}" data-title="{% trans "Modifier la question" %}">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
<span>{% trans "Modifier" %}</span>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
<span class="tag is-outlined is-primary is-light">{{ q.get_type_display }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# Liste des options possibles #}
|
||||
{% for o in q.options.all %}
|
||||
<div class="panel-block" id="o_{{ o.pk }}">
|
||||
{% if election.start_date > current_time %}
|
||||
<span class="tags has-addons mb-0">
|
||||
<a class="tag is-danger is-light is-outlined has-tooltip-primary mb-0" data-tooltip="{% trans "Supprimer" %}" href="{% url 'election.del-option' o.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<a class="tag is-info is-light is-outlined has-tooltip-primary mb-0 modal-button option" data-tooltip="{% trans "Modifier" %}" data-post_url="{% url 'election.mod-option' o.pk %}" data-target="modal-option" data-o_en="{{ o.text_en }}" data-o_fr="{{ o.text_fr }}" data-abbr="{{ o.abbreviation }}" data-title="{% trans "Modifier l'option" %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-edit"></i>
|
||||
</span>
|
||||
</a>
|
||||
</span>
|
||||
|
||||
{% elif election.tallied %}
|
||||
<span class="tag {% if o.winner %}is-success{% else %}is-primary{% endif %}">
|
||||
<span class="icon-text">
|
||||
{% if q.vote_type == "select" %}
|
||||
<span class="icon">
|
||||
<i class="fas fa-vote-yea"></i>
|
||||
</span>
|
||||
<span>{{ o.nb_votes }}</span>
|
||||
|
||||
{% elif q.vote_type == "rank" %}
|
||||
|
||||
<span class="icon">
|
||||
<i class="fas fa-layer-group"></i>
|
||||
</span>
|
||||
<span>{% if o.abbreviation %}{{ o.abbreviation }}{% else %}{{ forloop.counter }}{% endif %}</span>
|
||||
{% endif %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</span>
|
||||
|
||||
<span class="ml-2">{{ o }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{# Affiche plus d'informations sur le résultat #}
|
||||
{% if election.tallied %}
|
||||
{{ q.get_results_data }}
|
||||
{% endif %}
|
||||
|
||||
{# Rajout d'une option #}
|
||||
{% if election.start_date > current_time %}
|
||||
<div class="panel-block">
|
||||
<button class="button modal-button is-primary is-outlined is-fullwidth option" data-post_url="{% url 'election.add-option' q.pk %}" data-target="modal-option" data-title="{% trans "Rajouter une option" %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-plus"></i>
|
||||
</span>
|
||||
<span>{% trans "Rajouter une option" %}</span>
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{# Rajout d'une question #}
|
||||
{% if election.start_date > current_time %}
|
||||
|
|
@ -275,7 +336,7 @@
|
|||
|
||||
<div class="columns is-centered" id="q_add">
|
||||
<div class="column is-two-thirds">
|
||||
<button class="button modal-button is-primary is-outlined is-fullwidth question" data-post_url="{% url 'election.add-question' election.pk %}" data-target="modal-question" data-title="{% trans "Rajouter une question" %}" data-next="questions" data-json='{"text_fr": "", "text_en": "", "type": "assentiment"}'>
|
||||
<button class="button modal-button is-primary is-outlined is-fullwidth question" data-post_url="{% url 'election.add-question' election.pk %}" data-target="modal-question" data-title="{% trans "Rajouter une question" %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-question"></i>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
|
||||
{% block content %}
|
||||
<div class="level is-mobile">
|
||||
<div class="level">
|
||||
{# Titre de l'élection #}
|
||||
<div class="level-left is-flex-shrink-1 pr-3">
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<h1 class="title">{{ election.name }}</h1>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
{# DateTimePicker #}
|
||||
<script src="{% static 'vendor/datetimepicker/picker.js' %}"></script>
|
||||
<link rel="stylesheet" href="{% static 'vendor/datetimepicker/picker.css' %}">
|
||||
{% endblock %}
|
||||
|
||||
{% block custom_js %}
|
||||
<script>
|
||||
{% get_current_language as LANGUAGE_CODE %}
|
||||
new DateTimePicker('input[name=start_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
});
|
||||
new DateTimePicker('input[name=end_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
new DateTimePicker('input[name=start_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
});
|
||||
new DateTimePicker('input[name=end_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<div class="level is-mobile">
|
||||
<div class="level-left is-flex-shrink-1 pr-3">
|
||||
<div class="level-item is-flex-shrink-1">
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="title">{% trans "Liste des élections" %}</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if perms.elections.election_admin %}
|
||||
{% if perms.elections.is_admin %}
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<a class="button is-light is-outlined is-primary" href={% url 'election.create' %}>
|
||||
|
|
@ -29,13 +29,13 @@
|
|||
{% for e in election_list %}
|
||||
<div class="panel is-primary is-radiusless">
|
||||
<div class="panel-heading is-size-6 is-radiusless">
|
||||
<div class="level is-mobile mb-0">
|
||||
<div class="level">
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<div class="level-item is-flex-shrink-1">
|
||||
<a class="has-text-primary-light" href="{% url 'election.view' e.pk %}"><u>{{ e.name }}</u></a>
|
||||
</div>
|
||||
|
||||
<div class="level-item is-hidden-touch">
|
||||
<div class="level-item">
|
||||
<span class="tag is-primary is-light">
|
||||
<span class="icon-text">
|
||||
<span>{{ e.start_date|date:"d/m/Y H:i" }}</span>
|
||||
|
|
@ -49,72 +49,47 @@
|
|||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
{% if not e.visible %}
|
||||
<div class="level-item">
|
||||
{% if not e.visible %}
|
||||
<span class="tag is-warning is-light">
|
||||
<span class="icon">
|
||||
<i class="fas fa-eye-slash"></i>
|
||||
</span>
|
||||
<span>{% trans "Élection invisible" %}</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if e.tallied %}
|
||||
<div class="level-item">
|
||||
<span class="tag is-success is-light">{% trans "Élection dépouillée" %}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if e.created_by == user %}
|
||||
{% if e.results_public %}
|
||||
<div class="level-item">
|
||||
<span class="tag is-info is-light">{% trans "Élection publiée" %}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if e.archived %}
|
||||
<div class="level-item">
|
||||
<span class="tag is-danger is-light">{% trans "Élection archivée" %}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if e.created_by == user %}
|
||||
<div class="level-item">
|
||||
<a class="has-text-primary-light ml-3 has-tooltip-light" href="{% url 'election.admin' e.pk %}" data-tooltip="{% trans "Administrer" %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-cog"></i>
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="is-hidden-desktop mt-2">
|
||||
<span class="tag is-primary is-light">
|
||||
<span class="icon-text">
|
||||
<span>{{ e.start_date|date:"d/m/Y H:i" }}</span>
|
||||
<span class="icon has-text-primary">
|
||||
<i class="fas fa-long-arrow-alt-right"></i>
|
||||
</span>
|
||||
<span>{{ e.end_date|date:"d/m/Y H:i" }}</span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if e.tallied or e.results_public or e.archived %}
|
||||
<div class="panel-block">
|
||||
<div class="is-flex-grow-1">
|
||||
<div class="tags">
|
||||
{% if e.tallied %}
|
||||
<span class="tag is-success is-light is-outlined">
|
||||
{% if e.time_tallied %}
|
||||
{% blocktrans with timestamp=e.time_tallied|date:"d/m/Y H:i" %}Élection dépouillée le {{ timestamp }}{% endblocktrans %}
|
||||
{% else %}
|
||||
{% trans "Élection dépouillée" %}
|
||||
{% endif %}
|
||||
</span>
|
||||
{% endif %}
|
||||
|
||||
{% if e.results_public %}
|
||||
<span class="tag is-info is-light is-outlined">
|
||||
{% if e.time_published %}
|
||||
{% blocktrans with timestamp=e.time_published|date:"d/m/Y H:i" %}Élection publiée le {{ timestamp }}{% endblocktrans %}
|
||||
{% else %}
|
||||
{% trans "Élection publiée" %}
|
||||
{% endif %}
|
||||
</span>
|
||||
{% endif %}
|
||||
|
||||
{% if e.archived %}
|
||||
<span class="tag is-danger is-light is-outlined">{% trans "Élection archivée" %}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if e.description %}
|
||||
<div class="panel-block">
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
{# DateTimePicker #}
|
||||
<script src="{% static 'vendor/datetimepicker/picker.js' %}"></script>
|
||||
<link rel="stylesheet" href="{% static 'vendor/datetimepicker/picker.css' %}">
|
||||
{% endblock %}
|
||||
|
||||
{% block custom_js %}
|
||||
<script>
|
||||
{% get_current_language as LANGUAGE_CODE %}
|
||||
new DateTimePicker('input[name=start_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
});
|
||||
new DateTimePicker('input[name=end_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
new DateTimePicker('input[name=start_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
});
|
||||
new DateTimePicker('input[name=end_date]', {
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2,225 +2,128 @@
|
|||
{% load i18n markdown %}
|
||||
|
||||
|
||||
{% block custom_js %}
|
||||
{% if can_delete %}
|
||||
<script>
|
||||
_$('.modal-button').forEach(b => {
|
||||
b.addEventListener('click', () => {
|
||||
const f = _$('form', _id(b.dataset.target), false);
|
||||
f.dataset.target = b.dataset.origin;
|
||||
_$('[name="delete"]', f, false).value = 'non';
|
||||
});
|
||||
{% block extra_head %}
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const $del_modal = document.getElementById('modal-delete');
|
||||
const $del_title = $del_modal.querySelector('.modal-card-title');
|
||||
const $del_form = $del_modal.querySelector('form');
|
||||
|
||||
$del_buttons = document.querySelectorAll('.modal-button.delete-vote')
|
||||
|
||||
$del_buttons.forEach($del => {
|
||||
$del.addEventListener('click', () => {
|
||||
$del_form.action = $del.dataset.post_url;
|
||||
$del_title.innerHTML = $del.dataset.tooltip;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
_$('form').forEach(f => {
|
||||
f.addEventListener('submit', event => {
|
||||
event.preventDefault();
|
||||
</script>
|
||||
|
||||
if (_$('[name="delete"]', f, false).value == 'oui') {
|
||||
_get(f.action, r => {
|
||||
if (r.success && r.action == 'delete') {
|
||||
{% if election.restricted %}
|
||||
const r = _id(f.dataset.target);
|
||||
_$('.modal-button', r, false).remove();
|
||||
const i = _$('.fas', r, false);
|
||||
i.classList.remove('fa-check');
|
||||
i.classList.add('fa-times');
|
||||
{% else %}
|
||||
_id(f.dataset.target).remove()
|
||||
{% endif %}
|
||||
|
||||
// On ferme le modal
|
||||
document.documentElement.classList.remove('is-clipped');
|
||||
_id(f.dataset.modal).classList.remove('is-active');
|
||||
}
|
||||
|
||||
if (r.message) {
|
||||
_notif(r.message.content, r.message.class);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
document.documentElement.classList.remove('is-clipped');
|
||||
_id(f.dataset.modal).classList.remove('is-active');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="level is-mobile">
|
||||
{# Titre de l'élection #}
|
||||
<div class="level-left is-flex-shrink-1 mr-3">
|
||||
<h1 class="title">{{ election.name }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<a class="button is-primary" href="{% if from_admin %}{% url 'election.admin' election.pk %}{% else %}{% url 'election.view' election.pk %}{% endif %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Retour" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="level">
|
||||
{# Titre de l'élection #}
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<h1 class="title">{{ election.name }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<h3 class="subtitle">{% trans "Liste des votant·e·s" %} ({{ voters|length }})</h3>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{# Précisions sur les modalités de vote #}
|
||||
{% if election.vote_restrictions %}
|
||||
<div class="message is-warning">
|
||||
<div class="message-body content">{{ election.vote_restrictions|markdown|safe }}</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="message is-warning">
|
||||
<div class="message-body">
|
||||
{% if election.restricted %}
|
||||
{% trans "Seules les personnes présentes sur cette liste peuvent voter, vous avez dû recevoir un mail avec vos identifiants de connexion." %}
|
||||
{% else %}
|
||||
{% trans "Pour voter lors de cette élection, vous devez vous connecter à l'aide du CAS élève, d'autres restrictions peuvent s'appliquer et votre vote pourra être supprimé si vous n'avez pas le droit de vote." %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if can_vote or is_admin %}
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-narrow">
|
||||
{% if can_delete %}
|
||||
{% include "forms/modal-form.html" with modal_id="delete" form=d_form %}
|
||||
{% endif %}
|
||||
|
||||
<table class="table is-striped is-fullwidth">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Nom" %}</th>
|
||||
<th class="has-text-centered">{% trans "Vote enregistré" %}</th>
|
||||
{% if can_delete %}
|
||||
<th class="has-text-centered">{% trans "Supprimer" %}</th>
|
||||
{% endif %}
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% if election.restricted %}
|
||||
{% for v in election.registered_voters.all %}
|
||||
<tr id="v_{{ forloop.counter }}">
|
||||
<td>{{ v.full_name }} ({{ v.base_username }})</td>
|
||||
{% if v in voters %}
|
||||
<td class="has-text-centered">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
</td>
|
||||
{% if can_delete %}
|
||||
<td class="has-text-centered">
|
||||
{% blocktrans with v_name=v.full_name asvar v_delete %}Supprimer le vote de {{ v_name }}{% endblocktrans %}
|
||||
<a class="tag is-danger modal-button delete-vote" data-target="modal-delete" data-post_url="{% url 'election.delete-vote' election.pk v.pk forloop.counter %}" data-title="{{ v_delete }}" data-origin="v_{{ forloop.counter }}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-user-minus"></i>
|
||||
</span>
|
||||
</a>
|
||||
</td>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<td class="has-text-centered">
|
||||
<span class="icon">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
</td>
|
||||
{% if can_delete %}
|
||||
<td></td>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
{% else %}
|
||||
|
||||
{% for v in voters %}
|
||||
<tr id="v_{{ forloop.counter }}">
|
||||
<td>{{ v.full_name }} ({{ v.base_username }})</td>
|
||||
<td class="has-text-centered">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
</td>
|
||||
{% if can_delete %}
|
||||
<td class="has-text-centered">
|
||||
{% blocktrans with v_name=v.full_name asvar v_delete %}Supprimer le vote de {{ v_name }}{% endblocktrans %}
|
||||
<a class="tag is-danger modal-button delete-vote" data-target="modal-delete" data-post_url="{% url 'election.delete-vote' election.pk v.pk forloop.counter %}" data-title="{{ v_delete }}" data-origin="v_{{ forloop.counter }}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-user-minus"></i>
|
||||
</span>
|
||||
</a>
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
|
||||
<div class="notification is-danger is-light has-text-centered">
|
||||
<b>{% trans "Pour voir la liste des votant·e·s vous devez être connecté·e." %}</b>
|
||||
{% if election.restricted %}
|
||||
<br>
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<a class="button is-primary" href="{% if can_delete %}{% url 'election.admin' election.pk %}{% else %}{% url 'election.view' election.pk %}{% endif %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</span>
|
||||
<i>{% trans "La connexion doit s'effectuer via les identifiants reçus par mail." %}</i>
|
||||
{% endif %}
|
||||
<span>{% trans "Retour" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-half">
|
||||
<div class="tile is-ancestor">
|
||||
<div class="tile is-parent">
|
||||
{% if election.restricted %}
|
||||
<a class="tile is-child notification is-primary" href="{% url 'auth.election' election.pk %}?next={% url 'election.voters' election.pk %}">
|
||||
<div class="subtitle has-text-centered mb-2">
|
||||
<span class="icon-text">
|
||||
<span class="icon has-text-white">
|
||||
<i class="fas fa-unlock"></i>
|
||||
</span>
|
||||
<span class="ml-3">{% trans "Connexion par identifiants" %}</span>
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
{% else %}
|
||||
<a class="tile is-child notification is-primary" href="{% url 'authens:login.cas' %}?next={% url 'election.voters' election.pk %}">
|
||||
<div class="subtitle has-text-centered mb-2">
|
||||
<span class="icon-text">
|
||||
<span class="icon has-text-white">
|
||||
<i class="fas fa-school"></i>
|
||||
</span>
|
||||
<span class="ml-3">{% trans "Connexion via CAS" %}</span>
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<h3 class="subtitle">{% trans "Liste des votant·e·s" %} ({{ voters|length }})</h3>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{# Précisions sur les modalités de vote #}
|
||||
{% if election.vote_restrictions %}
|
||||
<div class="message is-warning">
|
||||
<div class="message-body content">{{ election.vote_restrictions|markdown|safe }}</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="message is-warning">
|
||||
<div class="message-body">
|
||||
{% if election.restricted %}
|
||||
{% trans "Seules les personnes présentes sur cette liste peuvent voter, vous avez dû recevoir un mail avec vos identifiants de connexion." %}
|
||||
{% else %}
|
||||
{% trans "Pour voter lors de cette élection, vous devez vous connecter à l'aide du CAS élève, d'autres restrictions peuvent s'appliquer et votre vote pourra être supprimé si vous n'avez pas le droit de vote." %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-two-thirds">
|
||||
{% if can_delete %}
|
||||
{% include "forms/modal-form.html" with modal_id="delete" form=d_form %}
|
||||
{% endif %}
|
||||
|
||||
<table class="table is-striped is-fullwidth">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Nom" %}</th>
|
||||
<th class="has-text-centered">{% trans "Vote enregistré" %}</th>
|
||||
{% if can_delete %}
|
||||
<th class="has-text-centered">{% trans "Supprimer" %}</th>
|
||||
{% endif %}
|
||||
<tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% if election.restricted %}
|
||||
{% for v in election.registered_voters.all %}
|
||||
<tr>
|
||||
<td>{{ v.full_name }} ({{ v.base_username }})</td>
|
||||
<td class="has-text-centered">
|
||||
<span class="icon">
|
||||
{% if v in voters %}
|
||||
<i class="fas fa-check"></i>
|
||||
{% else %}
|
||||
<i class="fas fa-times"></i>
|
||||
{% endif %}
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
{% for v in voters %}
|
||||
<tr id="v_{{ forloop.counter }}">
|
||||
<td>{{ v.full_name }} ({{ v.base_username }})</td>
|
||||
<td class="has-text-centered">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
</td>
|
||||
{% if can_delete %}
|
||||
<td class="has-text-centered">
|
||||
{% blocktrans with v_name=v.full_name asvar v_delete %}Supprimer le vote de {{ v_name }}{% endblocktrans %}
|
||||
<a class="tag is-danger has-tooltip-primary modal-button delete-vote" data-target="modal-delete" data-tooltip="{{ v_delete }}" data-post_url="{% url 'election.delete-vote' election.pk v.pk forloop.counter %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-user-minus"></i>
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
19
elections/templates/elections/option_update.html
Normal file
19
elections/templates/elections/option_update.html
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n static string %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% for error in form.non_field_errors %}
|
||||
<div class="notification is-danger">
|
||||
{{ error }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<h1 class="title">{% trans "Modification d'une option" %}</h1>
|
||||
<hr>
|
||||
|
||||
{% url 'election.admin' option.question.election.pk as r_url %}
|
||||
{% include "forms/common-form.html" with anchor=o_|concatenate:option.pk %}
|
||||
|
||||
{% endblock %}
|
||||
19
elections/templates/elections/question_update.html
Normal file
19
elections/templates/elections/question_update.html
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n static string %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% for error in form.non_field_errors %}
|
||||
<div class="notification is-danger">
|
||||
{{ error }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<h1 class="title">{% trans "Modification d'une question" %}</h1>
|
||||
<hr>
|
||||
|
||||
{% url 'election.admin' question.election.pk as r_url %}
|
||||
{% include "forms/common-form.html" with errors=False r_anchor="q_"|concatenate:question.pk %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{% load i18n %}
|
||||
|
||||
<div class="panel-block">
|
||||
<div class="columns is-centered is-flex-grow-1 is-mobile">
|
||||
<div class="columns is-centered is-flex-grow-1">
|
||||
<div class="column is-narrow">
|
||||
<table class="table is-bordered is-striped">
|
||||
<thead>
|
||||
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
<tbody>
|
||||
{% for line, o in matrix %}
|
||||
{% with loser=forloop.counter %}
|
||||
<tr>
|
||||
<th class="has-text-centered">
|
||||
<span class="icon-text">
|
||||
|
|
@ -35,9 +36,10 @@
|
|||
</th>
|
||||
|
||||
{% for cell, class in line %}
|
||||
<td class="has-text-centered has-tooltip-primary {{ class }}" {% if cell.value %}data-tooltip="{% blocktrans with winner=cell.winner loser=cell.loser value=cell.value %}L'option {{ winner }} est préférée à l'option {{ loser }} par {{ value }} voix.{% endblocktrans %}{% endif %}">{{ cell.value }}</td>
|
||||
<td class="has-text-centered has-tooltip-primary {{ class }}" {% if cell %}data-tooltip="{% blocktrans with winner=forloop.counter %}L'option {{ winner }} est préférée à l'option {{ loser }} par {{ cell }} voix.{% endblocktrans %}{% endif %}">{{ cell }}</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -3,11 +3,6 @@
|
|||
|
||||
|
||||
{% block extra_head %}
|
||||
{# Pendant l'envoi on rafraîchit automatiquement #}
|
||||
{% if election.sent_mail is None %}
|
||||
<meta http-equiv="refresh" content="20">
|
||||
{% endif %}
|
||||
|
||||
<script>
|
||||
{% if not election.sent_mail %}
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
|
|
@ -26,38 +21,42 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<div class="level is-mobile">
|
||||
<div class="level-left is-flex-shrink-1">
|
||||
<div class="item-level is-flex-shrink-1 pr-3">
|
||||
<div class="level is-flex-widescreen">
|
||||
<div class="level-left">
|
||||
<div class="item-level">
|
||||
<h1 class="title">{% trans "Gestion de la liste de votant·e·s" %}</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
<div class="level-item is-hidden-touch">
|
||||
{% if election.sent_mail is False %}
|
||||
{% if election.sent_mail is False %}
|
||||
<div class="level-item">
|
||||
<a class="button is-light is-outlined is-primary" href="{% url 'election.mail-voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-envelope-open"></i>
|
||||
</span>
|
||||
<span>{% trans "Envoyer le mail d'annonce" %}</span>
|
||||
</a>
|
||||
{% elif election.sent_mail is None %}
|
||||
<a class="button is-light is-outlined is-warning" href="javascript:location.reload();">
|
||||
</div>
|
||||
{% elif election.sent_mail is None %}
|
||||
<div class="level-item">
|
||||
<span class="button is-light is-outlined is-warning">
|
||||
<span class="icon">
|
||||
<i class="fas fa-sync-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Mail en cours de distribution" %}</span>
|
||||
</a>
|
||||
{% else %}
|
||||
</span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="level-item">
|
||||
<span class="button is-light is-outlined is-success">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
<span>{% trans "Mail envoyé" %}</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="level-item">
|
||||
<a class="button is-primary" href="{% url 'election.admin' election.pk %}">
|
||||
|
|
@ -70,34 +69,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="level-item is-hidden-desktop">
|
||||
{% if election.sent_mail is False %}
|
||||
<a class="button is-light is-outlined is-primary" href="{% url 'election.mail-voters' election.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-envelope-open"></i>
|
||||
</span>
|
||||
<span>{% trans "Envoyer le mail d'annonce" %}</span>
|
||||
</a>
|
||||
{% elif election.sent_mail is None %}
|
||||
<a class="button is-light is-outlined is-warning" href="javascript:location.reload();">
|
||||
<span class="icon">
|
||||
<i class="fas fa-sync-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Mail en cours de distribution" %}</span>
|
||||
</a>
|
||||
{% else %}
|
||||
<span class="button is-light is-outlined is-success">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
<span>{% trans "Mail envoyé" %}</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{# Si on a déjà envoyé le mail avec les identifiants, on ne peut plus changer la liste #}
|
||||
{% if not election.sent_mail %}
|
||||
{% if election.sent_mail is False %}
|
||||
<hr>
|
||||
<div class="message is-warning">
|
||||
<div class="message-body">
|
||||
{% trans "Importez un fichier au format CSV, avec sur la première colonne le login, sur la deuxième, le nom et prénom et enfin l'adresse email sur la troisième. Soit :<br><br><pre>Login_1,Prénom/Nom_1,mail_1@machin.test<br>Login_2,Prénom/Nom_2,mail_2@bidule.test<br>...</pre>" %}
|
||||
|
|
@ -143,39 +117,37 @@
|
|||
<hr>
|
||||
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-12">
|
||||
<div class="table-container">
|
||||
<table class="table is-fullwidth is-bordered is-striped has-text-centered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Login" %}</th>
|
||||
<th>{% trans "Nom" %}</th>
|
||||
<th>{% trans "Email" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<div class="column is-two-thirds">
|
||||
<table class="table is-fullwidth is-bordered is-striped has-text-centered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Login" %}</th>
|
||||
<th>{% trans "Nom" %}</th>
|
||||
<th>{% trans "Email" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for v in voters %}
|
||||
<tr>
|
||||
<td>{{ v.base_username }}</td>
|
||||
<td>{{ v.full_name }}</td>
|
||||
<td>
|
||||
{{ v.email }}
|
||||
{% if v.has_valid_email %}
|
||||
<span class="icon has-text-success is-pulled-right">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
{% elif v.has_valid_email is False %}
|
||||
<span class="icon has-text-danger is-pulled-right">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<tbody>
|
||||
{% for v in voters %}
|
||||
<tr>
|
||||
<td>{{ v.base_username }}</td>
|
||||
<td>{{ v.full_name }}</td>
|
||||
<td>
|
||||
{{ v.email }}
|
||||
{% if v.has_valid_email %}
|
||||
<span class="icon has-text-success is-pulled-right">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
{% elif v.has_valid_email is False %}
|
||||
<span class="icon has-text-danger is-pulled-right">
|
||||
<i class="fas fa-times"></i>
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
{% block vote_form %}{% endblock %}
|
||||
{% block vote_form %}{% endblock %}
|
||||
|
||||
<div class="field is-grouped is-centered">
|
||||
<div class="control is-expanded">
|
||||
|
|
|
|||
|
|
@ -5,30 +5,30 @@
|
|||
{% block extra_head %}
|
||||
<script>
|
||||
const nb_options = {{ nb_options }};
|
||||
const rank_zones = new Array(nb_options + 1);
|
||||
let ranks_used = nb_options;
|
||||
var ranks_used = nb_options;
|
||||
var rank_zones = new Array(nb_options + 1);
|
||||
var $unranked;
|
||||
|
||||
function getLabelText(i) {
|
||||
const label = _$('.label label', i.closest('.field'), false).innerHTML;
|
||||
function getLabelText($input) {
|
||||
var label = $input.closest('.field').querySelector('.label label').innerHTML;
|
||||
return label.substring(0, label.length - 1).trim();
|
||||
}
|
||||
|
||||
function collapseRanks() {
|
||||
// On décale pour éviter les rangs vides
|
||||
for (let j = 1; j < nb_options; j++) {
|
||||
for (let i = 1; i < nb_options; i++) {
|
||||
// On a au moins le tag avec le numéro du rang
|
||||
if (rank_zones[j].childElementCount == 1) {
|
||||
if (rank_zones[i].childElementCount == 1) {
|
||||
// On cherche le prochain rang avec des options
|
||||
let next_rank = j + 1;
|
||||
var next_rank = i + 1;
|
||||
for (; next_rank < nb_options && rank_zones[next_rank].childElementCount == 1; next_rank++) {}
|
||||
|
||||
// On déplace les options
|
||||
while (rank_zones[next_rank].childElementCount > 1) {
|
||||
const t = rank_zones[next_rank].lastChild;
|
||||
const i = _id(t.dataset.input);
|
||||
i.value = j.toString();
|
||||
rank_zones[j].append(t);
|
||||
let $tile = rank_zones[next_rank].lastChild;
|
||||
let $input = document.getElementById($tile.dataset.input);
|
||||
$input.value = i.toString();
|
||||
rank_zones[i].append($tile);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -36,6 +36,14 @@
|
|||
// On recalcule ranks_used
|
||||
for (ranks_used = 0; ranks_used < nb_options && rank_zones[ranks_used + 1].childElementCount > 1; ranks_used++) {}
|
||||
|
||||
// On affiche le bouton + si besoin
|
||||
// let $add_rank = document.getElementById('rank-add');
|
||||
// if (ranks_used < (nb_options - 1)) {
|
||||
// $add_rank.parentElement.classList.remove('is-hidden')
|
||||
// } else {
|
||||
// $add_rank.parentElement.classList.add('is-hidden')
|
||||
// }
|
||||
|
||||
// On cache les zones non utilisées, sauf une
|
||||
for (let i = 1; i <= nb_options; i++) {
|
||||
if (i > (ranks_used + 1)) {
|
||||
|
|
@ -47,19 +55,19 @@
|
|||
}
|
||||
|
||||
function moveOptions() {
|
||||
_$('.control .input').forEach(i => {
|
||||
(document.querySelectorAll('.control .input') || []).forEach($input => {
|
||||
// On rajoute la tuile dans le classement ou dans les non classées
|
||||
const r = parseInt(i.value);
|
||||
const t = _id(`tile-${i.id}`);
|
||||
const rank = parseInt($input.value);
|
||||
var $tile = document.getElementById(`tile-${$input.id}`);
|
||||
|
||||
if (!(typeof r === 'undefined') && r > 0 && r <= nb_options) {
|
||||
rank_zones[r].appendChild(t);
|
||||
rank_zones[r].parentElement.classList.remove('is-hidden');
|
||||
ranks_used = Math.max(r, ranks_used);
|
||||
if (!(typeof rank === 'undefined') && rank > 0 && rank <= nb_options) {
|
||||
rank_zones[rank].appendChild($tile);
|
||||
rank_zones[rank].parentElement.classList.remove('is-hidden');
|
||||
ranks_used = Math.max(rank, ranks_used);
|
||||
} else {
|
||||
$unranked.appendChild(t);
|
||||
$unranked.appendChild($tile);
|
||||
// On enlève les valeurs non règlementaires
|
||||
i.value = '';
|
||||
$input.value = '';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -79,19 +87,26 @@
|
|||
// On récupère l'id de la tuile à déplacer
|
||||
const data = event.dataTransfer.getData('text/plain');
|
||||
|
||||
const d = event.target.closest('.drop-zone');
|
||||
var $target = event.target.closest('.drop-zone');
|
||||
|
||||
const r = d.dataset.rank;
|
||||
const t = _id(data);
|
||||
const i = _id(t.dataset.input);
|
||||
if ($target.id == 'rank-add') {
|
||||
ranks_used += 1;
|
||||
|
||||
$target = rank_zones[ranks_used];
|
||||
$target.parentElement.classList.remove('is-hidden');
|
||||
}
|
||||
|
||||
const rank = $target.dataset.rank;
|
||||
var $tile = document.getElementById(data);
|
||||
var $input = document.getElementById($tile.dataset.input);
|
||||
|
||||
// Si on ne change pas de rang, pas besoin de déplacer l'option
|
||||
if (i.value != r) {
|
||||
if ($input.value != rank) {
|
||||
// On déplace l'option
|
||||
d.appendChild(t);
|
||||
$target.appendChild($tile);
|
||||
|
||||
// On enregistre le rang dans le formulaire
|
||||
i.value = r;
|
||||
$input.value = rank;
|
||||
}
|
||||
|
||||
collapseRanks();
|
||||
|
|
@ -99,35 +114,37 @@
|
|||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
// Affiche le modal et remplit le récapitulatif
|
||||
_id('confirm-button').addEventListener('click', () => {
|
||||
const ranks = new Array(nb_options + 1);
|
||||
document.getElementById('confirm-button').addEventListener('click', () => {
|
||||
var $modal_body = document.getElementById('modal-body');
|
||||
|
||||
_$('.control .input').forEach(i => {
|
||||
const r = parseInt(i.value) || nb_options;
|
||||
var ranks = new Array(nb_options + 1);
|
||||
|
||||
const o = getLabelText(i)
|
||||
(document.querySelectorAll('.control .input') || []).forEach($input => {
|
||||
var rank = parseInt($input.value) || nb_options;
|
||||
|
||||
if (r > 0 && r <= nb_options) {
|
||||
ranks[r] = (ranks[r] || []).concat([o]);
|
||||
var option = getLabelText($input)
|
||||
|
||||
if (rank > 0 && rank <= nb_options) {
|
||||
ranks[rank] = (ranks[rank] || []).concat([option]);
|
||||
} else {
|
||||
ranks[nb_options] = (ranks[nb_options] || []).concat([o]);
|
||||
ranks[nb_options] = (ranks[nb_options] || []).concat([option]);
|
||||
}
|
||||
});
|
||||
|
||||
let trs = '';
|
||||
var table_rows = '';
|
||||
|
||||
for (let j = 1; j <= nb_options; j++) {
|
||||
let option_list = '';
|
||||
for (let i = 1; i <= nb_options; i++) {
|
||||
var option_list = '';
|
||||
|
||||
if (!(typeof ranks[j] === 'undefined')) {
|
||||
for (option of ranks[j]) {
|
||||
if (!(typeof ranks[i] === 'undefined')) {
|
||||
for (option of ranks[i]) {
|
||||
option_list += `${option}<br>`;
|
||||
}
|
||||
}
|
||||
trs += `<tr><th>${j}</th><td><div>${option_list}</div></td></tr>\n`
|
||||
table_rows += `<tr><th>${i}</th><td><div>${option_list}</div></td></tr>\n`
|
||||
}
|
||||
|
||||
_id('modal-body').innerHTML = `
|
||||
$modal_body.innerHTML = `
|
||||
<table class="table is-fullwidth is-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -136,60 +153,62 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
${trs}
|
||||
${table_rows}
|
||||
</tbody>
|
||||
</table>`;
|
||||
});
|
||||
|
||||
// Change le mode de remplissge de formulaire (input vs drag & drop)
|
||||
_id('change-method').addEventListener('click', () => {
|
||||
const h = _id('hide-form');
|
||||
const d = _id('drag-zone');
|
||||
const b = _id('change-method');
|
||||
document.getElementById('change-method').addEventListener('click', () => {
|
||||
var $hide = document.getElementById('hide-form');
|
||||
var $drag_zone = document.getElementById('drag-zone');
|
||||
var $method_button = document.getElementById('change-method');
|
||||
|
||||
// On échange ce qui est visible
|
||||
h.classList.toggle('is-hidden');
|
||||
d.classList.toggle('is-hidden');
|
||||
$hide.classList.toggle('is-hidden');
|
||||
$drag_zone.classList.toggle('is-hidden');
|
||||
|
||||
if (h.classList.contains('is-hidden')) {
|
||||
b.innerHTML = "{% trans "Utiliser le formulaire classique" %}";
|
||||
if ($hide.classList.contains('is-hidden')) {
|
||||
$method_button.innerHTML = "{% trans "Utiliser le formulaire classique" %}";
|
||||
|
||||
moveOptions();
|
||||
collapseRanks();
|
||||
} else {
|
||||
b.innerHTML = "{% trans "Utiliser le cliquer-déposer" %}";
|
||||
$method_button.innerHTML = "{% trans "Utiliser le cliquer-déposer" %}";
|
||||
}
|
||||
});
|
||||
|
||||
// Initialise les éléments pour le formulaire interactif
|
||||
$unranked = _id('unranked');
|
||||
$unranked = document.getElementById('unranked');
|
||||
|
||||
for (let i = 1; i <= nb_options; i++) {
|
||||
rank_zones[i] = _id(`rank-${i}`);
|
||||
rank_zones[i] = document.getElementById(`rank-${i}`);
|
||||
}
|
||||
|
||||
_$('.control .input').forEach(i => {
|
||||
(document.querySelectorAll('.control .input') || []).forEach($input => {
|
||||
var option = getLabelText($input);
|
||||
|
||||
// On créé une tuile avec le nom de l'option
|
||||
const t = document.createElement('div');
|
||||
var $tile = document.createElement('div');
|
||||
|
||||
t.classList.add('tile', 'is-parent', 'is-flex-grow-0');
|
||||
t.id = `tile-${i.id}`;
|
||||
t.dataset.input = i.id;
|
||||
t.innerHTML = `<p class="tile is-child notification is-primary is-grabable">${getLabelText(i)}</p>`;
|
||||
$tile.classList.add('tile', 'is-parent', 'is-flex-grow-0');
|
||||
$tile.id = `tile-${$input.id}`;
|
||||
$tile.dataset.input = $input.id;
|
||||
$tile.innerHTML = `<p class="tile is-child notification is-primary">${option}</p>`;
|
||||
|
||||
t.setAttribute('draggable', true);
|
||||
t.addEventListener('dragstart', dragstart_handler);
|
||||
$tile.setAttribute('draggable', true);
|
||||
$tile.addEventListener('dragstart', dragstart_handler);
|
||||
|
||||
// Par défaut on ajoute la tuile dans undefined
|
||||
$unranked.appendChild(t);
|
||||
$unranked.appendChild($tile);
|
||||
});
|
||||
|
||||
moveOptions();
|
||||
collapseRanks();
|
||||
|
||||
_$('.drop-zone').forEach(z => {
|
||||
z.addEventListener('drop', drop_handler);
|
||||
z.addEventListener('dragover', dragover_handler);
|
||||
document.querySelectorAll('.drop-zone').forEach($zone => {
|
||||
$zone.addEventListener('drop', drop_handler);
|
||||
$zone.addEventListener('dragover', dragover_handler);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -217,11 +236,22 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="tile is-parent is-flex-grow-0 is-hidden">
|
||||
<div id="rank-add" class="tile is-child notification has-text-centered drop-zone">
|
||||
<span class="icon-text subtitle has-text-primary">
|
||||
<span class="icon">
|
||||
<i class="fas fa-plus"></i>
|
||||
</span>
|
||||
<span>{% trans "Ajouter un rang" %}</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tile is-parent">
|
||||
<div id="unranked" class="tile is-vertical drop-zone notification" data-rank="">
|
||||
</div>
|
||||
<div class="tile is-parent">
|
||||
<div id="unranked" class="tile is-vertical drop-zone notification" data-rank="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,19 @@
|
|||
{% block extra_head %}
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
_id('confirm-button').addEventListener('click', () => {
|
||||
let selected_rows = '';
|
||||
document.getElementById('confirm-button').addEventListener('click', () => {
|
||||
var $modal_body = document.getElementById('modal-body');
|
||||
|
||||
_$('.checkbox input').forEach(c => {
|
||||
if (c.checked) {
|
||||
selected_rows += `<tr><td>${c.nextSibling.textContent.trim()}</td></tr>\n`;
|
||||
var selected_rows = '';
|
||||
|
||||
(document.querySelectorAll('.checkbox input') || []).forEach($checkbox => {
|
||||
if ($checkbox.checked) {
|
||||
let option_text = $checkbox.nextSibling.textContent.trim();
|
||||
selected_rows += '<tr><td>' + option_text + '</td></tr>\n';
|
||||
}
|
||||
});
|
||||
|
||||
_id('modal-body').innerHTML = `
|
||||
$modal_body.innerHTML = `
|
||||
<table class="table is-fullwidth">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.test import TestCase
|
||||
|
|
@ -7,10 +5,7 @@ from django.utils.translation import gettext_lazy as _
|
|||
|
||||
from .test_utils import create_election
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
User = get_user_model()
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class UserTests(TestCase):
|
||||
|
|
@ -45,11 +40,8 @@ class UserTests(TestCase):
|
|||
session["CASCONNECTED"] = True
|
||||
session.save()
|
||||
|
||||
assert session.session_key is not None
|
||||
|
||||
# On sauvegarde le cookie de session
|
||||
session_cookie_name = settings.SESSION_COOKIE_NAME
|
||||
|
||||
self.client.cookies[session_cookie_name] = session.session_key
|
||||
|
||||
self.assertFalse(self.cas_user.can_vote(self.client, self.election_1))
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.test import TestCase
|
||||
from django.urls import reverse
|
||||
|
||||
from .test_utils import create_election
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
from django.contrib.auth import get_user_model
|
||||
User = get_user_model()
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class AdminViewsTest(TestCase):
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
from django.http.request import HttpRequest
|
||||
|
||||
from elections.models import User
|
||||
|
||||
|
||||
class AuthenticatedRequest(HttpRequest):
|
||||
user: User
|
||||
|
|
@ -49,33 +49,33 @@ urlpatterns = [
|
|||
# Question views
|
||||
path(
|
||||
"add-question/<int:pk>",
|
||||
views.CreateQuestionView.as_view(),
|
||||
views.AddQuestionView.as_view(),
|
||||
name="election.add-question",
|
||||
),
|
||||
path(
|
||||
"mod-question/<int:pk>",
|
||||
views.UpdateQuestionView.as_view(),
|
||||
views.ModQuestionView.as_view(),
|
||||
name="election.mod-question",
|
||||
),
|
||||
path(
|
||||
"del-question/<int:pk>",
|
||||
views.DeleteQuestionView.as_view(),
|
||||
views.DelQuestionView.as_view(),
|
||||
name="election.del-question",
|
||||
),
|
||||
# Option views
|
||||
path(
|
||||
"add-option/<int:pk>",
|
||||
views.CreateOptionView.as_view(),
|
||||
views.AddOptionView.as_view(),
|
||||
name="election.add-option",
|
||||
),
|
||||
path(
|
||||
"mod-option/<int:pk>",
|
||||
views.UpdateOptionView.as_view(),
|
||||
views.ModOptionView.as_view(),
|
||||
name="election.mod-option",
|
||||
),
|
||||
path(
|
||||
"del-option/<int:pk>",
|
||||
views.DeleteOptionView.as_view(),
|
||||
views.DelOptionView.as_view(),
|
||||
name="election.del-option",
|
||||
),
|
||||
# Common views
|
||||
|
|
|
|||
|
|
@ -1,46 +1,31 @@
|
|||
import csv
|
||||
import io
|
||||
import smtplib
|
||||
from typing import TYPE_CHECKING, TypeGuard
|
||||
|
||||
import networkx as nx
|
||||
import numpy as np
|
||||
from networkx.algorithms.dag import ancestors, descendants
|
||||
from numpy._typing import NDArray
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.hashers import make_password
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.files.base import File
|
||||
from django.core.mail import EmailMessage
|
||||
from django.core.validators import validate_email
|
||||
from django.forms import BaseFormSet
|
||||
from django.template.loader import render_to_string
|
||||
from django.urls import reverse
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from shared.auth.utils import generate_password
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.forms import RankVoteForm, SelectVoteForm
|
||||
from elections.models import Election, Question, RankedVote, Vote
|
||||
from elections.typing import User
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Classes pour différencier les différents types de questions
|
||||
# #############################################################################
|
||||
|
||||
|
||||
def has_rank(v: "Vote") -> TypeGuard["RankedVote"]:
|
||||
return hasattr(v, "rank")
|
||||
|
||||
|
||||
class CastFunctions:
|
||||
"""Classe pour enregistrer les votes"""
|
||||
|
||||
@staticmethod
|
||||
def cast_select(user: "User", vote_form: "BaseFormSet[SelectVoteForm]"):
|
||||
def cast_select(user, vote_form):
|
||||
"""On enregistre un vote classique"""
|
||||
selected, n_selected = [], []
|
||||
for v in vote_form:
|
||||
|
|
@ -52,8 +37,7 @@ class CastFunctions:
|
|||
user.votes.add(*selected)
|
||||
user.votes.remove(*n_selected)
|
||||
|
||||
@staticmethod
|
||||
def cast_rank(user: "User", vote_form: "BaseFormSet[RankVoteForm]"):
|
||||
def cast_rank(user, vote_form):
|
||||
"""On enregistre un vote par classement"""
|
||||
from .models import Rank, Vote
|
||||
|
||||
|
|
@ -69,8 +53,7 @@ class CastFunctions:
|
|||
|
||||
for v in vote_form:
|
||||
vote = votes[v.instance]
|
||||
|
||||
if has_rank(vote):
|
||||
if hasattr(vote, "rank"):
|
||||
vote.rank.rank = v.cleaned_data["rank"]
|
||||
ranks_update.append(vote.rank)
|
||||
else:
|
||||
|
|
@ -83,8 +66,7 @@ class CastFunctions:
|
|||
class TallyFunctions:
|
||||
"""Classe pour gérer les dépouillements"""
|
||||
|
||||
@staticmethod
|
||||
def tally_select(question: "Question") -> None:
|
||||
def tally_select(question):
|
||||
"""On dépouille un vote classique"""
|
||||
from .models import Option
|
||||
|
||||
|
|
@ -104,8 +86,7 @@ class TallyFunctions:
|
|||
|
||||
Option.objects.bulk_update(options, ["nb_votes", "winner"])
|
||||
|
||||
@staticmethod
|
||||
def tally_schultze(question: "Question") -> None:
|
||||
def tally_schultze(question):
|
||||
"""On dépouille un vote par classement et on crée la matrice des duels"""
|
||||
from .models import Duel, Option, Rank
|
||||
|
||||
|
|
@ -121,12 +102,12 @@ class TallyFunctions:
|
|||
else:
|
||||
ranks_by_user[user] = [r]
|
||||
|
||||
ballots: list[NDArray[np.int_]] = []
|
||||
ballots = []
|
||||
|
||||
# Pour chaque votant·e, on regarde son classement
|
||||
for user in ranks_by_user:
|
||||
votes = ranks_by_user[user]
|
||||
ballot = np.zeros((nb_options, nb_options), dtype=int)
|
||||
ballot = np.zeros((nb_options, nb_options))
|
||||
|
||||
for i in range(nb_options):
|
||||
for j in range(i):
|
||||
|
|
@ -140,9 +121,6 @@ class TallyFunctions:
|
|||
# des duels
|
||||
duels = sum(ballots)
|
||||
|
||||
# As ballots is not empty, sum cannot be 0
|
||||
assert duels != 0
|
||||
|
||||
# Configuration du graphe
|
||||
graph = nx.DiGraph()
|
||||
|
||||
|
|
@ -185,11 +163,11 @@ class TallyFunctions:
|
|||
# le plus faible
|
||||
min_weight = min(nx.get_edge_attributes(graph, "weight").values())
|
||||
min_edges = []
|
||||
for u, v in graph.edges():
|
||||
for (u, v) in graph.edges():
|
||||
if graph[u][v]["weight"] == min_weight:
|
||||
min_edges.append((u, v))
|
||||
|
||||
for u, v in min_edges:
|
||||
for (u, v) in min_edges:
|
||||
graph.remove_edge(u, v)
|
||||
|
||||
# Les options gagnantes sont celles encore présentes dans le graphe
|
||||
|
|
@ -203,31 +181,29 @@ class TallyFunctions:
|
|||
class ValidateFunctions:
|
||||
"""Classe pour valider les formsets selon le type de question"""
|
||||
|
||||
@staticmethod
|
||||
def always_true(_) -> bool:
|
||||
"""Renvoie True pour les votes sans validation particulière"""
|
||||
def always_true(vote_form):
|
||||
"""Retourne True pour les votes sans validation particulière"""
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def unique_selected(vote_form: "BaseFormSet[SelectVoteForm]") -> bool:
|
||||
def unique_selected(vote_form):
|
||||
"""Vérifie qu'une seule option est choisie"""
|
||||
|
||||
nb_selected = sum(v.cleaned_data["selected"] for v in vote_form)
|
||||
nb_selected = 0
|
||||
for v in vote_form:
|
||||
nb_selected += v.cleaned_data["selected"]
|
||||
|
||||
if nb_selected == 0:
|
||||
vote_form._non_form_errors.append( # pyright: ignore
|
||||
vote_form._non_form_errors.append(
|
||||
ValidationError(_("Vous devez sélectionnner une option."))
|
||||
)
|
||||
return False
|
||||
elif nb_selected > 1:
|
||||
vote_form._non_form_errors.append( # pyright: ignore
|
||||
vote_form._non_form_errors.append(
|
||||
ValidationError(_("Vous ne pouvez pas sélectionner plus d'une option."))
|
||||
)
|
||||
return False
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def limit_ranks(vote_form: "BaseFormSet[RankVoteForm]"):
|
||||
def limit_ranks(vote_form):
|
||||
"""Limite le classement au nombre d'options"""
|
||||
nb_options = len(vote_form)
|
||||
valid = True
|
||||
|
|
@ -253,34 +229,28 @@ class ValidateFunctions:
|
|||
class ResultsData:
|
||||
"""Classe pour afficher des informations supplémentaires après la fin d'une élection"""
|
||||
|
||||
@staticmethod
|
||||
def select(_: "Question") -> str:
|
||||
def select(question):
|
||||
"""On renvoie l'explication des couleurs"""
|
||||
return render_to_string("elections/results/select.html")
|
||||
|
||||
@staticmethod
|
||||
def rank(question: "Question") -> str:
|
||||
def rank(question):
|
||||
"""On récupère la matrice des résultats et on l'affiche"""
|
||||
duels = question.duels.all()
|
||||
options = list(question.options.all())
|
||||
n = len(options)
|
||||
|
||||
_matrix = np.full((n, n), {"value": 0}, dtype=dict)
|
||||
matrix = np.empty((n, n), dtype=tuple)
|
||||
_matrix = np.zeros((n, n), dtype=int)
|
||||
matrix = np.zeros((n, n), dtype=tuple)
|
||||
|
||||
for d in duels:
|
||||
i, j = options.index(d.loser), options.index(d.winner)
|
||||
_matrix[i, j] = {
|
||||
"value": d.amount,
|
||||
"winner": d.winner.get_abbr(j + 1),
|
||||
"loser": d.loser.get_abbr(i + 1),
|
||||
}
|
||||
_matrix[i, j] = d.amount
|
||||
|
||||
for i in range(n):
|
||||
for j in range(n):
|
||||
if _matrix[i, j]["value"] > _matrix[j, i]["value"]:
|
||||
if _matrix[i, j] > _matrix[j, i]:
|
||||
matrix[i, j] = (_matrix[i, j], "is-success")
|
||||
elif _matrix[i, j]["value"] < _matrix[j, i]["value"]:
|
||||
elif _matrix[i, j] < _matrix[j, i]:
|
||||
matrix[i, j] = (_matrix[i, j], "is-danger")
|
||||
else:
|
||||
matrix[i, j] = (_matrix[i, j], "")
|
||||
|
|
@ -296,40 +266,37 @@ class ResultsData:
|
|||
class BallotsData:
|
||||
"""Classe pour afficher les bulletins d'une question"""
|
||||
|
||||
@staticmethod
|
||||
def select(question: "Question") -> str:
|
||||
def select(question):
|
||||
"""Renvoie un tableau affichant les options sélectionnées pour chaque bulletin"""
|
||||
from .models import Vote
|
||||
|
||||
votes = Vote.objects.filter(option__question=question)
|
||||
votes = Vote.objects.filter(option__question=question).select_related("user")
|
||||
|
||||
options = list(question.options.all())
|
||||
|
||||
ballots = {}
|
||||
for v in votes:
|
||||
ballot = ballots.get(v.pseudonymous_user, [False] * len(options))
|
||||
ballot = ballots.get(v.user, [False] * len(options))
|
||||
ballot[options.index(v.option)] = True
|
||||
|
||||
ballots[v.pseudonymous_user] = ballot
|
||||
ballots[v.user] = ballot
|
||||
|
||||
return render_to_string(
|
||||
"elections/ballots/select.html",
|
||||
{"options": options, "ballots": sorted(ballots.values(), reverse=True)},
|
||||
"elections/ballots/select.html", {"options": options, "ballots": ballots}
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def rank(question: "Question") -> str:
|
||||
def rank(question):
|
||||
"""Renvoie un tableau contenant les classements des options par bulletin"""
|
||||
from .models import Rank
|
||||
|
||||
options = list(question.options.all())
|
||||
ranks = Rank.objects.select_related("vote").filter(
|
||||
ranks = Rank.objects.select_related("vote__user").filter(
|
||||
vote__option__in=options
|
||||
)
|
||||
ranks_by_user = {}
|
||||
|
||||
for r in ranks:
|
||||
user = r.vote.pseudonymous_user
|
||||
user = r.vote.user
|
||||
if user in ranks_by_user:
|
||||
ranks_by_user[user].append(r.rank)
|
||||
else:
|
||||
|
|
@ -337,7 +304,7 @@ class BallotsData:
|
|||
|
||||
return render_to_string(
|
||||
"elections/ballots/rank.html",
|
||||
{"options": options, "ballots": sorted(ranks_by_user.values())},
|
||||
{"options": options, "ballots": ranks_by_user},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -346,30 +313,20 @@ class BallotsData:
|
|||
# #############################################################################
|
||||
|
||||
|
||||
def create_users(election: "Election", csv_file: File):
|
||||
def create_users(election, csv_file):
|
||||
"""Crée les votant·e·s pour l'élection donnée, en remplissant les champs
|
||||
`username`, `election` et `full_name`.
|
||||
"""
|
||||
User = get_user_model()
|
||||
|
||||
dialect = csv.Sniffer().sniff(csv_file.readline().decode("utf-8"))
|
||||
csv_file.seek(0)
|
||||
reader = csv.reader(io.StringIO(csv_file.read().decode("utf-8")), dialect)
|
||||
|
||||
users = [
|
||||
User(
|
||||
election=election,
|
||||
username=f"{election.pk}__{username}",
|
||||
email=email,
|
||||
full_name=full_name,
|
||||
for (username, full_name, email) in reader:
|
||||
election.registered_voters.create(
|
||||
username=f"{election.id}__{username}", email=email, full_name=full_name
|
||||
)
|
||||
for (username, full_name, email) in reader
|
||||
]
|
||||
|
||||
User.objects.bulk_create(users)
|
||||
|
||||
|
||||
def check_csv(csv_file: File):
|
||||
def check_csv(csv_file):
|
||||
"""Vérifie que le fichier donnant la liste de votant·e·s est bien formé"""
|
||||
try:
|
||||
dialect = csv.Sniffer().sniff(csv_file.readline().decode("utf-8"))
|
||||
|
|
@ -422,17 +379,16 @@ def check_csv(csv_file: File):
|
|||
return errors
|
||||
|
||||
|
||||
def send_mail(election: "Election", subject: str, body: str, reply_to: str) -> None:
|
||||
def send_mail(election, subject, body, reply_to):
|
||||
"""Envoie le mail d'annonce de l'élection avec identifiants et mot de passe
|
||||
aux votant·e·s, le mdp est généré en même temps que le mail est envoyé.
|
||||
"""
|
||||
User = get_user_model()
|
||||
|
||||
# On n'envoie le mail qu'aux personnes qui n'en n'ont pas déjà reçu un
|
||||
voters = list(election.registered_voters.exclude(has_valid_email=True))
|
||||
e_url = reverse("election.view", args=[election.pk])
|
||||
e_url = reverse("election.view", args=[election.id])
|
||||
url = f"https://vote.eleves.ens.fr{e_url}"
|
||||
start = election.start_date.strftime("%d/%m/%Y %H:%M %Z")
|
||||
end = election.end_date.strftime("%d/%m/%Y %H:%M %Z")
|
||||
messages = []
|
||||
for v in voters:
|
||||
password = generate_password()
|
||||
|
|
@ -444,25 +400,22 @@ def send_mail(election: "Election", subject: str, body: str, reply_to: str) -> N
|
|||
body=body.format(
|
||||
full_name=v.full_name,
|
||||
election_url=url,
|
||||
start=start,
|
||||
end=end,
|
||||
username=v.base_username,
|
||||
password=password,
|
||||
),
|
||||
to=[v.email],
|
||||
reply_to=[reply_to],
|
||||
# On modifie l'adresse de retour d'erreur
|
||||
headers={"From": "Kadenios <klub-dev@ens.fr>"},
|
||||
),
|
||||
v,
|
||||
)
|
||||
)
|
||||
|
||||
for m, v in messages:
|
||||
# get_connection(fail_silently=False).send_messages(messages)
|
||||
for (m, v) in messages:
|
||||
try:
|
||||
m.send()
|
||||
v.has_valid_email = True
|
||||
except smtplib.SMTPException:
|
||||
v.has_valid_email = False
|
||||
else:
|
||||
v.has_valid_email = True
|
||||
|
||||
v.save()
|
||||
User.objects.bulk_update(voters, ["password", "has_valid_email"])
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
import csv
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.core.mail import EmailMessage
|
||||
from django.db import transaction
|
||||
from django.http import Http404, HttpResponse, HttpResponseRedirect
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.utils.text import slugify
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.views.decorators.http import require_POST
|
||||
from django.views.generic import (
|
||||
CreateView,
|
||||
DetailView,
|
||||
|
|
@ -19,9 +21,7 @@ from django.views.generic import (
|
|||
View,
|
||||
)
|
||||
|
||||
from elections.typing import AuthenticatedRequest
|
||||
from shared.json import JsonCreateView, JsonDeleteView, JsonUpdateView
|
||||
from shared.views import BackgroundUpdateView, TimeMixin
|
||||
from shared.views import BackgroundUpdateView
|
||||
|
||||
from .forms import (
|
||||
DeleteVoteForm,
|
||||
|
|
@ -41,15 +41,10 @@ from .mixins import (
|
|||
)
|
||||
from .models import Election, Option, Question, Vote
|
||||
from .staticdefs import MAIL_VOTE_DELETED, MAIL_VOTERS, QUESTION_TYPES, VOTE_RULES
|
||||
from .tasks import pseudonimize_election, send_election_mail
|
||||
from .tasks import send_election_mail
|
||||
from .utils import create_users
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
from django.contrib.auth import get_user_model
|
||||
|
||||
User = get_user_model()
|
||||
User = get_user_model()
|
||||
|
||||
# TODO: access control *everywhere*
|
||||
|
||||
|
|
@ -59,8 +54,6 @@ else:
|
|||
|
||||
|
||||
class ElectionCreateView(AdminOnlyMixin, SuccessMessageMixin, CreateView):
|
||||
object: Election
|
||||
|
||||
model = Election
|
||||
form_class = ElectionForm
|
||||
success_message = _("Élection créée avec succès !")
|
||||
|
|
@ -69,7 +62,7 @@ class ElectionCreateView(AdminOnlyMixin, SuccessMessageMixin, CreateView):
|
|||
def get_success_url(self):
|
||||
return reverse("election.admin", args=[self.object.pk])
|
||||
|
||||
def form_valid(self, form: ElectionForm):
|
||||
def form_valid(self, form):
|
||||
# We need to add the short name and the creator od the election
|
||||
form.instance.short_name = slugify(
|
||||
form.instance.start_date.strftime("%Y-%m-%d") + "_" + form.instance.name
|
||||
|
|
@ -79,26 +72,7 @@ class ElectionCreateView(AdminOnlyMixin, SuccessMessageMixin, CreateView):
|
|||
return super().form_valid(form)
|
||||
|
||||
|
||||
class ElectionDeleteView(CreatorOnlyMixin, BackgroundUpdateView):
|
||||
model = Election
|
||||
pattern_name = "election.list"
|
||||
|
||||
def get_object(self):
|
||||
obj: Election = super().get_object()
|
||||
# On ne peut supprimer que les élections n'ayant pas eu de vote et dont
|
||||
# le mail d'annonce n'a pas été fait
|
||||
if obj.voters.exists() or obj.sent_mail:
|
||||
raise Http404
|
||||
return obj
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.get_object().delete()
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
||||
class ElectionAdminView(CreatorOnlyMixin, TimeMixin, DetailView):
|
||||
object: Election
|
||||
|
||||
class ElectionAdminView(CreatorOnlyMixin, DetailView):
|
||||
model = Election
|
||||
template_name = "elections/election_admin.html"
|
||||
|
||||
|
|
@ -108,6 +82,7 @@ class ElectionAdminView(CreatorOnlyMixin, TimeMixin, DetailView):
|
|||
def get_context_data(self, **kwargs):
|
||||
kwargs.update(
|
||||
{
|
||||
"current_time": timezone.now(),
|
||||
"question_types": QUESTION_TYPES,
|
||||
"o_form": OptionForm,
|
||||
"q_form": QuestionForm,
|
||||
|
|
@ -125,7 +100,7 @@ class ElectionSetVisibleView(CreatorOnlyMixin, BackgroundUpdateView):
|
|||
success_message = _("Élection visible !")
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.election: Election = self.get_object()
|
||||
self.election = self.get_object()
|
||||
self.election.visible = True
|
||||
self.election.save()
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
|
@ -151,7 +126,7 @@ class ElectionUploadVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormVi
|
|||
model = Election
|
||||
form_class = UploadVotersForm
|
||||
success_message = _("Liste de votant·e·s importée avec succès !")
|
||||
template_name = "elections/election_upload_voters.html"
|
||||
template_name = "elections/upload_voters.html"
|
||||
|
||||
def get_queryset(self):
|
||||
# On ne peut ajouter une liste d'électeurs que sur une élection restreinte
|
||||
|
|
@ -185,7 +160,7 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
|
|||
model = Election
|
||||
form_class = VoterMailForm
|
||||
success_message = _("Mail d'annonce en cours d'envoi !")
|
||||
template_name = "elections/election_mail_voters.html"
|
||||
template_name = "elections/mail_voters.html"
|
||||
|
||||
def get_queryset(self):
|
||||
# On ne peut envoyer un mail que sur une élection restreinte qui n'a pas
|
||||
|
|
@ -209,11 +184,14 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
|
|||
def form_valid(self, form):
|
||||
self.object.sent_mail = None
|
||||
self.object.save()
|
||||
send_election_mail(
|
||||
election_pk=self.object.pk,
|
||||
subject=form.cleaned_data["objet"],
|
||||
body=form.cleaned_data["message"],
|
||||
reply_to=self.request.user.email,
|
||||
send_election_mail.apply_async(
|
||||
countdown=5,
|
||||
kwargs={
|
||||
"election_pk": self.object.pk,
|
||||
"subject": form.cleaned_data["objet"],
|
||||
"body": form.cleaned_data["message"],
|
||||
"reply_to": self.request.user.email,
|
||||
},
|
||||
)
|
||||
return super().form_valid(form)
|
||||
|
||||
|
|
@ -241,42 +219,64 @@ class ElectionUpdateView(CreatorOnlyEditMixin, SuccessMessageMixin, UpdateView):
|
|||
return super().form_valid(form)
|
||||
|
||||
|
||||
class DeleteVoteView(ClosedElectionMixin, JsonDeleteView):
|
||||
voter: User
|
||||
|
||||
class DeleteVoteView(ClosedElectionMixin, FormView):
|
||||
model = Election
|
||||
template_name = "elections/delete_vote.html"
|
||||
form_class = DeleteVoteForm
|
||||
|
||||
def get_message(self):
|
||||
return {
|
||||
"content": _("Vote de {} supprimé !").format(self.voter.full_name),
|
||||
"class": "success",
|
||||
}
|
||||
def get_success_url(self):
|
||||
return reverse("election.voters", args=[self.object.pk]) + "#v_{anchor}".format(
|
||||
**self.kwargs
|
||||
)
|
||||
|
||||
def get_form_kwargs(self):
|
||||
kwargs = super().get_form_kwargs()
|
||||
kwargs["voter"] = self.voter
|
||||
return kwargs
|
||||
|
||||
def get_queryset(self):
|
||||
# On n'affiche la page que pour les élections ouvertes à toustes
|
||||
return super().get_queryset().filter(restricted=False)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["anchor"] = self.kwargs["anchor"]
|
||||
return context
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.object = super().get_object()
|
||||
self.voter = User.objects.get(pk=self.kwargs["user_pk"])
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
self.object = super().get_object()
|
||||
self.voter = User.objects.get(pk=self.kwargs["user_pk"])
|
||||
return super().post(request, *args, **kwargs)
|
||||
|
||||
@transaction.atomic
|
||||
def get(self, request, *args, **kwargs):
|
||||
election = self.get_object()
|
||||
self.voter = User.objects.get(pk=self.kwargs["user_pk"])
|
||||
def form_valid(self, form):
|
||||
if form.cleaned_data["delete"] == "oui":
|
||||
# On envoie un mail à la personne lui indiquant que le vote est supprimé
|
||||
EmailMessage(
|
||||
subject="Vote removed",
|
||||
body=MAIL_VOTE_DELETED.format(
|
||||
full_name=self.voter.full_name,
|
||||
election_name=self.object.name,
|
||||
),
|
||||
to=[self.voter.email],
|
||||
).send()
|
||||
|
||||
# On envoie un mail à la personne lui indiquant que le vote est supprimé
|
||||
EmailMessage(
|
||||
subject="Vote removed",
|
||||
body=MAIL_VOTE_DELETED.format(
|
||||
full_name=self.voter.full_name,
|
||||
election_name=election.name,
|
||||
),
|
||||
to=[self.voter.email],
|
||||
).send()
|
||||
# On supprime les votes
|
||||
Vote.objects.filter(
|
||||
user=self.voter,
|
||||
option__question__election=self.object,
|
||||
).delete()
|
||||
|
||||
# On supprime les votes
|
||||
Vote.objects.filter(
|
||||
user=self.voter,
|
||||
option__question__election=election,
|
||||
).delete()
|
||||
# On marque les questions comme non votées
|
||||
self.voter.cast_elections.remove(self.object)
|
||||
self.voter.cast_questions.remove(*list(self.object.questions.all()))
|
||||
|
||||
# On marque les questions comme non votées
|
||||
self.voter.cast_elections.remove(election)
|
||||
self.voter.cast_questions.remove(*list(election.questions.all()))
|
||||
return self.render_to_json(action="delete")
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
class ElectionTallyView(ClosedElectionMixin, BackgroundUpdateView):
|
||||
|
|
@ -298,11 +298,7 @@ class ElectionTallyView(ClosedElectionMixin, BackgroundUpdateView):
|
|||
q.tally()
|
||||
|
||||
election.tallied = True
|
||||
election.time_tallied = timezone.now()
|
||||
election.save()
|
||||
|
||||
pseudonimize_election(election.pk)
|
||||
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
||||
|
|
@ -318,10 +314,6 @@ class ElectionChangePublicationView(ClosedElectionMixin, BackgroundUpdateView):
|
|||
def get(self, request, *args, **kwargs):
|
||||
self.election = self.get_object()
|
||||
self.election.results_public = not self.election.results_public
|
||||
self.election.time_published = (
|
||||
timezone.now() if self.election.results_public else None
|
||||
)
|
||||
|
||||
self.election.save()
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
|
@ -358,27 +350,46 @@ class ElectionArchiveView(ClosedElectionMixin, BackgroundUpdateView):
|
|||
# #############################################################################
|
||||
|
||||
|
||||
class CreateQuestionView(CreatorOnlyEditMixin, TimeMixin, JsonCreateView):
|
||||
@method_decorator(require_POST, name="dispatch")
|
||||
class AddQuestionView(CreatorOnlyEditMixin, CreateView):
|
||||
model = Election
|
||||
form_class = QuestionForm
|
||||
context_object_name = "q"
|
||||
template_name = "elections/admin/question.html"
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse("election.admin", args=[self.election.pk]) + "#q_add"
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.election = self.get_object()
|
||||
self.election = self.get_object()
|
||||
# On ajoute l'élection voulue à la question créée
|
||||
form.instance.election = self.election
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
class UpdateQuestionView(CreatorOnlyEditMixin, TimeMixin, JsonUpdateView):
|
||||
class ModQuestionView(CreatorOnlyEditMixin, SuccessMessageMixin, UpdateView):
|
||||
model = Question
|
||||
form_class = QuestionForm
|
||||
context_object_name = "q"
|
||||
template_name = "elections/admin/question.html"
|
||||
success_message = _("Question modifiée avec succès !")
|
||||
template_name = "elections/question_update.html"
|
||||
|
||||
def get_success_url(self):
|
||||
return (
|
||||
reverse("election.admin", args=[self.object.election.pk])
|
||||
+ f"#q_{self.object.pk}"
|
||||
)
|
||||
|
||||
|
||||
class DeleteQuestionView(CreatorOnlyEditMixin, JsonDeleteView):
|
||||
class DelQuestionView(CreatorOnlyEditMixin, BackgroundUpdateView):
|
||||
model = Question
|
||||
message = _("Question supprimée !")
|
||||
success_message = _("Question supprimée !")
|
||||
|
||||
def get_redirect_url(self, *args, **kwargs):
|
||||
return reverse("election.admin", args=[self.election.pk]) + "#q_add"
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
question = self.get_object()
|
||||
self.election = question.election
|
||||
question.delete()
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
||||
# #############################################################################
|
||||
|
|
@ -386,27 +397,49 @@ class DeleteQuestionView(CreatorOnlyEditMixin, JsonDeleteView):
|
|||
# #############################################################################
|
||||
|
||||
|
||||
class CreateOptionView(CreatorOnlyEditMixin, TimeMixin, JsonCreateView):
|
||||
@method_decorator(require_POST, name="dispatch")
|
||||
class AddOptionView(CreatorOnlyEditMixin, CreateView):
|
||||
model = Question
|
||||
form_class = OptionForm
|
||||
context_object_name = "o"
|
||||
template_name = "elections/admin/option.html"
|
||||
|
||||
def get_success_url(self):
|
||||
return (
|
||||
reverse("election.admin", args=[self.question.election.pk])
|
||||
+ f"#q_{self.question.pk}"
|
||||
)
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.question = self.get_object()
|
||||
self.question = self.get_object()
|
||||
# On ajoute l'élection voulue à la question créée
|
||||
form.instance.question = self.question
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
class UpdateOptionView(CreatorOnlyEditMixin, TimeMixin, JsonUpdateView):
|
||||
class ModOptionView(CreatorOnlyEditMixin, SuccessMessageMixin, UpdateView):
|
||||
model = Option
|
||||
form_class = OptionForm
|
||||
context_object_name = "o"
|
||||
template_name = "elections/admin/option.html"
|
||||
success_message = _("Option modifiée avec succès !")
|
||||
template_name = "elections/option_update.html"
|
||||
|
||||
def get_success_url(self):
|
||||
return (
|
||||
reverse("election.admin", args=[self.object.question.election.pk])
|
||||
+ f"#o_{self.object.pk}"
|
||||
)
|
||||
|
||||
|
||||
class DeleteOptionView(CreatorOnlyEditMixin, JsonDeleteView):
|
||||
class DelOptionView(CreatorOnlyEditMixin, BackgroundUpdateView):
|
||||
model = Option
|
||||
message = _("Option supprimée !")
|
||||
success_message = _("Option supprimée !")
|
||||
|
||||
def get_redirect_url(self, *args, **kwargs):
|
||||
return reverse("election.admin", args=[self.election.pk]) + "#q_add"
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
option = self.get_object()
|
||||
self.election = option.question.election
|
||||
option.delete()
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
||||
# #############################################################################
|
||||
|
|
@ -431,7 +464,7 @@ class ElectionView(NotArchivedMixin, DetailView):
|
|||
context = super().get_context_data(**kwargs)
|
||||
context["current_time"] = timezone.now()
|
||||
|
||||
if user.is_authenticated and isinstance(user, User):
|
||||
if user.is_authenticated:
|
||||
context["can_vote"] = user.can_vote(self.request, context["election"])
|
||||
context["cast_questions"] = user.cast_questions.all()
|
||||
context["has_voted"] = user.cast_elections.filter(
|
||||
|
|
@ -459,11 +492,10 @@ class ElectionVotersView(NotArchivedMixin, DetailView):
|
|||
election = context["election"]
|
||||
voters = list(election.voters.all())
|
||||
|
||||
if user.is_authenticated and isinstance(user, User):
|
||||
context["can_vote"] = user.can_vote(self.request, context["election"])
|
||||
context["is_admin"] = user.is_admin(election)
|
||||
if user.is_authenticated:
|
||||
can_delete = (
|
||||
election.created_by == user
|
||||
not election.restricted
|
||||
and election.created_by == user
|
||||
and election.end_date < timezone.now()
|
||||
and not election.tallied
|
||||
)
|
||||
|
|
@ -471,7 +503,6 @@ class ElectionVotersView(NotArchivedMixin, DetailView):
|
|||
context["d_form"] = DeleteVoteForm()
|
||||
|
||||
context["can_delete"] = can_delete
|
||||
context["from_admin"] = self.request.GET.get("prev") == "admin"
|
||||
context["voters"] = voters
|
||||
|
||||
return context
|
||||
|
|
@ -485,14 +516,12 @@ class ElectionBallotsView(NotArchivedMixin, DetailView):
|
|||
return (
|
||||
super()
|
||||
.get_queryset()
|
||||
.filter(results_public=True, tallied=True)
|
||||
.filter(tallied=True)
|
||||
.prefetch_related("questions__options")
|
||||
)
|
||||
|
||||
|
||||
class VoteView(OpenElectionOnlyMixin, DetailView):
|
||||
request: AuthenticatedRequest
|
||||
|
||||
model = Question
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
# Generated by Django 3.2.4 on 2021-07-12 17:29
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("faqs", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name="faq",
|
||||
options={"permissions": [("faq_admin", "Can create faqs")]},
|
||||
),
|
||||
]
|
||||
|
|
@ -4,7 +4,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
|
|||
class AdminOnlyMixin(PermissionRequiredMixin):
|
||||
"""Restreint l'accès aux admins"""
|
||||
|
||||
permission_required = "faqs.faq_admin"
|
||||
permission_required = "faqs.is_author"
|
||||
|
||||
|
||||
class CreatorOnlyMixin(AdminOnlyMixin):
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class Faq(models.Model):
|
|||
|
||||
class Meta:
|
||||
permissions = [
|
||||
("faq_admin", "Can create faqs"),
|
||||
("is_author", "Can create faqs"),
|
||||
]
|
||||
constraints = [
|
||||
models.UniqueConstraint(fields=["anchor"], name="unique_faq_anchor")
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{% if perms.faqs.faq_admin %}
|
||||
{% if perms.faqs.is_author %}
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<a class="button is-light is-outlined is-primary" href={% url 'faq.create' %}>
|
||||
|
|
|
|||
3
kadenios/__init__.py
Normal file
3
kadenios/__init__.py
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
from .celery import app as celery_app
|
||||
|
||||
__all__ = ("celery_app",)
|
||||
5
kadenios/apps.py
Normal file
5
kadenios/apps.py
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
from django.contrib.staticfiles.apps import StaticFilesConfig
|
||||
|
||||
|
||||
class IgnoreSrcStaticFilesConfig(StaticFilesConfig):
|
||||
ignore_patterns = StaticFilesConfig.ignore_patterns + ["src/**"]
|
||||
17
kadenios/celery.py
Normal file
17
kadenios/celery.py
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
import os
|
||||
|
||||
from celery import Celery
|
||||
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kadenios.settings.local")
|
||||
|
||||
app = Celery("kadenios")
|
||||
app.config_from_object("django.conf:settings", namespace="CELERY")
|
||||
|
||||
app.autodiscover_tasks()
|
||||
|
||||
|
||||
@app.task(bind=True)
|
||||
def debug_task(self):
|
||||
print(f"{'test'!r}")
|
||||
return 3
|
||||
# print(f"Request: {self.request!r}")
|
||||
1
kadenios/settings/.gitignore
vendored
Normal file
1
kadenios/settings/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
secret.py
|
||||
158
kadenios/settings/common.py
Normal file
158
kadenios/settings/common.py
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
"""
|
||||
Paramètres communs entre dev et prod
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
# #############################################################################
|
||||
# Secrets
|
||||
# #############################################################################
|
||||
|
||||
try:
|
||||
from . import secret
|
||||
except ImportError:
|
||||
raise ImportError(
|
||||
"The secret.py file is missing.\n"
|
||||
"For a development environment, simply copy secret_example.py"
|
||||
)
|
||||
|
||||
|
||||
def import_secret(name):
|
||||
"""
|
||||
Shorthand for importing a value from the secret module and raising an
|
||||
informative exception if a secret is missing.
|
||||
"""
|
||||
try:
|
||||
return getattr(secret, name)
|
||||
except AttributeError:
|
||||
raise RuntimeError("Secret missing: {}".format(name))
|
||||
|
||||
|
||||
SECRET_KEY = import_secret("SECRET_KEY")
|
||||
ADMINS = import_secret("ADMINS")
|
||||
SERVER_EMAIL = import_secret("SERVER_EMAIL")
|
||||
EMAIL_HOST = import_secret("EMAIL_HOST")
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres par défaut pour Django
|
||||
# #############################################################################
|
||||
|
||||
DEBUG = False
|
||||
TESTING = len(sys.argv) > 1 and sys.argv[1] == "test"
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
INSTALLED_APPS = [
|
||||
"django.contrib.admin",
|
||||
"django.contrib.auth",
|
||||
"django.contrib.contenttypes",
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.messages",
|
||||
"kadenios.apps.IgnoreSrcStaticFilesConfig",
|
||||
"django_celery_results",
|
||||
"shared",
|
||||
"elections",
|
||||
"faqs",
|
||||
"authens",
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
"django.middleware.security.SecurityMiddleware",
|
||||
"django.contrib.sessions.middleware.SessionMiddleware",
|
||||
"django.middleware.locale.LocaleMiddleware",
|
||||
"django.middleware.common.CommonMiddleware",
|
||||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||
"django.contrib.messages.middleware.MessageMiddleware",
|
||||
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
||||
]
|
||||
|
||||
ROOT_URLCONF = "kadenios.urls"
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
"BACKEND": "django.template.backends.django.DjangoTemplates",
|
||||
"DIRS": [],
|
||||
"APP_DIRS": True,
|
||||
"OPTIONS": {
|
||||
"context_processors": [
|
||||
"django.template.context_processors.debug",
|
||||
"django.template.context_processors.request",
|
||||
"django.contrib.auth.context_processors.auth",
|
||||
"django.contrib.messages.context_processors.messages",
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = "kadenios.wsgi.application"
|
||||
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
|
||||
|
||||
DEFAULT_FROM_EMAIL = "Kadenios <kadenios@vote.eleves.ens.fr>"
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres de Celery
|
||||
# #############################################################################
|
||||
|
||||
CELERY_RESULT_BACKEND = "django-db"
|
||||
CELERY_CACHE_BACKEND = "default"
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres d'authentification
|
||||
# #############################################################################
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
|
||||
},
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
|
||||
},
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
|
||||
},
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
|
||||
},
|
||||
]
|
||||
|
||||
AUTH_USER_MODEL = "elections.User"
|
||||
AUTHENTICATION_BACKENDS = [
|
||||
"shared.auth.backends.PwdBackend",
|
||||
"shared.auth.backends.CASBackend",
|
||||
"shared.auth.backends.ElectionBackend",
|
||||
]
|
||||
|
||||
LOGIN_URL = reverse_lazy("authens:login")
|
||||
LOGIN_REDIRECT_URL = "/"
|
||||
|
||||
AUTHENS_USE_OLDCAS = False
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres de langage
|
||||
# #############################################################################
|
||||
|
||||
LANGUAGE_CODE = "fr-fr"
|
||||
TIME_ZONE = "Europe/Paris"
|
||||
|
||||
USE_I18N = True
|
||||
USE_L10N = True
|
||||
USE_TZ = True
|
||||
|
||||
LANGUAGES = [
|
||||
("fr", _("Français")),
|
||||
("en", _("Anglais")),
|
||||
]
|
||||
|
||||
LOCALE_PATHS = [os.path.join(BASE_DIR, "shared", "locale")]
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres des fichiers statiques
|
||||
# #############################################################################
|
||||
|
||||
STATIC_URL = "/static/"
|
||||
55
kadenios/settings/local.py
Normal file
55
kadenios/settings/local.py
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
"""
|
||||
Paramètre pour le développement local
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
from .common import * # noqa
|
||||
from .common import BASE_DIR, INSTALLED_APPS, MIDDLEWARE, TESTING
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres Django
|
||||
# #############################################################################
|
||||
|
||||
ALLOWED_HOSTS = []
|
||||
|
||||
DEBUG = True
|
||||
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
|
||||
|
||||
STATIC_URL = "/static/"
|
||||
|
||||
DATABASES = {
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.sqlite3",
|
||||
"NAME": os.path.join(BASE_DIR, "db.sqlite3"),
|
||||
}
|
||||
}
|
||||
|
||||
# Use the default cache backend for local development
|
||||
CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
|
||||
|
||||
# Pas besoin de sécurité en local
|
||||
AUTH_PASSWORD_VALIDATORS = []
|
||||
PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres pour la Django Debug Toolbar
|
||||
# #############################################################################
|
||||
|
||||
|
||||
def show_toolbar(request):
|
||||
"""
|
||||
On active la debug-toolbar en mode développement local sauf :
|
||||
- dans l'admin où ça ne sert pas à grand chose;
|
||||
- si la variable d'environnement DJANGO_NO_DDT est à 1 → ça permet de la désactiver
|
||||
sans modifier ce fichier en exécutant `export DJANGO_NO_DDT=1` dans le terminal
|
||||
qui lance `./manage.py runserver`.
|
||||
"""
|
||||
env_no_ddt = bool(os.environ.get("DJANGO_NO_DDT", None))
|
||||
return DEBUG and not env_no_ddt and not request.path.startswith("/admin/")
|
||||
|
||||
|
||||
if not TESTING:
|
||||
INSTALLED_APPS = INSTALLED_APPS + ["debug_toolbar"]
|
||||
MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware"] + MIDDLEWARE
|
||||
DEBUG_TOOLBAR_CONFIG = {"SHOW_TOOLBAR_CALLBACK": show_toolbar}
|
||||
68
kadenios/settings/prod.py
Normal file
68
kadenios/settings/prod.py
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
"""
|
||||
Paramètres pour la mise en production
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
from .common import * # noqa
|
||||
from .common import BASE_DIR, import_secret
|
||||
|
||||
# #############################################################################
|
||||
# Secrets de production
|
||||
# #############################################################################
|
||||
|
||||
REDIS_PASSWD = import_secret("REDIS_PASSWD")
|
||||
REDIS_DB = import_secret("REDIS_DB")
|
||||
REDIS_HOST = import_secret("REDIS_HOST")
|
||||
REDIS_PORT = import_secret("REDIS_PORT")
|
||||
|
||||
DBNAME = import_secret("DBNAME")
|
||||
DBUSER = import_secret("DBUSER")
|
||||
DBPASSWD = import_secret("DBPASSWD")
|
||||
|
||||
# #############################################################################
|
||||
# À modifier possiblement lors de la mise en production
|
||||
# #############################################################################
|
||||
|
||||
ALLOWED_HOSTS = ["vote.eleves.ens.fr"]
|
||||
|
||||
STATIC_ROOT = os.path.join(os.path.dirname(BASE_DIR), "static")
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres du cache
|
||||
# #############################################################################
|
||||
|
||||
CACHES = {
|
||||
"default": {
|
||||
"BACKEND": "django_redis.cache.RedisCache",
|
||||
"LOCATION": "redis://:{passwd}@{host}:{port}/{db}".format(
|
||||
passwd=REDIS_PASSWD, host=REDIS_HOST, port=REDIS_PORT, db=REDIS_DB
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres de la base de données
|
||||
# #############################################################################
|
||||
|
||||
DATABASES = {
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.postgresql_psycopg2",
|
||||
"NAME": DBNAME,
|
||||
"USER": DBUSER,
|
||||
"PASSWORD": DBPASSWD,
|
||||
"HOST": os.environ.get("DBHOST", ""),
|
||||
}
|
||||
}
|
||||
|
||||
# #############################################################################
|
||||
# Paramètres Https
|
||||
# #############################################################################
|
||||
|
||||
SESSION_COOKIE_SECURE = True
|
||||
CSRF_COOKIE_SECURE = True
|
||||
SECURE_SSL_REDIRECT = True
|
||||
|
||||
SECURE_HSTS_SECONDS = 31536000
|
||||
SECURE_HSTS_PRELOAD = True
|
||||
SECURE_HSTS_INCLUDE_SUBDOMAINS = True
|
||||
14
kadenios/settings/secret_example.py
Normal file
14
kadenios/settings/secret_example.py
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
SECRET_KEY = "f*!6tw8c74)&k_&4$toiw@e=8m00xv_(tmjf9_#wq30wg_7n^8"
|
||||
ADMINS = None
|
||||
SERVER_EMAIL = "root@localhost"
|
||||
EMAIL_HOST = None
|
||||
|
||||
|
||||
DBUSER = "kadenios"
|
||||
DBNAME = "kadenios"
|
||||
DBPASSWD = "O1LxCADDA6Px5SiKvifjvdp3DSjfbp"
|
||||
|
||||
REDIS_PASSWD = "dummy"
|
||||
REDIS_PORT = 6379
|
||||
REDIS_DB = 0
|
||||
REDIS_HOST = "127.0.0.1"
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib import admin
|
||||
from django.urls import include, path
|
||||
|
||||
|
|
@ -7,6 +6,7 @@ from .views import HomeView
|
|||
|
||||
urlpatterns = [
|
||||
path("", HomeView.as_view(), name="kadenios"),
|
||||
path("admin/", admin.site.urls),
|
||||
path("elections/", include("elections.urls")),
|
||||
path("faqs/", include("faqs.urls")),
|
||||
path("auth/", include("shared.auth.urls")),
|
||||
|
|
@ -14,12 +14,6 @@ urlpatterns = [
|
|||
path("i18n/", include("django.conf.urls.i18n")),
|
||||
]
|
||||
|
||||
if settings.DEBUG:
|
||||
urlpatterns += [
|
||||
path("admin/", admin.site.urls),
|
||||
path("__reload__/", include("django_browser_reload.urls")),
|
||||
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
||||
|
||||
if "debug_toolbar" in settings.INSTALLED_APPS:
|
||||
from debug_toolbar import urls as djdt_urls
|
||||
|
||||
|
|
@ -11,6 +11,6 @@ import os
|
|||
|
||||
from django.core.wsgi import get_wsgi_application
|
||||
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kadenios.settings')
|
||||
|
||||
application = get_wsgi_application()
|
||||
|
|
@ -5,7 +5,7 @@ import sys
|
|||
|
||||
|
||||
def main():
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings")
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kadenios.settings.local")
|
||||
try:
|
||||
from django.core.management import execute_from_command_line
|
||||
except ImportError as exc:
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
# Generated by npins. Do not modify; will be overwritten regularly
|
||||
let
|
||||
data = builtins.fromJSON (builtins.readFile ./sources.json);
|
||||
version = data.version;
|
||||
|
||||
mkSource =
|
||||
spec:
|
||||
assert spec ? type;
|
||||
let
|
||||
path =
|
||||
if spec.type == "Git" then
|
||||
mkGitSource spec
|
||||
else if spec.type == "GitRelease" then
|
||||
mkGitSource spec
|
||||
else if spec.type == "PyPi" then
|
||||
mkPyPiSource spec
|
||||
else if spec.type == "Channel" then
|
||||
mkChannelSource spec
|
||||
else
|
||||
builtins.throw "Unknown source type ${spec.type}";
|
||||
in
|
||||
spec // { outPath = path; };
|
||||
|
||||
mkGitSource =
|
||||
{
|
||||
repository,
|
||||
revision,
|
||||
url ? null,
|
||||
hash,
|
||||
branch ? null,
|
||||
...
|
||||
}:
|
||||
assert repository ? type;
|
||||
# At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
|
||||
# In the latter case, there we will always be an url to the tarball
|
||||
if url != null then
|
||||
(builtins.fetchTarball {
|
||||
inherit url;
|
||||
sha256 = hash;
|
||||
})
|
||||
else
|
||||
assert repository.type == "Git";
|
||||
let
|
||||
urlToName =
|
||||
url: rev:
|
||||
let
|
||||
matched = builtins.match "^.*/([^/]*)(\\.git)?$" repository.url;
|
||||
|
||||
short = builtins.substring 0 7 rev;
|
||||
|
||||
appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
|
||||
in
|
||||
"${if matched == null then "source" else builtins.head matched}${appendShort}";
|
||||
name = urlToName repository.url revision;
|
||||
in
|
||||
builtins.fetchGit {
|
||||
url = repository.url;
|
||||
rev = revision;
|
||||
inherit name;
|
||||
narHash = hash;
|
||||
};
|
||||
|
||||
mkPyPiSource =
|
||||
{ url, hash, ... }:
|
||||
builtins.fetchurl {
|
||||
inherit url;
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
mkChannelSource =
|
||||
{ url, hash, ... }:
|
||||
builtins.fetchTarball {
|
||||
inherit url;
|
||||
sha256 = hash;
|
||||
};
|
||||
in
|
||||
if version == 4 then
|
||||
builtins.mapAttrs (_: mkSource) data.pins
|
||||
else
|
||||
throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
"pins": {
|
||||
"nix-pkgs": {
|
||||
"type": "Git",
|
||||
"repository": {
|
||||
"type": "Git",
|
||||
"url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs.git"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "22e90684e355bdd1e257c661b6275c7490f8c50b",
|
||||
"url": null,
|
||||
"hash": "sha256-yEZAv3bK7+gxNM8/31ONwdPIXlyQ5QnNnPDnWl3bXZo="
|
||||
},
|
||||
"nixpkgs": {
|
||||
"type": "Channel",
|
||||
"name": "nixpkgs-unstable",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre646460.0aeab749216e/nixexprs.tar.xz",
|
||||
"hash": "0xa73bs0n28x731hf6ipqrlji0p3qf2a42vfm6g8snnhaab9mfwj"
|
||||
}
|
||||
},
|
||||
"version": 4
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[tool.pyright]
|
||||
reportIncompatibleMethodOverride = false
|
||||
reportIncompatibleVariableOverride = false
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
django==3.2.*
|
||||
django-translated-fields==0.11.*
|
||||
celery==5.1.*
|
||||
django-celery-results
|
||||
django-translated-fields==0.11.1
|
||||
authens>=0.1b2
|
||||
markdown
|
||||
numpy
|
||||
networkx
|
||||
django-background-tasks
|
||||
python-csv
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
from django.contrib.staticfiles.apps import StaticFilesConfig
|
||||
|
||||
|
||||
class IgnoreSrcStaticFilesConfig(StaticFilesConfig):
|
||||
ignore_patterns = StaticFilesConfig.ignore_patterns + ["src/**"]
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
from django.apps import apps
|
||||
from django.conf import settings
|
||||
from django.contrib import admin
|
||||
from django.contrib.admin.sites import AlreadyRegistered
|
||||
|
||||
if settings.DEBUG:
|
||||
models = apps.get_models()
|
||||
|
||||
for model in models:
|
||||
try:
|
||||
admin.site.register(model)
|
||||
except AlreadyRegistered:
|
||||
pass
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
from .staticdefs import CONNECTION_METHODS
|
||||
|
||||
__all__ = [
|
||||
"CONNECTION_METHODS",
|
||||
]
|
||||
|
|
@ -1,15 +1,9 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from authens.backends import ENSCASBackend
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.backends import ModelBackend
|
||||
from django.core.exceptions import PermissionDenied
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
from django.contrib.auth import get_user_model
|
||||
User = get_user_model()
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class CASBackend(ENSCASBackend):
|
||||
|
|
@ -24,12 +18,6 @@ class CASBackend(ENSCASBackend):
|
|||
|
||||
return User.objects.create_user(username=username, email=email, full_name=name)
|
||||
|
||||
def _get_or_create(self, cas_login, attributes):
|
||||
try:
|
||||
return super()._get_or_create(cas_login, attributes)
|
||||
except ValueError:
|
||||
raise PermissionDenied
|
||||
|
||||
|
||||
class PwdBackend(ModelBackend):
|
||||
"""Password authentication"""
|
||||
|
|
@ -63,3 +51,4 @@ class ElectionBackend(ModelBackend):
|
|||
|
||||
if user.check_password(password):
|
||||
return user
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from django import forms
|
||||
from django.contrib.auth import authenticate
|
||||
from django.contrib.auth import forms as auth_forms
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.core.validators import validate_email
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
from django.contrib.auth import get_user_model
|
||||
User = get_user_model()
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class ElectionAuthForm(forms.Form):
|
||||
|
|
@ -87,38 +82,3 @@ class PwdUserForm(forms.ModelForm):
|
|||
class Meta:
|
||||
model = User
|
||||
fields = ["username", "full_name", "email"]
|
||||
|
||||
|
||||
class UserAdminForm(forms.Form):
|
||||
"""
|
||||
Allows to select an user and give them some admin permissions
|
||||
"""
|
||||
|
||||
username = forms.CharField(label=_("Nom d'utilisateur"), max_length=150)
|
||||
|
||||
full_admin = forms.BooleanField(
|
||||
label=_("Passer administrateur de Kadenios"), required=False
|
||||
)
|
||||
faq_admin = forms.BooleanField(
|
||||
label=_("Autoriser à créer des FAQs"), required=False
|
||||
)
|
||||
election_admin = forms.BooleanField(
|
||||
label=_("Autoriser à créer des élections"), required=False
|
||||
)
|
||||
|
||||
def clean(self):
|
||||
cleaned_data = super().clean()
|
||||
username = cleaned_data["username"]
|
||||
|
||||
if not username[:5] in ["cas__", "pwd__"]:
|
||||
self.add_error(
|
||||
"username",
|
||||
_(
|
||||
"Format de login invalide, seuls les comptes CAS ou avec "
|
||||
"mot de passe sont modifiables"
|
||||
),
|
||||
)
|
||||
elif not User.objects.filter(username=username).exists():
|
||||
self.add_error("username", _("Pas d'utilisateur·rice avec ce login"))
|
||||
|
||||
return cleaned_data
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
CONNECTION_METHODS = {
|
||||
"pwd": _("mot de passe"),
|
||||
"cas": _("CAS"),
|
||||
}
|
||||
|
|
@ -9,10 +9,4 @@ urlpatterns = [
|
|||
name="auth.election",
|
||||
),
|
||||
path("pwd-create", views.CreatePwdAccount.as_view(), name="auth.create-account"),
|
||||
path("admin", views.AdminPanelView.as_view(), name="auth.admin"),
|
||||
path(
|
||||
"permissions", views.PermissionManagementView.as_view(), name="auth.permissions"
|
||||
),
|
||||
path("accounts", views.AccountListView.as_view(), name="auth.accounts"),
|
||||
path("admins", views.AdminAccountsView.as_view(), name="auth.admins"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@ import random
|
|||
# Fonctions universelles
|
||||
# #############################################################################
|
||||
|
||||
alphabet = "abcdefghjkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"
|
||||
|
||||
|
||||
def generate_password(size=15):
|
||||
random.seed()
|
||||
alphabet = "abcdefghjkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"
|
||||
password = ""
|
||||
for i in range(size):
|
||||
password += random.choice(alphabet)
|
||||
|
||||
return "".join(random.choice(alphabet) for _ in range(size))
|
||||
return password
|
||||
|
|
|
|||
|
|
@ -1,43 +1,15 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from django.contrib.admin.views.decorators import staff_member_required
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth import views as auth_views
|
||||
from django.contrib.auth.hashers import make_password
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.db.models import QuerySet
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.views.generic import CreateView, FormView, ListView, TemplateView
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.views.generic.edit import CreateView
|
||||
|
||||
from elections.typing import AuthenticatedRequest
|
||||
|
||||
from .forms import ElectionAuthForm, PwdUserForm, UserAdminForm
|
||||
from .forms import ElectionAuthForm, PwdUserForm
|
||||
from .utils import generate_password
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
from django.contrib.auth import get_user_model
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Mixin to restrict access to staff members
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class StaffMemberMixin(UserPassesTestMixin):
|
||||
"""
|
||||
Mixin permettant de restreindre l'accès aux membres `staff`, si la personne
|
||||
n'est pas connectée, renvoie sur la page d'authentification
|
||||
"""
|
||||
|
||||
request: AuthenticatedRequest
|
||||
|
||||
def test_func(self):
|
||||
return self.request.user.is_active and self.request.user.is_staff
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
# #############################################################################
|
||||
# Election Specific Login
|
||||
|
|
@ -56,136 +28,21 @@ class ElectionLoginView(auth_views.LoginView):
|
|||
return super().get_context_data(**kwargs)
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Admin Panel
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class AdminPanelView(StaffMemberMixin, TemplateView):
|
||||
template_name = "auth/admin-panel.html"
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Creation of Password Accounts
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class CreatePwdAccount(StaffMemberMixin, SuccessMessageMixin, CreateView):
|
||||
@method_decorator(staff_member_required, name="dispatch")
|
||||
class CreatePwdAccount(CreateView):
|
||||
model = User
|
||||
form_class = PwdUserForm
|
||||
template_name = "auth/create-user.html"
|
||||
success_url = reverse_lazy("auth.admin")
|
||||
success_message = _("Compte créé avec succès")
|
||||
success_url = reverse_lazy("auth.create-account")
|
||||
|
||||
def form_valid(self, form):
|
||||
# On enregistre un mot de passe aléatoire
|
||||
form.instance.password = make_password(generate_password(32))
|
||||
|
||||
# On envoie un mail pour réinitialiser le mot de passe
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# List of password and CAS users
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class AccountListView(StaffMemberMixin, ListView):
|
||||
model = User
|
||||
template_name = "auth/account-list.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
ctx = super().get_context_data(**kwargs)
|
||||
qs: QuerySet = self.get_queryset() # pyright: ignore
|
||||
|
||||
ctx["cas_users"] = qs.filter(username__startswith="cas__")
|
||||
ctx["pwd_users"] = qs.filter(username__startswith="pwd__")
|
||||
ctx["e_manager"] = User.objects.with_perm(
|
||||
Permission.objects.get(codename="election_admin"),
|
||||
backend="shared.auth.backends.PwdBackend",
|
||||
)
|
||||
ctx["f_manager"] = User.objects.with_perm(
|
||||
Permission.objects.get(codename="faq_admin"),
|
||||
backend="shared.auth.backends.PwdBackend",
|
||||
)
|
||||
|
||||
return ctx
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# Permission management
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class PermissionManagementView(StaffMemberMixin, SuccessMessageMixin, FormView):
|
||||
form_class = UserAdminForm
|
||||
template_name = "auth/permission-management.html"
|
||||
success_message = _("Permissions modifiées avec succès !")
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
kwargs.update({"username": self.request.GET.get("user", None)})
|
||||
return super().get_context_data(**kwargs)
|
||||
|
||||
def get_initial(self):
|
||||
username = self.request.GET.get("user", None)
|
||||
if username is not None:
|
||||
user = User.objects.filter(username=username).first()
|
||||
|
||||
if user is not None:
|
||||
return {
|
||||
"username": username,
|
||||
"full_admin": user.is_staff,
|
||||
"election_admin": user.has_perm("elections.election_admin"),
|
||||
"faq_admin": user.has_perm("faqs.faq_admin"),
|
||||
}
|
||||
|
||||
return {}
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse("auth.permissions") + f"?user={self.user}"
|
||||
|
||||
def form_valid(self, form):
|
||||
user = User.objects.get(username=form.cleaned_data["username"])
|
||||
self.user = user.username
|
||||
|
||||
# Kadenios admin
|
||||
user.is_staff = form.cleaned_data["full_admin"]
|
||||
|
||||
# Election admin
|
||||
election_perm = Permission.objects.get(codename="election_admin")
|
||||
if form.cleaned_data["election_admin"]:
|
||||
election_perm.user_set.add(user) # pyright: ignore
|
||||
else:
|
||||
election_perm.user_set.remove(user) # pyright: ignore
|
||||
|
||||
# FAQ admin
|
||||
faq_perm = Permission.objects.get(codename="faq_admin")
|
||||
if form.cleaned_data["faq_admin"]:
|
||||
faq_perm.user_set.add(user) # pyright: ignore
|
||||
else:
|
||||
faq_perm.user_set.remove(user) # pyright: ignore
|
||||
|
||||
user.save()
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
# #############################################################################
|
||||
# List of special accounts
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class AdminAccountsView(LoginRequiredMixin, TemplateView):
|
||||
template_name = "auth/admin-accounts.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
ctx = super().get_context_data(**kwargs)
|
||||
|
||||
ctx["admin"] = User.objects.filter(is_staff=True)
|
||||
ctx["e_manager"] = User.objects.with_perm(
|
||||
Permission.objects.get(codename="election_admin"),
|
||||
backend="shared.auth.backends.PwdBackend",
|
||||
)
|
||||
ctx["f_manager"] = User.objects.with_perm(
|
||||
Permission.objects.get(codename="faq_admin"),
|
||||
backend="shared.auth.backends.PwdBackend",
|
||||
)
|
||||
return ctx
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
from .mixins import Serializer # noqa
|
||||
from .views import JsonCreateView, JsonDeleteView, JsonDetailView, JsonUpdateView
|
||||
|
||||
__all__ = [
|
||||
"Serializer",
|
||||
"JsonCreateView",
|
||||
"JsonDeleteView",
|
||||
"JsonDetailView",
|
||||
"JsonUpdateView",
|
||||
]
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
import json
|
||||
|
||||
|
||||
class Serializer:
|
||||
serializable_fields = []
|
||||
|
||||
def get_serializable_fields(self):
|
||||
return self.serializable_fields
|
||||
|
||||
def to_json(self):
|
||||
data = {}
|
||||
|
||||
for field in self.get_serializable_fields():
|
||||
if hasattr(self, field):
|
||||
data.update({field: getattr(self, field)})
|
||||
else:
|
||||
raise AttributeError(
|
||||
"This object does not have a field named '{}'".format(field)
|
||||
)
|
||||
|
||||
return json.dumps(data)
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
from typing import Any
|
||||
|
||||
from django.http import JsonResponse
|
||||
from django.template.response import TemplateResponse
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.views.decorators.http import require_POST
|
||||
from django.views.generic.base import TemplateResponseMixin, View
|
||||
from django.views.generic.detail import SingleObjectMixin
|
||||
from django.views.generic.edit import FormMixin, ModelFormMixin, ProcessFormView
|
||||
|
||||
# #############################################################################
|
||||
# Views for use with AJAX
|
||||
# #############################################################################
|
||||
|
||||
|
||||
class JsonMixin:
|
||||
success = True
|
||||
errors = {}
|
||||
|
||||
def get_data(self, **kwargs):
|
||||
data = {"success": self.success, "errors": self.errors}
|
||||
data.update(kwargs)
|
||||
return data
|
||||
|
||||
def render_to_json(self, **kwargs):
|
||||
return JsonResponse(self.get_data(**kwargs))
|
||||
|
||||
|
||||
class JsonFormMixin(JsonMixin, FormMixin):
|
||||
def form_valid(self, form):
|
||||
"""If the form is valid, return success"""
|
||||
return self.render_to_json()
|
||||
|
||||
def form_invalid(self, form):
|
||||
"""If the form is invalid, return the errors and no success"""
|
||||
return self.render_to_json(success=False, errors=form.errors)
|
||||
|
||||
|
||||
class JsonModelFormMixin(JsonFormMixin, ModelFormMixin):
|
||||
def form_valid(self, form):
|
||||
"""Override form_valid to return a JSON response"""
|
||||
self.object = form.save()
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
class JsonMessageMixin:
|
||||
message = ""
|
||||
|
||||
def get_message(self):
|
||||
return {"content": self.message, "class": "success"}
|
||||
|
||||
def get_data(self, **kwargs):
|
||||
kwargs.update(message=self.get_message())
|
||||
return super().get_data(**kwargs) # pyright: ignore
|
||||
|
||||
|
||||
class TypedResponseMixin(TemplateResponseMixin):
|
||||
def render_to_response(
|
||||
self, context: dict[str, Any], **response_kwargs: Any
|
||||
) -> TemplateResponse:
|
||||
return super().render_to_response(context, **response_kwargs) # pyright: ignore
|
||||
|
||||
|
||||
class JsonDetailView(JsonMixin, SingleObjectMixin, TypedResponseMixin, View):
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.object = self.get_object()
|
||||
context = self.get_context_data(object=self.object)
|
||||
return self.render_to_json(
|
||||
html=self.render_to_response(context).rendered_content
|
||||
)
|
||||
|
||||
|
||||
class JsonDeleteView(JsonMessageMixin, JsonDetailView):
|
||||
def get(self, request, *args, **kwargs):
|
||||
obj = self.get_object()
|
||||
obj.delete()
|
||||
return self.render_to_json(action="delete")
|
||||
|
||||
|
||||
@method_decorator(require_POST, name="dispatch")
|
||||
class JsonCreateView(
|
||||
JsonMessageMixin, JsonModelFormMixin, TypedResponseMixin, ProcessFormView
|
||||
):
|
||||
def render_to_json(self, **kwargs):
|
||||
context = self.get_context_data(object=self.object)
|
||||
kwargs.update(
|
||||
html=self.render_to_response(context).rendered_content, action="create"
|
||||
)
|
||||
return super().render_to_json(**kwargs)
|
||||
|
||||
|
||||
@method_decorator(require_POST, name="dispatch")
|
||||
class JsonUpdateView(
|
||||
JsonMessageMixin, JsonModelFormMixin, TypedResponseMixin, ProcessFormView
|
||||
):
|
||||
def post(self, request, *args, **kwargs):
|
||||
self.object = self.get_object()
|
||||
return super().post(request, *args, **kwargs)
|
||||
|
||||
def render_to_json(self, **kwargs):
|
||||
context = self.get_context_data(object=self.object)
|
||||
kwargs.update(
|
||||
html=self.render_to_response(context).rendered_content, action="update"
|
||||
)
|
||||
return super().render_to_json(**kwargs)
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -1,53 +0,0 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.hashers import make_password
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.core.management.base import BaseCommand, CommandError
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from elections.typing import User
|
||||
else:
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = "Creates an administrator role with the specified credentials"
|
||||
|
||||
def add_arguments(self, parser):
|
||||
# Credentials
|
||||
parser.add_argument("base_username", type=str, help="Username")
|
||||
parser.add_argument("password", type=str, help="Password")
|
||||
parser.add_argument("full_name", nargs="?", type=str, help="Full name")
|
||||
parser.add_argument(
|
||||
"--superuser", action="store_true", help="Create a superuser account"
|
||||
)
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
base_username = kwargs["base_username"]
|
||||
password = kwargs["password"]
|
||||
|
||||
user, created = User.objects.get_or_create(username=f"pwd__{base_username}")
|
||||
|
||||
if not created:
|
||||
raise CommandError("Un utilisateur avec ce nom existe déjà")
|
||||
|
||||
user.is_staff = True
|
||||
user.password = make_password(password)
|
||||
|
||||
if kwargs["full_name"]:
|
||||
user.full_name = kwargs["full_name"]
|
||||
|
||||
if kwargs["superuser"]:
|
||||
user.is_superuser = True
|
||||
|
||||
user.save()
|
||||
|
||||
Permission.objects.get(
|
||||
codename="election_admin"
|
||||
).user_set.add( # pyright: ignore
|
||||
user
|
||||
)
|
||||
Permission.objects.get(codename="faq_admin").user_set.add( # pyright: ignore
|
||||
user
|
||||
)
|
||||
|
|
@ -10577,7 +10577,6 @@ body {
|
|||
height: auto;
|
||||
min-height: 2em;
|
||||
white-space: unset;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.message.is-primary .message-body hr {
|
||||
|
|
@ -10587,16 +10586,4 @@ body {
|
|||
background-color: #ffdd57;
|
||||
}
|
||||
|
||||
.is-grabable {
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
#scroll-button {
|
||||
position: fixed;
|
||||
bottom: 1em;
|
||||
right: 1em;
|
||||
z-index: 30;
|
||||
padding: 1.5rem;
|
||||
}
|
||||
|
||||
/*# sourceMappingURL=main.css.map */
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,167 +0,0 @@
|
|||
const _$ = (s, e = document, a = true) => {
|
||||
const r = e.querySelectorAll(s) || [];
|
||||
if (!a) {
|
||||
return r.item(0);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
|
||||
const _id = s => document.getElementById(s);
|
||||
|
||||
const _get = (u, f) => {
|
||||
const xhr = new XMLHttpRequest();
|
||||
|
||||
xhr.responseType = 'json';
|
||||
xhr.addEventListener('load', () => {
|
||||
f(xhr.response);
|
||||
});
|
||||
xhr.open('GET', u);
|
||||
xhr.send();
|
||||
};
|
||||
|
||||
const _post = (u, d, f) => {
|
||||
const xhr = new XMLHttpRequest();
|
||||
const fd = new FormData(d);
|
||||
|
||||
xhr.responseType = 'json';
|
||||
xhr.addEventListener('load', () => {
|
||||
f(xhr.response);
|
||||
});
|
||||
xhr.open('POST', u);
|
||||
xhr.send(fd);
|
||||
};
|
||||
|
||||
const _notif = (m, c) => {
|
||||
const n = document.createElement('div');
|
||||
n.classList.add('notification', 'is-light');
|
||||
if (c !== undefined) {
|
||||
n.classList.add(`is-${c}`);
|
||||
}
|
||||
n.innerHTML = `${m}<button class="delete"></button>`;
|
||||
|
||||
_id('notifications').insertBefore(n, _id('content'))
|
||||
|
||||
_$('.delete', n, false).addEventListener('click', () => {
|
||||
n.remove();
|
||||
});
|
||||
}
|
||||
|
||||
const _om = b => {
|
||||
b.addEventListener('click', () => {
|
||||
const m = _id(b.dataset.target);
|
||||
if ('post_url' in b.dataset) {
|
||||
_$('form', m, false).action = b.dataset.post_url;
|
||||
};
|
||||
|
||||
if ('title' in b.dataset) {
|
||||
_$('.modal-card-title', m, false).innerHTML = b.dataset.title;
|
||||
};
|
||||
|
||||
document.documentElement.classList.add('is-clipped');
|
||||
m.classList.add('is-active');
|
||||
});
|
||||
}
|
||||
|
||||
const _cm = b => {
|
||||
b.addEventListener('click', () => {
|
||||
document.documentElement.classList.remove('is-clipped');
|
||||
_id(b.dataset.closes).classList.remove('is-active')
|
||||
});
|
||||
}
|
||||
|
||||
const _sm = '.modal';
|
||||
const _smb = '.modal-button';
|
||||
const _smc = '.modal-background, .modal-close, .modal-card-head .delete, .modal-card-foot .button-close';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
// Delete notifications
|
||||
_$('.notification .delete').forEach(d => {
|
||||
const n = d.parentNode;
|
||||
|
||||
d.addEventListener('click', () => {
|
||||
n.remove();
|
||||
});
|
||||
});
|
||||
|
||||
// Interact with dropdowns
|
||||
const ds = _$('.dropdown:not(.is-hoverable)');
|
||||
|
||||
ds.forEach(d => {
|
||||
d.addEventListener('click', e => {
|
||||
e.stopPropagation();
|
||||
d.classList.toggle('is-active');
|
||||
});
|
||||
});
|
||||
|
||||
document.addEventListener('click', () => {
|
||||
ds.forEach(d => {
|
||||
d.classList.remove('is-active');
|
||||
});
|
||||
});
|
||||
|
||||
// Interact with modals
|
||||
const ms = _$(_sm);
|
||||
const mbs = _$(_smb);
|
||||
const mcs = _$(_smc);
|
||||
|
||||
mbs.forEach(_om);
|
||||
|
||||
mcs.forEach(_cm);
|
||||
|
||||
document.addEventListener('keydown', ev => {
|
||||
const e = ev || window.event;
|
||||
if (e.keyCode === 27) {
|
||||
ds.forEach(d => {
|
||||
d.classList.remove('is-active');
|
||||
});
|
||||
|
||||
document.documentElement.classList.remove('is-clipped');
|
||||
|
||||
ms.forEach(m => {
|
||||
m.classList.remove('is-active');
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Language selection
|
||||
_$('.dropdown-item.lang-selector').forEach(l => {
|
||||
l.addEventListener('click', () => {
|
||||
_id('lang-input').value = l.dataset.lang;
|
||||
_id('lang-form').submit();
|
||||
});
|
||||
});
|
||||
|
||||
// Disable button after form submission
|
||||
_$('form').forEach(f => {
|
||||
f.addEventListener('submit', () => {
|
||||
_$('button[type=submit]', f).forEach(b => {
|
||||
b.classList.add('is-loading');
|
||||
setTimeout(() => {
|
||||
b.classList.remove('is-loading');
|
||||
}, 1000);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// Scroll to top button
|
||||
const up = _id('scroll-button');
|
||||
if (document.documentElement.scrollTop >= 100) {
|
||||
up.classList.remove('is-hidden');
|
||||
}
|
||||
|
||||
window.onscroll = () => {
|
||||
if (document.documentElement.scrollTop >= 100) {
|
||||
up.classList.remove('is-hidden');
|
||||
} else {
|
||||
up.classList.add('is-hidden');
|
||||
}
|
||||
}
|
||||
|
||||
up.addEventListener('click', () => {
|
||||
window.scrollTo({
|
||||
top: 0,
|
||||
behavior: 'smooth',
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
|
@ -36,7 +36,6 @@ body
|
|||
height: auto
|
||||
min-height: 2em
|
||||
white-space: unset
|
||||
text-align: center
|
||||
|
||||
.message
|
||||
&.is-primary
|
||||
|
|
@ -47,13 +46,3 @@ body
|
|||
.message-body
|
||||
hr
|
||||
background-color: $warning
|
||||
|
||||
.is-grabable
|
||||
cursor: move
|
||||
|
||||
#scroll-button
|
||||
position: fixed
|
||||
bottom: 1em
|
||||
right: 1em
|
||||
z-index: 30
|
||||
padding: 1.5rem
|
||||
|
|
|
|||
12
shared/static/vendor/datetimepicker/picker.js
vendored
12
shared/static/vendor/datetimepicker/picker.js
vendored
|
|
@ -43,11 +43,10 @@ class DateTimePicker {
|
|||
throw TypeError('Selector required to construct a DateTimePicker');
|
||||
}
|
||||
|
||||
this.target = _$(selector, document, false);
|
||||
this.target = document.querySelector(selector);
|
||||
if (!this.target) {
|
||||
throw Error(`The selector '{selector}' doesn't give any results`);
|
||||
}
|
||||
|
||||
this.target.addEventListener('click', () => {
|
||||
document.documentElement.classList.add('is-clipped');
|
||||
this.modal.classList.add('is-active');
|
||||
|
|
@ -68,10 +67,9 @@ class DateTimePicker {
|
|||
|
||||
// Création du modal
|
||||
this.modal = document.createElement('div');
|
||||
this.modal.id = `modal-${this.target.id}`;
|
||||
this.modal.classList.add('modal');
|
||||
this.modal.innerHTML = `<div class="modal-background" data-closes="${this.modal.id}"></div><div class="modal-card"><header class="modal-card-head"><div class="field is-grouped has-addons is-flex-grow-1"><div class="control"><a class="button"><span class="icon"><i class="fas fa-chevron-left"></i></span></a></div><div class="control is-expanded"><a class="button is-fullwidth"></a></div><div class="control"><a class="button"><span class="icon"><i class="fas fa-chevron-right"></i></span></a></div></div></header><section class="modal-card-body"><div class="columns is-centered is-mobile"><div class="column is-narrow"></div></div></section><footer class="modal-card-foot is-block"><div class="field is-horizontal is-flex-grow-1"><div class="field-label is-normal"><label class="label">${_horaire[this.config.lang]}</label></div><div class="field-body"><div class="field has-addons"><div class="control"><div class="select is-left"><select><option>00</option><option>01</option><option>02</option><option>03</option><option>04</option><option>05</option><option>06</option><option>07</option><option>08</option><option>09</option><option>10</option><option>11</option><option>12</option><option>13</option><option>14</option><option>15</option><option>16</option><option>17</option><option>18</option><option>19</option><option>20</option><option>21</option><option>22</option><option>23</option></select></div></div><div class="control"><button class="button is-static has-text-primary"><b>h</b></button></div></div><div class="field has-addons"><div class="control"><div class="select"><select><option>00</option><option>05</option><option>10</option><option>15</option><option>20</option><option>25</option><option>30</option><option>35</option><option>40</option><option>45</option><option>50</option><option>55</option></select></div></div><div class="control"><button class="button is-static has-text-primary"><b>min</b></button></div></div></div></div><br><button class="button is-primary is-fullwidth button-close" data-closes="${this.modal.id}">${_valider[this.config.lang]}</button></footer></div><button class="modal-close is-large" data-closes="${this.modal.id}" aria-label="close"></button>`;
|
||||
let _controls = _$('header a.button', this.modal);
|
||||
this.modal.innerHTML = `<div class="modal-background"></div><div class="modal-card"><header class="modal-card-head"><div class="field is-grouped has-addons is-flex-grow-1"><div class="control"><a class="button"><span class="icon"><i class="fas fa-chevron-left"></i></span></a></div><div class="control is-expanded"><a class="button is-fullwidth"></a></div><div class="control"><a class="button"><span class="icon"><i class="fas fa-chevron-right"></i></span></a></div></div></header><section class="modal-card-body"><div class="columns is-centered is-mobile"><div class="column is-narrow"></div></div></section><footer class="modal-card-foot is-block"><div class="field is-horizontal is-flex-grow-1"><div class="field-label is-normal"><label class="label">${_horaire[this.config.lang]}</label></div><div class="field-body"><div class="field has-addons"><div class="control"><div class="select is-left"><select><option>00</option><option>01</option><option>02</option><option>03</option><option>04</option><option>05</option><option>06</option><option>07</option><option>08</option><option>09</option><option>10</option><option>11</option><option>12</option><option>13</option><option>14</option><option>15</option><option>16</option><option>17</option><option>18</option><option>19</option><option>20</option><option>21</option><option>22</option><option>23</option></select></div></div><div class="control"><button class="button is-static has-text-primary"><b>h</b></button></div></div><div class="field has-addons"><div class="control"><div class="select"><select><option>00</option><option>05</option><option>10</option><option>15</option><option>20</option><option>25</option><option>30</option><option>35</option><option>40</option><option>45</option><option>50</option><option>55</option></select></div></div><div class="control"><button class="button is-static has-text-primary"><b>min</b></button></div></div></div></div><br><button class="button is-primary is-fullwidth button-close">${_valider[this.config.lang]}</button></footer></div><button class="modal-close is-large" aria-label="close"></button>`;
|
||||
let _controls = this.modal.querySelectorAll('header a.button');
|
||||
this._leftArrow = _controls[0];
|
||||
this._menu = _controls[1];
|
||||
this._rightArrow = _controls[2];
|
||||
|
|
@ -115,7 +113,7 @@ class DateTimePicker {
|
|||
}
|
||||
});
|
||||
|
||||
let _selects = _$('footer select', this.modal);
|
||||
let _selects = this.modal.querySelectorAll('footer select');
|
||||
this._hour = _selects[0];
|
||||
this._minutes = _selects[1];
|
||||
|
||||
|
|
@ -156,7 +154,7 @@ class DateTimePicker {
|
|||
|
||||
this._menu.innerHTML = `<b>${months[_beginning.getMonth()]} ${_beginning.getFullYear()}</b>`;
|
||||
|
||||
const _body = _$('.modal-card section .column', this.modal, false);
|
||||
const _body = this.modal.querySelector('.modal-card section .column');
|
||||
_body.innerHTML = `<table class="table has-text-centered is-narrow"><thead><tr><th>${days[0]}</th><th>${days[1]}</th><th>${days[2]}</th><th>${days[3]}</th><th>${days[4]}</th><th>${days[5]}</th><th>${days[6]}</th></tr></thead><tbody></tbody></table>`;
|
||||
|
||||
// Création du tableau
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@
|
|||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Erreur 403" %}</h1>
|
||||
<p class="title">{% trans "Erreur 403" %}</p>
|
||||
<hr>
|
||||
|
||||
<div class="hero is-dark">
|
||||
<div class="hero is-danger">
|
||||
<div class="hero-body">
|
||||
<div class="subtitle">
|
||||
<span class="icon-text">
|
||||
|
|
@ -19,5 +18,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Erreur 404" %}</h1>
|
||||
<p class="title">{% trans "Erreur 404" %}</p>
|
||||
<hr>
|
||||
|
||||
<div class="hero is-warning">
|
||||
|
|
@ -17,7 +16,7 @@
|
|||
<span>{% blocktrans with host=request.get_host %}La page à l'adresse « {{ host }}{{ request_path }} » n'a pas pu être trouvée.{% endblocktrans %}</span>
|
||||
</span>
|
||||
</div>
|
||||
{% if exception != "Resolver404" %}<p>{{ exception }}</p>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Erreur 500" %}</h1>
|
||||
<p class="title">{% trans "Erreur 500" %}</p>
|
||||
<hr>
|
||||
|
||||
<div class="hero is-danger">
|
||||
|
|
@ -19,5 +18,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
{% block custom_js %}
|
||||
<script>
|
||||
function initSearch(input) {
|
||||
const s = _id(input);
|
||||
const us = _$('a.panel-block', s.closest('div.panel'));
|
||||
|
||||
s.addEventListener('input', () => {
|
||||
const username = s.value.toLowerCase();
|
||||
|
||||
us.forEach(u => {
|
||||
if (u.id.includes(username)) {
|
||||
u.classList.remove('is-hidden');
|
||||
} else {
|
||||
u.classList.add('is-hidden');
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
initSearch('pwd_search');
|
||||
initSearch('cas_search');
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Liste des comptes" %}</h1>
|
||||
<hr>
|
||||
|
||||
<div class="columns">
|
||||
{# Password Accounts #}
|
||||
<div class="column is-half">
|
||||
<div class="panel">
|
||||
<p class="panel-heading is-radiusless">{% trans "Comptes avec mot de passe" %}</p>
|
||||
|
||||
{# Search bar #}
|
||||
<div class="panel-block">
|
||||
<p class="control has-icons-left">
|
||||
<input class="input" type="text" id="pwd_search" placeholder="{% trans "Search" %}">
|
||||
<span class="icon is-left">
|
||||
<i class="fas fa-search"></i>
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{# List of users #}
|
||||
{% for u in pwd_users %}
|
||||
<a class="panel-block" href="{% url 'auth.permissions' %}?user={{ u.username }}" id={{ u.base_username|lower }}>
|
||||
<div class="level is-mobile is-flex-grow-1">
|
||||
<div class="level-left is-flex-shrink-1 pr-3">
|
||||
<span class="panel-icon">
|
||||
<i class="fas fa-user-cog"></i>
|
||||
</span>
|
||||
<span class="ml-2" style="overlay=clip">{{ u.full_name }} ({{ u.base_username }})</span>
|
||||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
<span class="panel-icon has-text-{% if u in e_manager %}primary{% else %}grey-lighter{% endif %}">
|
||||
<i class="fas fa-vote-yea"></i>
|
||||
</span>
|
||||
|
||||
<span class="panel-icon has-text-{% if u in f_manager %}primary{% else %}grey-lighter{% endif %}">
|
||||
<i class="fas fa-question"></i>
|
||||
</span>
|
||||
|
||||
<span class="panel-icon has-text-{% if u.is_staff %}danger{% else %}grey-lighter{% endif %}">
|
||||
<i class="fas fa-user-shield"></i>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# CAS Accounts #}
|
||||
<div class="column is-half">
|
||||
<div class="panel">
|
||||
<p class="panel-heading is-radiusless">{% trans "Comptes CAS" %}</p>
|
||||
|
||||
{# Search bar #}
|
||||
<div class="panel-block">
|
||||
<p class="control has-icons-left">
|
||||
<input class="input" type="text" id="cas_search" placeholder="{% trans "Search" %}">
|
||||
<span class="icon is-left">
|
||||
<i class="fas fa-search"></i>
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{# List of users #}
|
||||
{% for u in cas_users %}
|
||||
<a class="panel-block" href="{% url 'auth.permissions' %}?user={{ u.username }}" id={{ u.base_username|lower }}>
|
||||
<div class="level is-mobile is-flex-grow-1">
|
||||
<div class="level-left is-flex-shrink-1 pr-3">
|
||||
<span class="panel-icon">
|
||||
<i class="fas fa-user-cog"></i>
|
||||
</span>
|
||||
<span class="ml-2">{{ u.full_name }} ({{ u.base_username }})</span>
|
||||
</div>
|
||||
|
||||
<div class="level-right">
|
||||
<span class="panel-icon has-text-{% if u in e_manager %}primary{% else %}grey-lighter{% endif %}">
|
||||
<i class="fas fa-vote-yea"></i>
|
||||
</span>
|
||||
|
||||
<span class="panel-icon has-text-{% if u in f_manager %}primary{% else %}grey-lighter{% endif %}">
|
||||
<i class="fas fa-question"></i>
|
||||
</span>
|
||||
|
||||
<span class="panel-icon has-text-{% if u.is_staff %}danger{% else %}grey-lighter{% endif %}">
|
||||
<i class="fas fa-user-shield"></i>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<h1 class="title">{% trans "Liste des comptes spéciaux" %}</h1>
|
||||
<hr>
|
||||
|
||||
<div class="notification">
|
||||
<h3 class="subtitle has-text-weight-semibold">{% trans "Gestionnaires de Kadenios" %}</h3>
|
||||
|
||||
<div class="field is-grouped">
|
||||
{% for a in admin %}
|
||||
<div class="control">
|
||||
<span class="tag is-primary">{{ a.full_name }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="notification">
|
||||
<h3 class="subtitle has-text-weight-semibold">{% trans "Gestionnaires d'élections" %}</h3>
|
||||
|
||||
<div class="field is-grouped">
|
||||
{% for m in e_manager %}
|
||||
<div class="control">
|
||||
<span class="tag is-primary">{{ m.full_name }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% comment %}
|
||||
<div class="notification">
|
||||
<h3 class="subtitle has-text-weight-semibold">{% trans "Gestionnaires de FAQs" %}</h3>
|
||||
|
||||
<div class="field is-grouped">
|
||||
{% for m in f_manager %}
|
||||
<div class="control">
|
||||
<span class="tag is-primary">{{ m.full_name }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endcomment %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Gestion de Kadenios" %}</h1>
|
||||
<hr>
|
||||
|
||||
<div class="tile is-ancestor">
|
||||
<div class="tile is-parent">
|
||||
<a class="tile is-child notification is-light px-0" href="{% url 'auth.create-account' %}">
|
||||
<div class="subtitle has-text-centered">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-user-plus"></i>
|
||||
</span>
|
||||
<span class="ml-3">{% trans "Créer un nouveau compte" %}</span>
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="tile is-parent">
|
||||
<a class="tile is-child notification is-light px-0" href="{% url 'auth.accounts' %}">
|
||||
<div class="subtitle has-text-centered">
|
||||
<span class="icon-text">
|
||||
<span class="icon">
|
||||
<i class="fas fa-stream"></i>
|
||||
</span>
|
||||
<span class="ml-3">{% trans "Liste des comptes" %}</span>
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -23,15 +23,6 @@
|
|||
<span>{% trans "Enregistrer" %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="control">
|
||||
<a class="button is-primary" href="{% url 'auth.admin' %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Retour" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -6,51 +6,37 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Connexion par mot de passe" %}</h1>
|
||||
<hr>
|
||||
<h1 class="title">{% trans "Connexion par mot de passe" %}</h1>
|
||||
<hr>
|
||||
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-two-thirds">
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-two-thirds">
|
||||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="tile is-ancestor py-3">
|
||||
<div class="tile is-parent">
|
||||
<div class="tile is-child notification is-primary is-light">
|
||||
<div class="has-text-centered">
|
||||
<span class="icon">
|
||||
<i class="fas fa-info"></i>
|
||||
</span>
|
||||
<span>{% trans "La connexion doit s'effectuer via les identifiants reçus par mail." %}</span>
|
||||
</div>
|
||||
</div>
|
||||
{% include "forms/form.html" with errors=True %}
|
||||
|
||||
<div class="field is-grouped is-centered">
|
||||
<div class="control is-expanded">
|
||||
<button class="button is-fullwidth is-outlined is-primary is-light" type="submit">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
<span>{% trans "Enregistrer" %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="control">
|
||||
<a class="button is-primary" href="{% url 'election.view' election_id %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Retour" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
{% include "forms/form.html" with errors=True %}
|
||||
|
||||
<div class="field is-grouped is-centered">
|
||||
<div class="control is-expanded">
|
||||
<button class="button is-fullwidth is-outlined is-primary is-light" type="submit">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
<span>{% trans "Enregistrer" %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="control">
|
||||
<a class="button is-primary" href="{{ request.GET.next }}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Retour" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1 class="title">{% trans "Gestion des permissions" %}</h1>
|
||||
<hr>
|
||||
|
||||
<div class="message is-primary">
|
||||
<p class="message-body">
|
||||
{% trans "Pour modifier un compte CAS, le nom d'utilisateur doit commencer par <code>cas__</code>, pour un compte avec mot de passe, <code>pwd__</code>." %}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="columns is-centered">
|
||||
<div class="column is-two-thirds">
|
||||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
{% include "forms/form.html" with errors=True %}
|
||||
|
||||
<div class="field is-grouped is-centered">
|
||||
<div class="control is-expanded">
|
||||
<button class="button is-fullwidth is-outlined is-primary is-light" type="submit">
|
||||
<span class="icon">
|
||||
<i class="fas fa-check"></i>
|
||||
</span>
|
||||
<span>{% trans "Enregistrer" %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="control">
|
||||
<a class="button is-primary" href="{% url 'auth.accounts' %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</span>
|
||||
<span>{% trans "Retour" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue