From fd18783bf993565016e7b9f07402bb2e4b49f041 Mon Sep 17 00:00:00 2001
From: Dorian Lesbre <dorian.lesbre@gmail.com>
Date: Sun, 28 Feb 2021 17:04:40 +0100
Subject: [PATCH] Added models to admin screen + fix model field
---
home/admin.py | 6 +++-
home/migrations/0001_initial.py | 50 +++++++++++++++++++++++++++++++++
home/models.py | 2 +-
3 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 home/migrations/0001_initial.py
diff --git a/home/admin.py b/home/admin.py
index 8c38f3f..f378059 100644
--- a/home/admin.py
+++ b/home/admin.py
@@ -1,3 +1,7 @@
from django.contrib import admin
-# Register your models here.
+from home.models import InterludesActivity, InterludesParticipant, ActivityList
+
+admin.site.register(InterludesActivity)
+admin.site.register(InterludesParticipant)
+admin.site.register(ActivityList)
diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py
new file mode 100644
index 0000000..fed22d0
--- /dev/null
+++ b/home/migrations/0001_initial.py
@@ -0,0 +1,50 @@
+# Generated by Django 3.0.8 on 2021-02-28 16:00
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='InterludesActivity',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('title', models.CharField(max_length=200, verbose_name='Titre')),
+ ('duration', models.DurationField(verbose_name='Durée')),
+ ('host_name', models.CharField(max_length=50, verbose_name="Nom de l'organisateur")),
+ ('host_email', models.EmailField(max_length=254, verbose_name="Email de l'organisateur")),
+ ('description', models.TextField(max_length=2000, verbose_name='Description')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='InterludesParticipant',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200, verbose_name='Nom complet')),
+ ('email', models.EmailField(max_length=254, verbose_name='email')),
+ ('school', models.CharField(choices=[('U', 'ENS Ulm'), ('L', 'ENS Lyon'), ('R', 'ENS Rennes'), ('C', 'ENS Paris Saclay')], max_length=1, verbose_name='ENS de rattachement')),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='Utilisateur', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='ActivityList',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('priority', models.PositiveIntegerField()),
+ ('activite', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.InterludesActivity')),
+ ('participant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.InterludesParticipant')),
+ ],
+ options={
+ 'unique_together': {('priority', 'participant')},
+ },
+ ),
+ ]
diff --git a/home/models.py b/home/models.py
index 1dcb89d..17c6b86 100644
--- a/home/models.py
+++ b/home/models.py
@@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _
class InterludesActivity(models.Model):
"""une activité des interludes (i.e. JDR, murder)..."""
title = models.CharField("Titre", max_length=200)
- duration = models.TimeField("Durée")
+ duration = models.DurationField("Durée")
host_name = models.CharField("Nom de l'organisateur", max_length=50)
host_email = models.EmailField("Email de l'organisateur")
description = models.TextField("Description", max_length=2000)
--
GitLab