Преглед изворни кода

addin amphi field to lesson

Denis Merigoux пре 10 година
родитељ
комит
4631129e24

+ 0 - 1
census/migrations/.gitignore

1
-/__pycache__/

+ 21 - 13
census/migrations/0001_initial.py

13
         migrations.CreateModel(
13
         migrations.CreateModel(
14
             name='Amphi',
14
             name='Amphi',
15
             fields=[
15
             fields=[
16
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
17
-                ('name', models.CharField(max_length=60, verbose_name='Nom')),
16
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
17
+                ('name', models.CharField(verbose_name='Nom', max_length=60)),
18
                 ('capacity', models.IntegerField(verbose_name='Capacité')),
18
                 ('capacity', models.IntegerField(verbose_name='Capacité')),
19
             ],
19
             ],
20
             options={
20
             options={
21
+                'verbose_name': 'Amphithéâtre',
21
             },
22
             },
22
             bases=(models.Model,),
23
             bases=(models.Model,),
23
         ),
24
         ),
24
         migrations.CreateModel(
25
         migrations.CreateModel(
25
             name='Count',
26
             name='Count',
26
             fields=[
27
             fields=[
27
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
28
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
28
                 ('census', models.IntegerField(verbose_name="Nombre d'éléves présents")),
29
                 ('census', models.IntegerField(verbose_name="Nombre d'éléves présents")),
29
             ],
30
             ],
30
             options={
31
             options={
32
+                'verbose_name': 'Comptage',
31
             },
33
             },
32
             bases=(models.Model,),
34
             bases=(models.Model,),
33
         ),
35
         ),
34
         migrations.CreateModel(
36
         migrations.CreateModel(
35
             name='Course',
37
             name='Course',
36
             fields=[
38
             fields=[
37
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
38
-                ('name', models.CharField(max_length=6, verbose_name='Nom')),
39
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
40
+                ('name', models.CharField(verbose_name='Nom', max_length=6)),
39
                 ('enrolled', models.IntegerField(verbose_name="Nombre d'inscrits")),
41
                 ('enrolled', models.IntegerField(verbose_name="Nombre d'inscrits")),
40
             ],
42
             ],
41
             options={
43
             options={
44
+                'verbose_name': 'Cours',
45
+                'verbose_name_plural': 'Cours',
42
             },
46
             },
43
             bases=(models.Model,),
47
             bases=(models.Model,),
44
         ),
48
         ),
45
         migrations.CreateModel(
49
         migrations.CreateModel(
46
             name='Lesson',
50
             name='Lesson',
47
             fields=[
51
             fields=[
48
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
49
-                ('date', models.DateTimeField(verbose_name='Date')),
52
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
53
+                ('date', models.DateField(verbose_name='Date')),
50
                 ('number', models.IntegerField(verbose_name='Numéro de la séance')),
54
                 ('number', models.IntegerField(verbose_name='Numéro de la séance')),
55
+                ('amphi', models.ForeignKey(verbose_name='Amphithéâtre', to='census.Amphi')),
51
                 ('course', models.ForeignKey(to='census.Course')),
56
                 ('course', models.ForeignKey(to='census.Course')),
52
             ],
57
             ],
53
             options={
58
             options={
59
+                'verbose_name': 'Séance',
54
             },
60
             },
55
             bases=(models.Model,),
61
             bases=(models.Model,),
56
         ),
62
         ),
57
         migrations.CreateModel(
63
         migrations.CreateModel(
58
             name='Professor',
64
             name='Professor',
59
             fields=[
65
             fields=[
60
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
61
-                ('name', models.CharField(max_length=100, verbose_name='Nom')),
66
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
67
+                ('name', models.CharField(verbose_name='Nom', max_length=100)),
62
             ],
68
             ],
63
             options={
69
             options={
70
+                'verbose_name': 'Professeur',
64
             },
71
             },
65
             bases=(models.Model,),
72
             bases=(models.Model,),
66
         ),
73
         ),
67
         migrations.CreateModel(
74
         migrations.CreateModel(
68
             name='Promotion',
75
             name='Promotion',
69
             fields=[
76
             fields=[
70
-                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
77
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
71
                 ('number', models.IntegerField(verbose_name='Numéro')),
78
                 ('number', models.IntegerField(verbose_name='Numéro')),
72
             ],
79
             ],
73
             options={
80
             options={
81
+                'verbose_name': 'Promotion',
74
             },
82
             },
75
             bases=(models.Model,),
83
             bases=(models.Model,),
76
         ),
84
         ),
77
         migrations.AddField(
85
         migrations.AddField(
78
             model_name='lesson',
86
             model_name='lesson',
79
             name='professor',
87
             name='professor',
80
-            field=models.ForeignKey(to='census.Professor'),
88
+            field=models.ForeignKey(verbose_name='Professeur', to='census.Professor'),
81
             preserve_default=True,
89
             preserve_default=True,
82
         ),
90
         ),
83
         migrations.AddField(
91
         migrations.AddField(
84
             model_name='course',
92
             model_name='course',
85
             name='promotion',
93
             name='promotion',
86
-            field=models.ForeignKey(to='census.Promotion'),
94
+            field=models.ForeignKey(verbose_name='Promotion', to='census.Promotion'),
87
             preserve_default=True,
95
             preserve_default=True,
88
         ),
96
         ),
89
         migrations.AddField(
97
         migrations.AddField(
90
             model_name='count',
98
             model_name='count',
91
             name='lesson',
99
             name='lesson',
92
-            field=models.ForeignKey(to='census.Lesson'),
100
+            field=models.ForeignKey(verbose_name='Séance', to='census.Lesson'),
93
             preserve_default=True,
101
             preserve_default=True,
94
         ),
102
         ),
95
     ]
103
     ]

+ 0 - 20
census/migrations/0002_auto_20150228_1836.py

1
-# -*- coding: utf-8 -*-
2
-from __future__ import unicode_literals
3
-
4
-from django.db import models, migrations
5
-
6
-
7
-class Migration(migrations.Migration):
8
-
9
-    dependencies = [
10
-        ('census', '0001_initial'),
11
-    ]
12
-
13
-    operations = [
14
-        migrations.AlterField(
15
-            model_name='lesson',
16
-            name='date',
17
-            field=models.DateField(verbose_name='Date'),
18
-            preserve_default=True,
19
-        ),
20
-    ]

+ 1 - 0
census/models.py

43
 	date=models.DateField("Date")
43
 	date=models.DateField("Date")
44
 	number=models.IntegerField("Numéro de la séance")
44
 	number=models.IntegerField("Numéro de la séance")
45
 	professor=models.ForeignKey(Professor,verbose_name="Professeur")
45
 	professor=models.ForeignKey(Professor,verbose_name="Professeur")
46
+	amphi=models.ForeignKey(Amphi,verbose_name="Amphithéâtre")
46
 
47
 
47
 	def __str__(self):
48
 	def __str__(self):
48
 		return "%s %s (%s,%s)" % (self.course.name,self.number,self.course.promotion,self.date)
49
 		return "%s %s (%s,%s)" % (self.course.name,self.number,self.course.promotion,self.date)