addin amphi field to lesson

census/migrations/.gitignore

@@ -1 +0,0 @@
-/__pycache__/

census/migrations/0001_initial.py

@@ -13,83 +13,91 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Amphi',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
-                ('name', models.CharField(max_length=60, verbose_name='Nom')),
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('name', models.CharField(verbose_name='Nom', max_length=60)),
                 ('capacity', models.IntegerField(verbose_name='Capacité')),
             ],
             options={
+                'verbose_name': 'Amphithéâtre',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Count',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
                 ('census', models.IntegerField(verbose_name="Nombre d'éléves présents")),
             ],
             options={
+                'verbose_name': 'Comptage',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Course',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
-                ('name', models.CharField(max_length=6, verbose_name='Nom')),
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('name', models.CharField(verbose_name='Nom', max_length=6)),
                 ('enrolled', models.IntegerField(verbose_name="Nombre d'inscrits")),
             ],
             options={
+                'verbose_name': 'Cours',
+                'verbose_name_plural': 'Cours',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Lesson',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
-                ('date', models.DateTimeField(verbose_name='Date')),
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('date', models.DateField(verbose_name='Date')),
                 ('number', models.IntegerField(verbose_name='Numéro de la séance')),
+                ('amphi', models.ForeignKey(verbose_name='Amphithéâtre', to='census.Amphi')),
                 ('course', models.ForeignKey(to='census.Course')),
             ],
             options={
+                'verbose_name': 'Séance',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Professor',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
-                ('name', models.CharField(max_length=100, verbose_name='Nom')),
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('name', models.CharField(verbose_name='Nom', max_length=100)),
             ],
             options={
+                'verbose_name': 'Professeur',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Promotion',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
                 ('number', models.IntegerField(verbose_name='Numéro')),
             ],
             options={
+                'verbose_name': 'Promotion',
             },
             bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='lesson',
             name='professor',
-            field=models.ForeignKey(to='census.Professor'),
+            field=models.ForeignKey(verbose_name='Professeur', to='census.Professor'),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='course',
             name='promotion',
-            field=models.ForeignKey(to='census.Promotion'),
+            field=models.ForeignKey(verbose_name='Promotion', to='census.Promotion'),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='count',
             name='lesson',
-            field=models.ForeignKey(to='census.Lesson'),
+            field=models.ForeignKey(verbose_name='Séance', to='census.Lesson'),
             preserve_default=True,
         ),
     ]

census/migrations/0002_auto_20150228_1836.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('census', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='lesson',
-            name='date',
-            field=models.DateField(verbose_name='Date'),
-            preserve_default=True,
-        ),
-    ]

census/models.py

@@ -43,6 +43,7 @@ class Lesson(models.Model):
 	date=models.DateField("Date")
 	number=models.IntegerField("Numéro de la séance")
 	professor=models.ForeignKey(Professor,verbose_name="Professeur")
+	amphi=models.ForeignKey(Amphi,verbose_name="Amphithéâtre")
 
 	def __str__(self):
 		return "%s %s (%s,%s)" % (self.course.name,self.number,self.course.promotion,self.date)