|
|
@@ -18,7 +18,7 @@ def getProgressBarClass(ratio):
|
|
18
|
18
|
return "danger"
|
|
19
|
19
|
|
|
20
|
20
|
def getCourseStatistics(course):
|
|
21
|
|
- course.lessons = Lesson.objects.filter(course=course).order_by('number')
|
|
|
21
|
+ course.lessons = Lesson.objects.filter(course=course,date__lte=datetime.today()).order_by('number')
|
|
22
|
22
|
course.totalsum = 0
|
|
23
|
23
|
course.nonnulllessonscount = 0
|
|
24
|
24
|
for lesson in course.lessons:
|
|
|
@@ -56,7 +56,7 @@ class addCountForm(forms.ModelForm):
|
|
56
|
56
|
|
|
57
|
57
|
def home(request):
|
|
58
|
58
|
#Retrieving the course list and the statistics
|
|
59
|
|
- courses = Course.objects.all().annotate(latest_lesson_date=Max('lesson__date')).order_by('-latest_lesson_date')
|
|
|
59
|
+ courses = Course.objects.annotate(latest_lesson_date=Max('lesson__date')).filter(latest_lesson_date__lte=datetime.today()).order_by('-latest_lesson_date')
|
|
60
|
60
|
#courses = Course.objects.all().order_by('-promotion')
|
|
61
|
61
|
for course in courses:
|
|
62
|
62
|
course = getCourseStatistics(course)
|