From: Guillaume Pellerin Date: Sun, 20 Jul 2014 19:28:34 +0000 (+0200) Subject: add seminar time delta X-Git-Tag: 2.8.1-pro~282^2~73 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82b2a5b81358f0a08f0857dde0e88d4868aa0427;p=teleforma.git add seminar time delta --- diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index 013ea3a9..b50ebe13 100755 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -322,3 +322,9 @@ class SeminarRevision(models.Model): verbose_name = _('Seminar revision') verbose_name_plural = _('Seminar revisions') ordering = ['-date'] + + def delta(self): + if self.date_modified: + return date_modified - date + else: + return None diff --git a/teleforma/templates/teleforma/inc/seminar_description.html b/teleforma/templates/teleforma/inc/seminar_description.html index 8922307f..fd7edf42 100644 --- a/teleforma/templates/teleforma/inc/seminar_description.html +++ b/teleforma/templates/teleforma/inc/seminar_description.html @@ -10,6 +10,7 @@ {% endif %}
{% trans "level" %}
{{ seminar.level }}
{% trans "duration" %}
{{ seminar.duration|hours }} {% trans "hours" %}
+
{% trans "time" %}
{{ delta }}
{% trans "expiry date" %}
{{ seminar.expiry_date }}
{% if user.is_superuser %}
{% trans "code" %}
{{ seminar.code }}
diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 5278ebf0..2717781f 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -140,6 +140,14 @@ class SeminarRevisionMixin(object): r.date_modified = now r.save() + def get_delta(username, seminar): + t = datetime.timedelta() + for r in SeminarRevision.objects.filter(user=user, seminar=seminar, date__gte=REVISION_DATE_FILTER) + if r.date_modified: + t += r.delta() + return t + + class SeminarView(SeminarAccessMixin, DetailView): context_object_name = "seminar" @@ -165,6 +173,7 @@ class SeminarView(SeminarAccessMixin, DetailView): elif progress == 100 and validated and self.template_name == 'teleforma/seminar_detail.html': messages.info(self.request, _("You have successfully terminated all steps of your e-learning seminar. You can now download your training testimonial below.")) # set_revision(user, seminar) + context['delta'] = self.get_delta(user, seminar) return context @jsonrpc_method('teleforma.publish_seminar')