From: Yoan Le Clanche Date: Tue, 16 Jun 2020 07:51:21 +0000 (+0200) Subject: fix issue with duration display error X-Git-Tag: 2.8.1-pro~185 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=899c818a61ca78f2691b76896d43645c4a13b3b2;p=teleforma.git fix issue with duration display error --- diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 338dd622..b6a373f2 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -667,11 +667,10 @@ class WebclassMixin(Model): @property def webclass_duration(self): + """ in seconds """ if self.webclass_hours_complementary: - seconds = self.duration.as_seconds() - self.webclass_hours_complementary.as_seconds() - else: - seconds = self.duration.as_seconds() - return datetime.timedelta(seconds=seconds) + return (self.duration.as_seconds() - self.webclass_hours_complementary.as_seconds()) + return self.duration.as_seconds() # def clean(self): # if self.start_date > self.end_date:: diff --git a/teleforma/templates/teleforma/course_webclass.html b/teleforma/templates/teleforma/course_webclass.html index 6431f00c..85d7d8f9 100644 --- a/teleforma/templates/teleforma/course_webclass.html +++ b/teleforma/templates/teleforma/course_webclass.html @@ -91,7 +91,7 @@ {% comment %}
{% trans "Live" %}
{% if is_webclass_running %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}
{% endcomment %}
{% trans "Duration" %}
-
{{ conference.webclass_duration.seconds|fancy_seconds }}
+
{{ conference.webclass_duration|fancy_seconds }}
{% trans "Live" %}
{% trans "Yes" %}
{% comment %} {% if conference.room %}
{% trans "Room" %}