Bläddra i källkod

improving view

Denis Merigoux 10 år sedan
förälder
incheckning
6638d0fbb3
3 ändrade filer med 32 tillägg och 5 borttagningar
  1. 23 2
      census/templates/homeTemplate.html
  2. 8 2
      census/views.py
  3. 1 1
      requirements.txt

+ 23 - 2
census/templates/homeTemplate.html

@@ -17,10 +17,31 @@
17 17
 		<div class="col-md-4">
18 18
 			<div class="panel panel-default">
19 19
 				<div class="panel-heading">
20
-					<h2 class="panel-title">Cours</h2>
20
+					<h2 class="panel-title">Liste des cours</h2>
21 21
 				</div>
22 22
 				<div class="panel-body">
23
-					Bienvenue sur le site du Laboratoire pour l'Acquisition Périphérique d'Informations !
23
+					<ul>
24
+						{% for course in courses %}
25
+						<li>{{ course }}</li>
26
+						{% endfor %}
27
+					</ul>
28
+				</div>
29
+			</div>
30
+		</div>
31
+		<div class="col-md-4">
32
+			<div class="panel panel-success">
33
+				<div class="panel-heading">
34
+					<h2 class="panel-title">Dernier comptage enregistré</h2>
35
+				</div>
36
+				<div class="panel-body">
37
+					Comptage de l'amphi n°{{lastcount.lesson.number}} de {{lastcount.lesson.cours.name}} du {{lastcount.lesson.date}}, donné en amphi {{lastcount.lesson.amphi}} par {{lastcount.lesson.professor}} :
38
+					<div class="progress">
39
+ 						<div class="progress-bar progress-bar-info" role="progressbar"
40
+ 							aria-valuenow="{{lastcountratio}}" aria-valuemin="0" aria-valuemax="100"
41
+ 							style="width: {{lastcountratio}}%;">
42
+    						{{lastcountratio|truncatechars:2}}%
43
+  						</div>
44
+					</div>
24 45
 				</div>
25 46
 			</div>
26 47
 		</div>

+ 8 - 2
census/views.py

@@ -1,7 +1,13 @@
1 1
 from django.shortcuts import render
2
-from django.http import Http404
2
+from census.models import Course,Count
3 3
 
4 4
 # Create your views here.
5 5
 
6 6
 def home(request):
7
-	return render(request,'homeTemplate.html')
7
+	#Retrieving the course list
8
+	courses = Course.objects.filter(promotion__number=2013)
9
+	#Retrieving last count
10
+	lastcount = Count.objects.latest('lesson__date')
11
+	lastcountratio = lastcount.census/lastcount.lesson.course.enrolled*100
12
+	
13
+	return render(request,'homeTemplate.html', {'courses' : courses, 'lastcount' : lastcount, 'lastcountratio' : lastcountratio})

+ 1 - 1
requirements.txt

@@ -1,2 +1,2 @@
1 1
 Django 1.7.3
2
-Django-bootstrap3 :https://github.com/dyve/django-bootstrap3
2
+django-bootstrap3 : https://github.com/dyve/django-bootstrap3