finished pages for courses, beginning add count form

LAPI/urls.py

 from django.conf.urls import patterns, include, url
 from django.contrib import admin
-from census.views import home
+from census.views import home,comptage,cours,addcount
 
 urlpatterns = patterns('census.views',
     # Examples:
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^home/$', 'home'),
+    url(r'^accueil/$', 'home'),
     url(r'^$', 'home'),
     url(r'^comptage/$', 'comptage'),
     url(r'^cours/(?P<id_cours>\d+)$', 'cours'),
+    url(r'^compter/$', 'addcount'),
 )

census/templates/addcountTemplate.html

+{% extends 'baseTemplate.html' %}
+{% block title %}Ajouter un comptage{% endblock %}
+{% block nav %}{% endblock %}
+{% block content %}
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-4 col-md-offset-4">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h2 class="panel-title">Ajouter un comptage à la base de données</h2>
+				</div>
+				<div class="panel-body">
+					<form action="{% url 'census.views.addcount' %}" method="post">
+					{% csrf_token %}
+					{{form}}
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+{% endblock %}

census/templates/baseTemplate.html

 						{% endblock %}
 					</ul>
 					<ul class="nav navbar-nav navbar-right">
-						<a class="navbar-brand" href="{% url 'census.views.home' %}">Accueil</a>
+						<a class="navbar-brand" href="{% url 'census.views.home' %}">Accueil – Liste des cours</a>
 						<a class="navbar-brand" href="{% url 'census.views.comptage' %}">Instructions de comptage</a>
+						<a class="navbar-brand" href="{% url 'census.views.addcount' %}">Ajouter un comptage</a>
 					</ul>
 				</div><!-- /.navbar-collapse -->
 			</div><!-- /.container-fluid -->

census/templates/coursTemplate.html

 {% 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 class="row">
+			<div class="col-md-4">
+				<h1>{{course.name}}
+				{% 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="col-md-8">
+				{% if course.totalratio != 0 %}
+				<h3>Taux de visibilité du cours :</h3>
+				<div class="progress">
+ 					<div class="progress-bar progress-bar-{{course.progressbarclass}}" role="progressbar"
+ 							aria-valuenow="{{course.totalratio}}" aria-valuemin="0" aria-valuemax="100"
+ 							style="width: {{course.totalratio}}%;">
+    					{{course.totalratio}} %
+  					</div>
+  				</div>
+				{% endif %}
+			</div>
+		</div>
 	</div>
 	<div class="row">
-		{% for lesson in lessons %}
+		{% for lesson in course.lessons %}
 		<div class="col-md-4">
 			<div class="panel panel-default">
 				<div class="panel-heading">
 					{% 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"
+ 						<div class="progress-bar progress-bar-{{lesson.progressbarclass}}" role="progressbar"
  							aria-valuenow="{{lesson.totalratio}}" aria-valuemin="0" aria-valuemax="100"
  							style="width: {{lesson.totalratio}}%;">
-    						{{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>Résultat du comptage : <b>{{count.census}}/{{course.enrolled}}</b>. {{count.comment}}</p>
   						<p style="text-align:right;font-style:italic">{{count.signature}}</p>
   						</div>
   						{% endfor %}

census/templates/homeTemplate.html

 					}
 					{% endif %}
 					<div class="progress">
- 						<div class="progress-bar progress-bar-info" role="progressbar"
- 							aria-valuenow="{{lastcountratio}}" aria-valuemin="0" aria-valuemax="100"
- 							aria-valuenow="{{lastcountratio}}" aria-valuemin="0" aria-valuemax="100"
- 							style="width: {{lastcountratio}}%;">
-    						{{lastcount.census}}/{{lastcount.lesson.course.enrolled}} ({{lastcountratio}}%)
+ 						<div class="progress-bar progress-bar-{{lastcount.progressbarclass}}" role="progressbar"
+ 							aria-valuenow="{{lastcount.ratio}}" aria-valuemin="0" aria-valuemax="100"
+ 							aria-valuenow="{{lastcount.ratio}}" aria-valuemin="0" aria-valuemax="100"
+ 							style="width: {{lastcount.ratio}}%;">
+    						{{lastcount.census}}/{{lastcount.lesson.course.enrolled}} ({{lastcount.ratio}}%)
   						</div>
   					</div>
   					<p>{{lastcount.comment}}</p>
 					<h2 class="panel-title">Liste des cours</h2>
 				</div>
 				<div class="panel-body">
+					<p>Le pourcentage est le taux de visibilité du cours, le ratio correspond au nombre de cours comptés.
 					<ul class="list-group">
 						{% for course in courses %}
 							<a class="list-group-item" href="{% url 'census.views.cours' id_cours=course.id %}">{{course.name}}
 							{% else %}
 								(<span style='color:#F2E52E'>X{{course.promotion.number}}</span>)
 							{% endif %}
+							<span class="badge">{{course.nonnulllessonscount}} / {{course.lessonscount}}</span>
+							<span class="badge">{{course.totalratio}} %</span>
 							</a>
 						{% endfor %}
 					</ul>

census/views.py

 from django.shortcuts import render
 from census.models import Course,Count,Lesson
+from django import forms
 
-# Create your views here.
+#Auxiliariy functions
 
-def home(request):
-	#Retrieving the course list
-	courses = Course.objects.filter(promotion__number=2014)
-	#Retrieving last count
-	lastcount = Count.objects.latest('lesson__date')
-	lastcountratio = round(lastcount.census/lastcount.lesson.course.enrolled*100)
-	
-	return render(request,'homeTemplate.html', {'courses' : courses, 'lastcount' : lastcount, 'lastcountratio' : lastcountratio})
-
-def comptage(request):
-	return render(request,'comptageTemplate.html')
+def getProgressBarClass(ratio):
+	if (ratio > 75):
+		return "success"
+	elif (ratio > 50):
+		return "info"
+	elif (ratio > 25):
+		return "warning"
+	else:
+		return "danger"
 
-def cours(request, id_cours):
-	course = Course.objects.get(id=id_cours)
-	lessons = Lesson.objects.filter(course=course).order_by('number')
-	for lesson in lessons:
+def getCourseStatistics(course):
+	course.lessons = Lesson.objects.filter(course=course).order_by('number')
+	course.totalsum = 0
+	course.nonnulllessonscount = 0
+	for lesson in course.lessons:
 		lesson.counts = Count.objects.filter(lesson=lesson)
 		if (lesson.counts.count() != 0):
 			lesson.totalsum = 0 
 				count.ratio = round(count.census/lesson.course.enrolled*100)
 				lesson.totalsum += count.census
 			lesson.totalratio = round(lesson.totalsum/(lesson.counts.count()*course.enrolled)*100)
+			lesson.progressbarclass = getProgressBarClass(lesson.totalratio)
+			course.totalsum += lesson.totalratio
+			course.nonnulllessonscount += 1
 		else:
 			lesson.counts = None
-	return render(request, 'coursTemplate.html', {'course' : course, 'lessons' : lessons,})
+	if (course.lessons.count() != 0):
+		course.totalratio = round(course.totalsum / course.nonnulllessonscount)
+		course.progressbarclass = getProgressBarClass(course.totalratio)
+	else:
+		course.totalratio = 0
+	course.lessonscount= course.lessons.count()
+	return course
+
+class addCountForm(forms.Form):
+	course = forms.CharField(label="Cours",max_length=60)
+
+#Views
+
+def home(request):
+	#Retrieving the course list and the statistics
+	courses = Course.objects.filter(promotion__number=2014)
+	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)
+
+	return render(request,'homeTemplate.html', {'courses' : courses, 'lastcount' : lastcount,})
+
+def comptage(request):
+	return render(request,'comptageTemplate.html')
+
+def cours(request, id_cours):
+	course = Course.objects.get(id=id_cours)
+	course = getCourseStatistics(course)
+	return render(request, 'coursTemplate.html', {'course' : course,})
+
+def addcount(request):
+    # if this is a POST request we need to process the form data
+    if request.method == 'POST':
+        # create a form instance and populate it with data from the request:
+        form = addCountForm(request.POST)
+        # check whether it's valid:
+        if form.is_valid():
+            # process the data in form.cleaned_data as required
+            # ...
+            # redirect to a new URL:
+            return HttpResponseRedirect('/')
+
+    # if a GET (or any other method) we'll create a blank form
+    else:
+        form = addCountForm()
+
+    return render(request, 'addcountTemplate.html', {'form': form})