Add institution detail view with stats
This commit is contained in:
parent
f6ff281d4b
commit
4b6a8d50c3
8 changed files with 147 additions and 3 deletions
|
|
@ -163,6 +163,19 @@ class Period(models.Model):
|
|||
def dates(self):
|
||||
return '%s - %s' % (self.start_date, self.end_date)
|
||||
|
||||
@property
|
||||
def school_year(self):
|
||||
if self.start_date.month < 8:
|
||||
start_year = self.start_date.year - 1
|
||||
else:
|
||||
start_year = self.start_date.year
|
||||
return "%d — %d" % (start_year, start_year + 1)
|
||||
|
||||
@property
|
||||
def weeks(self):
|
||||
""" Return the number of weeks of this period """
|
||||
return (self.end_date - self.start_date).days // 7
|
||||
|
||||
|
||||
class Availability(models.Model):
|
||||
""" Disponibilités des institutions """
|
||||
|
|
|
|||
BIN
stages/static/img/edit.png
Normal file
BIN
stages/static/img/edit.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
|
|
@ -1,8 +1,11 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.test import TestCase
|
||||
|
||||
from .models import Student, Availability, Referent
|
||||
from .models import Period, Student, Availability, Referent
|
||||
|
||||
class StagesTest(TestCase):
|
||||
fixtures = ['test_fixture.json']
|
||||
|
|
@ -29,4 +32,12 @@ class StagesTest(TestCase):
|
|||
self.assertEqual(response.content, b'OK')
|
||||
avail = Availability.objects.get(pk=2)
|
||||
self.assertEqual(avail.training.student, student)
|
||||
|
||||
|
||||
def test_period_schoolyear(self):
|
||||
per = Period.objects.get(pk=1)
|
||||
self.assertEqual(per.school_year, "2012 — 2013")
|
||||
|
||||
def test_period_weeks(self):
|
||||
per = Period.objects.get(pk=1)
|
||||
self.assertEqual(per.weeks, 1)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ from datetime import date
|
|||
from django.db.models import Count
|
||||
from django.http import HttpResponse, HttpResponseNotAllowed
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.utils.datastructures import SortedDict
|
||||
from django.views.generic import DetailView, TemplateView, ListView
|
||||
|
||||
from .forms import PeriodForm
|
||||
|
|
@ -23,6 +24,41 @@ def school_year_start():
|
|||
return date(current_year, 8, 1)
|
||||
|
||||
|
||||
class CorporationListView(ListView):
|
||||
model = Corporation
|
||||
template_name = 'corporations.html'
|
||||
|
||||
|
||||
class CorporationView(DetailView):
|
||||
model = Corporation
|
||||
template_name = 'corporation.html'
|
||||
context_object_name = 'corp'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(CorporationView, self).get_context_data(**kwargs)
|
||||
# Create a structure like:
|
||||
# {'2011-2012': {'avails': [avail1, avail2, ...], 'stats': {'fil': num}},
|
||||
# '2012-2013': ...}
|
||||
school_years = SortedDict()
|
||||
for av in Availability.objects.filter(corporation=self.object
|
||||
).select_related('training__student__klass', 'period__section'
|
||||
).order_by('period__start_date'):
|
||||
if av.period.school_year not in school_years:
|
||||
school_years[av.period.school_year] = {'avails': [], 'stats': {}}
|
||||
school_years[av.period.school_year]['avails'].append(av)
|
||||
if av.period.section.name not in school_years[av.period.school_year]['stats']:
|
||||
school_years[av.period.school_year]['stats'][av.period.section.name] = 0
|
||||
try:
|
||||
av.training
|
||||
# Only add to stats if training exists
|
||||
school_years[av.period.school_year]['stats'][av.period.section.name] += av.period.weeks
|
||||
except Training.DoesNotExist:
|
||||
pass
|
||||
|
||||
context['years'] = school_years
|
||||
return context
|
||||
|
||||
|
||||
class StudentSummaryView(DetailView):
|
||||
model = Student
|
||||
template_name = 'student_summary.html'
|
||||
|
|
@ -69,11 +105,14 @@ class AttributionView(TemplateView):
|
|||
context = super(AttributionView, self).get_context_data(**kwargs)
|
||||
# Need 2 queries, because referents with no training item would not appear in the second query
|
||||
referents = Referent.objects.all().order_by('last_name', 'first_name')
|
||||
|
||||
# Populate each referent with the number of referencies done during the current school year
|
||||
ref_counts = dict([(ref.id, ref.num_refs)
|
||||
for ref in Referent.objects.filter(training__availability__period__end_date__gte=school_year_start
|
||||
).annotate(num_refs=Count('training'))])
|
||||
for ref in referents:
|
||||
ref.num_refs = ref_counts.get(ref.id, 0)
|
||||
|
||||
context.update({
|
||||
#'period_form': PeriodForm(),
|
||||
'sections': Section.objects.all(),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue