page for courses in progress

census/migrations/.gitignore

@@ -1 +1,2 @@
 /0002_auto_20150312_1101.py
+00*

census/models.py

@@ -41,7 +41,7 @@ class Professor(models.Model):
 class Lesson(models.Model):
 	course=models.ForeignKey(Course)
 	date=models.DateField("Date")
-	number=models.IntegerField("Numéro de la séance",blank=True,null=True)
+	number=models.IntegerField("Numéro de la séance")
 	professor=models.ForeignKey(Professor,verbose_name="Professeur",blank=True,null=True)
 	amphi=models.ForeignKey(Amphi,verbose_name="Amphithéâtre")
 	title=models.CharField("Titre",max_length=140,blank=True,null=True)

census/templates/coursTemplate.html

@@ -3,6 +3,51 @@
 {% block nav %}{% endblock %}
 {% block content %}
 <div class="container-fluid">
-	
+	<div class="well">
+		<h1>{{course.name}} – Promotion
+		{% if course.promotion.number|divisibleby:2 %}
+			<span style='color:#D62222'>X{{course.promotion.number}}</span>
+		{% else %}
+			<span style='color:#F2E52E'>X{{course.promotion.number}}</span>
+		{% endif %}</h1>
+		<p>Nombre d'inscrits : {{course.enrolled}}</p>
+	</div>
+	<div class="row">
+		{% for lesson in lessons %}
+		<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>
+				</div>
+				<div class="panel-body">
+					{% if lesson.counts %}
+					<p>Estimation du taux de visibilité pour cette séance :</p>
+					<div class="progress">
+ 						<div class="progress-bar progress-bar-info" role="progressbar"
+ 							aria-valuenow="{{lesson.totalratio}}" aria-valuemin="0" aria-valuemax="100"
+ 							style="width: {{lesson.totalratio}}%;">
+    						{{lesson.totalratio}}%
+  						</div>
+  					</div>
+					<div class="list group">
+						{% for count in lesson.counts %}
+						<div class="list-group-item">
+							<p>Résultat du comptage : <b>{{count.census}}/{{course.enrolled}}</b></p>
+  							<p>{{count.comment}}</p>
+  						<p style="text-align:right;font-style:italic">{{count.signature}}</p>
+  						</div>
+  						{% endfor %}
+  					</div>
+  					{% else %}
+					<div class="alert alert-warning">
+						<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+  						<span class="sr-only">Attention : </span>Aucun comptage n'a été soumis pour cette séance
+					</div>
+					{% endif %}
+				</div>
+			</div>
+		</div>
+		{% endfor %}
+	</div>
 </div>
 {% endblock %}

census/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render
-from census.models import Course,Count
+from census.models import Course,Count,Lesson
 
 # Create your views here.
 
@@ -17,4 +17,15 @@ def comptage(request):
 
 def cours(request, id_cours):
 	course = Course.objects.get(id=id_cours)
-	return render(request, 'coursTemplate.html')
+	lessons = Lesson.objects.filter(course=course).order_by('number')
+	for lesson in lessons:
+		lesson.counts = Count.objects.filter(lesson=lesson)
+		if (lesson.counts.count() != 0):
+			lesson.totalsum = 0 
+			for count in lesson.counts:
+				count.ratio = round(count.census/lesson.course.enrolled*100)
+				lesson.totalsum += count.census
+			lesson.totalratio = round(lesson.totalsum/(lesson.counts.count()*course.enrolled)*100)
+		else:
+			lesson.counts = None
+	return render(request, 'coursTemplate.html', {'course' : course, 'lessons' : lessons,})