Browse Source

new fields in models for support for "conférences" and "amphis 0"

Denis Merigoux 10 years ago
parent
commit
cae8a33a70
2 changed files with 18 additions and 5 deletions
  1. 18 5
      census/models.py
  2. BIN
      db.sqlite3

+ 18 - 5
census/models.py

20
          verbose_name = "Amphithéâtre"
20
          verbose_name = "Amphithéâtre"
21
 
21
 
22
 class Course(models.Model):
22
 class Course(models.Model):
23
-	name=models.CharField("Nom",max_length=6)
23
+	name=models.CharField("Nom",max_length=60)
24
 	promotion=models.ForeignKey(Promotion,verbose_name="Promotion")
24
 	promotion=models.ForeignKey(Promotion,verbose_name="Promotion")
25
 	enrolled=models.IntegerField("Nombre d'inscrits")
25
 	enrolled=models.IntegerField("Nombre d'inscrits")
26
 
26
 
41
 class Lesson(models.Model):
41
 class Lesson(models.Model):
42
 	course=models.ForeignKey(Course)
42
 	course=models.ForeignKey(Course)
43
 	date=models.DateField("Date")
43
 	date=models.DateField("Date")
44
-	number=models.IntegerField("Numéro de la séance")
45
-	professor=models.ForeignKey(Professor,verbose_name="Professeur")
44
+	number=models.IntegerField("Numéro de la séance",blank=True,null=True)
45
+	professor=models.ForeignKey(Professor,verbose_name="Professeur",blank=True,null=True)
46
 	amphi=models.ForeignKey(Amphi,verbose_name="Amphithéâtre")
46
 	amphi=models.ForeignKey(Amphi,verbose_name="Amphithéâtre")
47
+	title=models.CharField("Titre",max_length=140,blank=True,null=True)
47
 
48
 
48
 	def __str__(self):
49
 	def __str__(self):
49
-		return "%s %s (%s,%s)" % (self.course.name,self.number,self.course.promotion,self.date)
50
+		if ((self.number is not None) & (self.title is not None)):
51
+			return "%s %s : %s (%s,%s)" % (self.course.name,self.number,self.title,self.course.promotion,self.date)
52
+		elif (self.number is not None):
53
+			return "%s %s (%s,%s)" % (self.course.name,self.number,self.course.promotion,self.date)
54
+		elif (self.title is not None):
55
+			return "%s : %s (%s,%s)" % (self.course.name,self.title,self.course.promotion,self.date)
56
+		else:
57
+			return "%s (%s,%s)" % (self.course.name,self.course.promotion,self.date)
58
+
50
 	class Meta:
59
 	class Meta:
51
          verbose_name = "Séance"
60
          verbose_name = "Séance"
52
 
61
 
53
 class Count(models.Model):
62
 class Count(models.Model):
54
 	lesson=models.ForeignKey(Lesson,verbose_name="Séance")
63
 	lesson=models.ForeignKey(Lesson,verbose_name="Séance")
55
 	census=models.IntegerField("Nombre d'éléves présents")
64
 	census=models.IntegerField("Nombre d'éléves présents")
65
+	date=models.DateTimeField("Soumis le",auto_now="True")
66
+	comment=models.TextField("Commentaires")
67
+	signature=models.CharField("signature",max_length=120)
68
+
56
 
69
 
57
 	def __str__(self):
70
 	def __str__(self):
58
-		return "%s/%s : %s" % (self.census,self.lesson.course.enrolled,self.lesson)
71
+		return "%s : %s/%s" % (self.lesson,self.census,self.lesson.course.enrolled)
59
 	class Meta:
72
 	class Meta:
60
          verbose_name = "Comptage"
73
          verbose_name = "Comptage"

BIN
db.sqlite3