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

On refait les migrations pour le nouvel user

Browse source
This commit is contained in:
Tom Hubrecht 2020-12-20 17:15:37 +01:00
parent 36d744dee5
commit 5865583ace
7 changed files with 243 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

252
elections/migrations/0001_initial.py
View file

@ -1,8 +1,11 @@
# Generated by Django 2.2.17 on 2020-11-20 15:31
# Generated by Django 2.2.17 on 2020-12-20 16:11
import django.contrib.auth.models
import django.contrib.auth.validators
import django.db.models.deletion
import django.utils.timezone
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
@ -10,40 +13,243 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("auth", "0011_update_proxy_permissions"),
]
operations = [
migrations.CreateModel(
name='Election',
name="User",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, verbose_name='nom')),
('short_name', models.SlugField(unique=True, verbose_name='nom bref')),
('description', models.TextField(blank=True, verbose_name='description')),
('start_time', models.DateTimeField(verbose_name='date et heure de début')),
('end_time', models.DateTimeField(verbose_name='date et heure de fin')),
('results_public', models.BooleanField(default=False, verbose_name='résultats publics')),
('tallied', models.BooleanField(default=False, verbose_name='dépouillée')),
('archived', models.BooleanField(default=False, verbose_name='archivée')),
('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("password", models.CharField(max_length=128, verbose_name="password")),
(
"last_login",
models.DateTimeField(
blank=True, null=True, verbose_name="last login"
),
),
(
"is_superuser",
models.BooleanField(
default=False,
help_text="Designates that this user has all permissions without explicitly assigning them.",
verbose_name="superuser status",
),
),
(
"username",
models.CharField(
error_messages={
"unique": "A user with that username already exists."
},
help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
max_length=150,
unique=True,
validators=[
django.contrib.auth.validators.UnicodeUsernameValidator()
],
verbose_name="username",
),
),
(
"first_name",
models.CharField(
blank=True, max_length=30, verbose_name="first name"
),
),
(
"last_name",
models.CharField(
blank=True, max_length=150, verbose_name="last name"
),
),
(
"email",
models.EmailField(
blank=True, max_length=254, verbose_name="email address"
),
),
(
"is_staff",
models.BooleanField(
default=False,
help_text="Designates whether the user can log into this admin site.",
verbose_name="staff status",
),
),
(
"is_active",
models.BooleanField(
default=True,
help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
verbose_name="active",
),
),
(
"date_joined",
models.DateTimeField(
default=django.utils.timezone.now, verbose_name="date joined"
),
),
(
"groups",
models.ManyToManyField(
blank=True,
help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
related_name="user_set",
related_query_name="user",
to="auth.Group",
verbose_name="groups",
),
),
(
"user_permissions",
models.ManyToManyField(
blank=True,
help_text="Specific permissions for this user.",
related_name="user_set",
related_query_name="user",
to="auth.Permission",
verbose_name="user permissions",
),
),
],
options={
"verbose_name": "user",
"verbose_name_plural": "users",
"abstract": False,
},
managers=[
("objects", django.contrib.auth.models.UserManager()),
],
),
migrations.CreateModel(
name='Question',
name="Election",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.TextField(verbose_name='question')),
('election', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='elections.Election')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255, verbose_name="nom")),
("short_name", models.SlugField(unique=True, verbose_name="nom bref")),
(
"description",
models.TextField(blank=True, verbose_name="description"),
),
(
"start_date",
models.DateTimeField(verbose_name="date et heure de début"),
),
("end_date", models.DateTimeField(verbose_name="date et heure de fin")),
(
"results_public",
models.BooleanField(
default=False, verbose_name="résultats publics"
),
),
(
"tallied",
models.BooleanField(default=False, verbose_name="dépouillée"),
),
(
"archived",
models.BooleanField(default=False, verbose_name="archivée"),
),
(
"created_by",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to=settings.AUTH_USER_MODEL,
),
),
],
options={
"ordering": ["-start_date", "-end_date"],
},
),
migrations.CreateModel(
name='Option',
name="Question",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.TextField(verbose_name='texte')),
('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='options', to='elections.Question')),
('voters', models.ManyToManyField(related_name='votes', to=settings.AUTH_USER_MODEL)),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("text", models.TextField(verbose_name="question")),
(
"max_votes",
models.PositiveSmallIntegerField(
default=0, verbose_name="nombre maximal de votes reçus"
),
),
(
"election",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="questions",
to="elections.Election",
),
),
],
options={
"ordering": ["id"],
},
),
migrations.CreateModel(
name="Option",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("text", models.TextField(verbose_name="texte")),
(
"nb_votes",
models.PositiveSmallIntegerField(
default=0, verbose_name="nombre de votes reçus"
),
),
(
"question",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="options",
to="elections.Question",
),
),
(
"voters",
models.ManyToManyField(
related_name="votes", to=settings.AUTH_USER_MODEL
),
),
],
options={
"ordering": ["id"],
},
),
]

23
elections/migrations/0002_auto_20201218_1452.py
View file

@ -1,23 +0,0 @@
# Generated by Django 2.2.17 on 2020-12-18 14:52
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("elections", "0001_initial"),
]
operations = [
migrations.RenameField(
model_name="election",
old_name="end_time",
new_name="end",
),
migrations.RenameField(
model_name="election",
old_name="start_time",
new_name="start",
),
]

23
elections/migrations/0003_auto_20201218_1954.py
View file

@ -1,23 +0,0 @@
# Generated by Django 2.2.17 on 2020-12-18 19:54
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("elections", "0002_auto_20201218_1452"),
]
operations = [
migrations.RenameField(
model_name="election",
old_name="end",
new_name="end_date",
),
migrations.RenameField(
model_name="election",
old_name="start",
new_name="start_date",
),
]

20
elections/migrations/0004_option_nb_votes.py
View file

@ -1,20 +0,0 @@
# Generated by Django 2.2.17 on 2020-12-19 16:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("elections", "0003_auto_20201218_1954"),
]
operations = [
migrations.AddField(
model_name="option",
name="nb_votes",
field=models.PositiveSmallIntegerField(
default=0, verbose_name="nombre de votes reçus"
),
),
]

20
elections/migrations/0005_question_max_votes.py
View file

@ -1,20 +0,0 @@
# Generated by Django 2.2.17 on 2020-12-19 17:19
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("elections", "0004_option_nb_votes"),
]
operations = [
migrations.AddField(
model_name="question",
name="max_votes",
field=models.PositiveSmallIntegerField(
default=0, verbose_name="nombre maximal de votes reçus"
),
),
]

15
elections/models.py
View file

@ -1,8 +1,19 @@
from django.contrib.auth import get_user_model
from django.contrib.auth.models import AbstractUser
from django.db import models
from django.utils.translation import gettext_lazy as _
User = get_user_model()
# #############################################################################
# Modification of the base User Model
# #############################################################################
class User(AbstractUser):
pass
# #############################################################################
# Models regarding an election
# #############################################################################
class Election(models.Model):

1
kadenios/settings_base.py
View file

@ -86,6 +86,7 @@ AUTH_PASSWORD_VALIDATORS = [
},
]
AUTH_USER_MODEL = "elections.User"
# Internationalization
# https://docs.djangoproject.com/en/2.2/topics/i18n/