remove microseconds, fix no pub date

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 04bac4ed5df7007521c096a89a22fa61f0f0f6a2..bca18815444fa9dc5cd3f10bacb4ca8f4517ce02 100755 (executable)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -404,7 +404,8 @@ class Conference(models.Model):
 
     @property
     def duration(self):
-        return self.date_end - self.date_begin
+        return self.date_end.replace(microsecond=0) - \
+               self.date_begin.replace(microsecond=0)
 
     @property
     def slug(self):

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index a45e6d3ad96665967a1d2cccadf15ffa26433a2d..2eb283c57b0c1f24aaa9869818166e9fe9442792 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -156,25 +156,40 @@ $(document).ready(function(){
 <dl class="listing">
 
 {% if media.conference %}
-<dt>{% trans "Course" %}</dt><dd><a href="{% url 'teleforma-desk-period-course' period.id course.id %}">{{ media.course.title }} - {{ media.course_type }}</a></dd>
-<dt>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
+    <dt>{% trans "Course" %}</dt><dd><a href="{% url 'teleforma-desk-period-course' period.id course.id %}">{{ media.course.title }} - {{ media.course_type }}</a></dd>
+    <dt>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
+
 {% if media.conference.professor %}
-<dt>{% trans "Professor" %}</dt><dd>{{ media.conference.professor }}</dd>
+    <dt>{% trans "Professor" %}</dt><dd>{{ media.conference.professor }}</dd>
+{% endif %}
+
+{% if media.conference.comment %}
+    <dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>
 {% endif %}
-{% if media.conference.comment %}<dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>{% endif %}
-{% if media.conference.room %}<dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>{% endif %}
-<dt>{% trans "Publication date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
-<dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
+
+{% if media.conference.room %}
+    <dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>
+{% endif %}
+
+{% if media.conference.date_publish %}
+    <dt>{% trans "Publication date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+{% else %}
+    <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
+{% endif %}
+
+    <dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
+
 {% if user.is_staff or user.is_superuser %}
-<dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
-<dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
-<dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>
-<dt>{% trans "Date added" %}</dt><dd>{{ media.date_added }}</dd>
-<dt>{% trans "Date modified" %}</dt><dd>{{ media.date_modified }}</dd>
-<dt>{% trans "Media ID" %}</dt><dd>{{ media.id }}</dd>
-<dt>{% trans "Conference ID" %}</dt><dd>{{ media.conference.public_id }}</dd>
-<dt>{% trans "Web class group" %}</dt><dd>{{ media.conference.web_class_group }}</dd>
+    <dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
+    <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
+    <dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>
+    <dt>{% trans "Date added" %}</dt><dd>{{ media.date_added }}</dd>
+    <dt>{% trans "Date modified" %}</dt><dd>{{ media.date_modified }}</dd>
+    <dt>{% trans "Media ID" %}</dt><dd>{{ media.id }}</dd>
+    <dt>{% trans "Conference ID" %}</dt><dd>{{ media.conference.public_id }}</dd>
+    <dt>{% trans "Web class group" %}</dt><dd>{{ media.conference.web_class_group }}</dd>
 {% endif %}
+
 {% endif %}
 
 </dl>

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index d788050fac149340d9b364863b14d0576d66a511..a6c0292f918b514d0b56ea76088b5892b47b6e74 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -36,7 +36,11 @@
                     {% if media.conference.professor %}
                     <dt>{% trans "Professor" %}</dt><dd>{{ media.conference.professor }}</dd>
                     {% endif %}
-                    <dt>{% trans "Publication date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+                    {% if media.conference.date_publish %}
+                        <dt>{% trans "Publication date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+                    {% else %}
+                        <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
+                    {% endif %}
                     <dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
                     {% if media.conference.comment %}
                     <dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>