From 4b6a8d50c3a9afc6e97456b4fcbc58284be6b001 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 8 Apr 2013 14:19:23 +0200 Subject: [PATCH] Add institution detail view with stats --- common/urls.py | 3 ++ stages/models.py | 13 +++++++++ stages/static/img/edit.png | Bin 0 -> 2623 bytes stages/tests.py | 15 ++++++++-- stages/views.py | 39 +++++++++++++++++++++++++ templates/admin/index.html | 12 +++++++- templates/corporation.html | 56 ++++++++++++++++++++++++++++++++++++ templates/corporations.html | 12 ++++++++ 8 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 stages/static/img/edit.png create mode 100644 templates/corporation.html create mode 100644 templates/corporations.html diff --git a/common/urls.py b/common/urls.py index 68d1e40..8b9ad0e 100644 --- a/common/urls.py +++ b/common/urls.py @@ -18,6 +18,9 @@ urlpatterns = patterns('', url(r'^attribution/$', views.AttributionView.as_view(), name='attribution'), url(r'^stages/export/$', 'stages.views.stages_export', name='stages_export'), + url(r'^institutions/$', views.CorporationListView.as_view(), name='corporations'), + url(r'^institutions/(?P\d+)/$', views.CorporationView.as_view(), name='corporation'), + # AJAX/JSON urls url(r'^section/(?P\d+)/periods/', 'stages.views.section_periods'), url(r'^section/(?P\d+)/classes/', 'stages.views.section_classes'), diff --git a/stages/models.py b/stages/models.py index d9ca6d1..c6198fd 100644 --- a/stages/models.py +++ b/stages/models.py @@ -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 """ diff --git a/stages/static/img/edit.png b/stages/static/img/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..cb1bd1aad45b03470217ce2c5df4ed8204bfe7d0 GIT binary patch literal 2623 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 endblock %} +{% block extrastyle %}{{ block.super }} + + +{% endblock %} {% block coltype %}colMS{% endblock %} @@ -13,6 +19,10 @@ {% block content %}
+ + {% if app_list %} {% for app in app_list %}
diff --git a/templates/corporation.html b/templates/corporation.html new file mode 100644 index 0000000..262aca6 --- /dev/null +++ b/templates/corporation.html @@ -0,0 +1,56 @@ +{% extends "admin/base_site.html" %} +{% load i18n %} + +{% block extrastyle %} + +{% endblock %} + +{% block breadcrumbs %} +
+{% trans 'Home' %} +› Liste des institutions +
+{% endblock %} + +{% block content %} +
+

{{ corp.name }}

+ + + + + + + + + + +
Adresse :{{ corp.street }}
+ {{ corp.pcode }} {{ corp.city }}
+ Tél: {{ corp.tel }}
+ {% if corp.email %}{{ corp.email }}
{% endif %} + {% if corp.web %}{{ corp.web }}
{% endif %} + 		Type de structure :{{ corp.typ }}
Contacts :{% for cont in corp.corpcontact_set.all %} + {{ cont.first_name }} {{ cont.last_name }} {% if cont.role %} ({{ cont.role }}){% endif %}{% endfor %} +
+ +{% for year, data in years.items %} +

{{ year }}

+ + {% for avail in data.avails %} + + + + + {% endfor %} + + + +
{{ avail.period.dates }}{% if not avail.training %}Disponibilité{% else %}{{ avail.training.student }} ({{ avail.training.student.klass }}){% endif %}{{ avail.period.section }}
Totaux :{% for fil, num in data.stats.items %}{{ fil }} : {{ num }} semaine(s)
{% endfor %}
+{% endfor %} + +{% endblock %} diff --git a/templates/corporations.html b/templates/corporations.html new file mode 100644 index 0000000..4778ea2 --- /dev/null +++ b/templates/corporations.html @@ -0,0 +1,12 @@ +{% extends "admin/base_site.html" %} + +{% block content %} +

Liste des institutions

+ + +{% for corp in object_list %} + + +{% endfor %} +
{{ corp.name }}{{ corp.pcode }} {{ corp.city }}
+{% endblock %}