add count form completed

census/models.py

@@ -48,11 +48,11 @@ class Lesson(models.Model):
 
 	def __str__(self):
 		if ((self.number is not None) & (self.title is not None)):
-			return "%s %s : %s (%s,%s)" % (self.course.name,self.number,self.title,self.course.promotion,self.date)
+			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 %s (%s,%s)" % (self.course.name,self.number,self.course.promotion,self.date)
+			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)
+			return "%s : %s (%s, %s)" % (self.course.name,self.title,self.course.promotion,self.date)
 		else:
 			return "%s (%s,%s)" % (self.course.name,self.course.promotion,self.date)
 

census/templates/addcountTemplate.html

@@ -4,7 +4,7 @@
 {% block content %}
 <div class="container-fluid">
 	<div class="row">
-		<div class="col-md-4 col-md-offset-4">
+		<div class="col-md-6 col-md-offset-3">
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<h2 class="panel-title">Ajouter un comptage à la base de données</h2>
@@ -12,7 +12,22 @@
 				<div class="panel-body">
 					<form action="{% url 'census.views.addcount' %}" method="post">
 					{% csrf_token %}
-					{{form}}
+					{{ form.non_field_errors }}
+					<div class="list-group">
+						{% for field in form%}
+						<div class="list-group-item">
+    					{{ field.errors }}
+    						<div style="overflow:auto">
+    							<label for="{{ field.id_for_label }}">{{field.label}} :</label>
+    							<span style='float:right'>{{ field }}</span>
+    						</div>
+						</div>
+						{% endfor %}
+					</div>
+					<div style="text-align:center; margin-bottom:10px">
+					<button type="submit" class="btn btn-primary">Compter !</button>
+					</div>
+					<p>Pour modifier un comptage déjà enregistré, contacte l'<a href="mailto:denis.merigoux@polytechnique.edu">administrateur du site</a>.</p>
 					</form>
 				</div>
 			</div>

census/templates/coursTemplate.html

@@ -1,5 +1,5 @@
 {% extends 'baseTemplate.html' %}
-{% block title %}Conseils de comptage{% endblock %}
+{% block title %}{{course.name}} ({{course.promotion}}){% endblock %}
 {% block nav %}{% endblock %}
 {% block content %}
 <div class="container-fluid">

census/views.py

@@ -1,6 +1,7 @@
 from django.shortcuts import render
 from census.models import Course,Count,Lesson
 from django import forms
+from django.http import HttpResponseRedirect
 
 #Auxiliariy functions
 
@@ -39,8 +40,15 @@ def getCourseStatistics(course):
 	course.lessonscount= course.lessons.count()
 	return course
 
-class addCountForm(forms.Form):
-	course = forms.CharField(label="Cours",max_length=60)
+class addCountForm(forms.ModelForm):
+    class Meta:
+        model = Count
+    def clean_census(self):
+    	census = self.cleaned_data['census']
+    	enrolled = self.cleaned_data['lesson'].course.enrolled
+    	if (census>enrolled):
+        	raise forms.ValidationError("Tu as compté plus de gens qu'il n'y a de personnes inscrites dans ce cours !")
+    	return census  # Ne pas oublier de renvoyer le contenu du champ traité
 
 #Views
 
@@ -69,15 +77,14 @@ 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')
         # 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('/')
-
+            count = form.save()
+            return HttpResponseRedirect('/cours/'+ str(count.lesson.course.id))
     # if a GET (or any other method) we'll create a blank form
     else:
         form = addCountForm()
+        form.fields["lesson"].queryset = Lesson.objects.all().order_by('-date') 
 
     return render(request, 'addcountTemplate.html', {'form': form})