Polishing the site (ordering)

census/admin.py

@@ -1,10 +1,19 @@
 from django.contrib import admin
 from census.models import *
 
+class CountAdmin(admin.ModelAdmin):
+	ordering = ('-date', )
+
+class LessonAdmin(admin.ModelAdmin):
+	ordering = ('-date', )
+
+class CourseAdmin(admin.ModelAdmin):
+	ordering = ('-promotion', 'name')
+
 # Register your models here.
 admin.site.register(Promotion)
 admin.site.register(Amphi)
-admin.site.register(Course)
+admin.site.register(Course,CourseAdmin)
 admin.site.register(Professor)
-admin.site.register(Lesson)
-admin.site.register(Count)
+admin.site.register(Lesson,LessonAdmin)
+admin.site.register(Count,CountAdmin)

census/migrations/0001_initial.py

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Amphi',
             fields=[
-                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
                 ('name', models.CharField(verbose_name='Nom', max_length=60)),
                 ('capacity', models.IntegerField(verbose_name='Capacité')),
             ],
@@ -25,8 +25,11 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Count',
             fields=[
-                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
                 ('census', models.IntegerField(verbose_name="Nombre d'éléves présents")),
+                ('date', models.DateTimeField(verbose_name='Soumis le', auto_now=True)),
+                ('comment', models.TextField(verbose_name='Commentaires', null=True, blank=True)),
+                ('signature', models.CharField(verbose_name='signature', max_length=120)),
             ],
             options={
                 'verbose_name': 'Comptage',
@@ -36,8 +39,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Course',
             fields=[
-                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
-                ('name', models.CharField(verbose_name='Nom', max_length=6)),
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Nom', max_length=60)),
                 ('enrolled', models.IntegerField(verbose_name="Nombre d'inscrits")),
             ],
             options={
@@ -49,9 +52,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Lesson',
             fields=[
-                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
                 ('date', models.DateField(verbose_name='Date')),
                 ('number', models.IntegerField(verbose_name='Numéro de la séance')),
+                ('title', models.CharField(verbose_name='Titre', max_length=140, null=True, blank=True)),
                 ('amphi', models.ForeignKey(verbose_name='Amphithéâtre', to='census.Amphi')),
                 ('course', models.ForeignKey(to='census.Course')),
             ],
@@ -63,7 +67,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Professor',
             fields=[
-                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
                 ('name', models.CharField(verbose_name='Nom', max_length=100)),
             ],
             options={
@@ -74,7 +78,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Promotion',
             fields=[
-                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
                 ('number', models.IntegerField(verbose_name='Numéro')),
             ],
             options={
@@ -85,7 +89,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='lesson',
             name='professor',
-            field=models.ForeignKey(verbose_name='Professeur', to='census.Professor'),
+            field=models.ForeignKey(null=True, verbose_name='Professeur', to='census.Professor', blank=True),
             preserve_default=True,
         ),
         migrations.AddField(

census/models.py

@@ -47,14 +47,14 @@ class Lesson(models.Model):
 	title=models.CharField("Titre",max_length=140,blank=True,null=True)
 
 	def __str__(self):
-		if ((self.number is not None) & (self.title is not None)):
-			return "%s n°%s : %s (%s, %s)" % (self.course.name,self.number,self.title,self.course.promotion,self.date)
-		elif (self.number is not None):
-			return "%s n°%s (%s, %s)" % (self.course.name,self.number,self.course.promotion,self.date)
-		elif (self.title is not None):
-			return "%s : %s (%s, %s)" % (self.course.name,self.title,self.course.promotion,self.date)
+		if ((self.number != '' ) & (self.title != '')):
+			return "%s %s n°%s : %s (%s)" % (self.course.promotion,self.course.name,self.number,self.title,self.date)
+		elif (self.number != ''):
+			return "%s %s n°%s (%s)" % (self.course.promotion,self.course.name,self.number,self.date)
+		elif (self.title != ''):
+			return "%s %s : %s (%s)" % (self.course.promotion,self.course.name,self.title,self.date)
 		else:
-			return "%s (%s,%s)" % (self.course.name,self.course.promotion,self.date)
+			return "%s %s (%s)" % (self.course.promotion,self.course.name,self.date)
 
 	class Meta:
          verbose_name = "Séance"
@@ -63,7 +63,7 @@ class Count(models.Model):
 	lesson=models.ForeignKey(Lesson,verbose_name="Séance")
 	census=models.IntegerField("Nombre d'éléves présents")
 	date=models.DateTimeField("Soumis le",auto_now="True")
-	comment=models.TextField("Commentaires")
+	comment=models.TextField("Commentaires",blank=True,null=True)
 	signature=models.CharField("signature",max_length=120)
 
 

census/templates/coursTemplate.html

@@ -34,7 +34,11 @@
 		<div class="col-md-4">
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					<h2 class="panel-title">Séance n°{{lesson.number}} <i>{{lesson.title}}</i> – {{lesson.date|date:"d/m/y"}}, {{lesson.amphi}}</h2>
+					<h2 class="panel-title">Séance n°{{lesson.number}} <i>{{lesson.title}}</i> – {{lesson.date|date:"d/m/y"}}, en {{lesson.amphi}}
+					{% if lesson.professor %}
+					par {{lesson.professor.name}}
+					{% endif %}
+					</h2>
 				</div>
 				<div class="panel-body">
 					{% if lesson.counts %}

census/templates/homeTemplate.html

@@ -11,7 +11,7 @@
 				</div>
 				<div class="panel-body">
 					<p>Bienvenue sur le site du <b>Laboratoire pour l'Acquisition Périphérique d'Informations !</b></p>
-					<p>Tu t'ennuies en amphi ? Tu remarque que les rangs sont de plus en plus clairsemés et tu 
+					<p>Tu t'ennuies en amphi ? Tu remarques que les rangs sont de plus en plus clairsemés et tu 
 					aimerais savoir plus précisément <em>combien</em> de tes camarades de promotions choissisent
 					la douceur de leur oreiller plutôt que la rudesse des bancs d'Arago ?</p>
 					<p>Une seule solution : compter ! Suis <a href="{% url 'census.views.comptage' %}">les conseils du LAPI</a> pour un comptage réussi et inscris tes résultats sur le site pour une vision globale du taux d'invisibilité en amphi de ta promotion.</p>
@@ -23,12 +23,11 @@
 				</div>
 				<div class="panel-body">
 					{% if lastcount.lesson.course.name == "Amphis 0" %}
-						<p>Comptage de l'amphi 0 de {{lastcount.lesson.title|lower}} des {{lastcount.lesson.course.promotion}}, donné le {{lastcount.lesson.date|date:"d/m/y"}} en amphi {{lastcount.lesson.amphi}} :</p>
-					{% elif astcount.lesson.course.name == "Conférences scientifiques" %}
-						<p>Comptage de la conférence scientifique de {{lastcount.lesson.title|lower}} des {{lastcount.lesson.course.promotion}}, donné le {{lastcount.lesson.date|date:"d/m/y"}} en amphi {{lastcount.lesson.amphi}} :</p>
+						<p>Comptage de l'amphi 0 de {{lastcount.lesson.title}} des {{lastcount.lesson.course.promotion}}, donné le {{lastcount.lesson.date|date:"d/m/y"}} en amphi {{lastcount.lesson.amphi}} :</p>
+					{% elif lastcount.lesson.course.name == "Conférences scientifiques" %}
+						<p>Comptage de la conférence scientifique de {{lastcount.lesson.title}} des {{lastcount.lesson.course.promotion}}, donné le {{lastcount.lesson.date|date:"d/m/y"}} en amphi {{lastcount.lesson.amphi}} :</p>
 					{% else %}
 						<p>Comptage de l'amphi n°{{lastcount.lesson.number}} de {{lastcount.lesson.course.name}} des {{lastcount.lesson.course.promotion}}, donné le {{lastcount.lesson.date|date:"d/m/y"}} en amphi {{lastcount.lesson.amphi}} :</p>
-					}
 					{% endif %}
 					<div class="progress">
  						<div class="progress-bar progress-bar-{{lastcount.progressbarclass}}" role="progressbar"

census/views.py

@@ -1,6 +1,8 @@
 from django.shortcuts import render
 from census.models import Course,Count,Lesson
 from django import forms
+from django.db.models.aggregates import Max
+from datetime import *
 from django.http import HttpResponseRedirect
 
 #Auxiliariy functions
@@ -32,7 +34,7 @@ def getCourseStatistics(course):
 			course.nonnulllessonscount += 1
 		else:
 			lesson.counts = None
-	if (course.lessons.count() != 0):
+	if (course.nonnulllessonscount != 0):
 		course.totalratio = round(course.totalsum / course.nonnulllessonscount)
 		course.progressbarclass = getProgressBarClass(course.totalratio)
 	else:
@@ -54,13 +56,17 @@ class addCountForm(forms.ModelForm):
 
 def home(request):
 	#Retrieving the course list and the statistics
-	courses = Course.objects.filter(promotion__number=2014)
+	courses = Course.objects.all().annotate(latest_lesson_date=Max('lesson__date')).order_by('-latest_lesson_date')
+	#courses = Course.objects.all().order_by('-promotion')
 	for course in courses:
 		course = getCourseStatistics(course)
 	#Retrieving last count
-	lastcount = Count.objects.latest('date')
-	lastcount.ratio = round(lastcount.census/lastcount.lesson.course.enrolled*100)
-	lastcount.progressbarclass= getProgressBarClass(lastcount.ratio)
+	if (Count.objects.all().count() != 0):
+		lastcount = Count.objects.latest('date')
+		lastcount.ratio = round(lastcount.census/lastcount.lesson.course.enrolled*100)
+		lastcount.progressbarclass= getProgressBarClass(lastcount.ratio)
+	else:
+		lastcount = None
 
 	return render(request,'homeTemplate.html', {'courses' : courses, 'lastcount' : lastcount,})
 
@@ -77,7 +83,7 @@ def addcount(request):
     if request.method == 'POST':
         # create a form instance and populate it with data from the request:
         form = addCountForm(request.POST)
-        form.fields["lesson"].queryset = Lesson.objects.all().order_by('-date')
+        form.fields["lesson"].queryset = Lesson.objects.filter(date__lt=datetime.now()+timedelta(7)).order_by('-date')
         # check whether it's valid:
         if form.is_valid():
             count = form.save()