Merge pull request #375 – Make it possible to override session's start/end time

#375

Author: encukou

naucse/models.py

@@ -317,6 +317,14 @@ def merge_dict(base, patch):
     return result
 
 
+def time_from_string(time_string):
+    hour, minute = time_string.split(':')
+    hour = int(hour)
+    minute = int(minute)
+    tzinfo = dateutil.tz.gettz(_TIMEZONE)
+    return datetime.time(hour, minute, tzinfo=tzinfo)
+
+
 class Session(Model):
     """An ordered collection of materials"""
     def __init__(self, root, path, base_course, info, index, course=None):
@@ -341,21 +349,44 @@ def __str__(self):
     date = DataProperty(info, default=None)
     description = DataProperty(info, default=None)
 
-    def _time(self, key, default_time):
-        if self.date and default_time:
-            return datetime.datetime.combine(self.date, default_time)
+    def _time(self, time):
+        if self.date and time:
+            return datetime.datetime.combine(self.date, time)
+        return None
+
+    def _session_time(self, key):
+        sesion_time = self.info.get('time')
+        if sesion_time:
+            return time_from_string(sesion_time[key])
         return None
 
+    @reify
+    def has_irregular_time(self):
+        """True iff the session has its own start or end time, the course has
+        a default start or end time, and either of those does not match."""
+
+        irregular_start = self.course.default_start_time is not None \
+            and self._time(self.course.default_start_time) != self.start_time
+        irregular_end = self.course.default_end_time is not None \
+            and self._time(self.course.default_end_time) != self.end_time
+        return irregular_start or irregular_end
+
     @reify
     def start_time(self):
+        session_time = self._session_time('start')
+        if session_time:
+            return self._time(session_time)
         if self.course:
-            return self._time('start', self.course.default_start_time)
+            return self._time(self.course.default_start_time)
         return None
 
     @reify
     def end_time(self):
+        session_time = self._session_time('end')
+        if session_time:
+            return self._time(session_time)
         if self.course:
-            return self._time('end', self.course.default_end_time)
+            return self._time(self.course.default_end_time)
         return None
 
     @reify
@@ -471,12 +502,7 @@ def end_date(self):
     def _default_time(self, key):
         default_time = self.info.get('default_time')
         if default_time:
-            time_string = default_time[key]
-            hour, minute = time_string.split(':')
-            hour = int(hour)
-            minute = int(minute)
-            tzinfo = dateutil.tz.gettz(_TIMEZONE)
-            return datetime.time(hour, minute, tzinfo=tzinfo)
+            return time_from_string(default_time[key])
         return None
 
     @reify

naucse/static/css/nausce.css

@@ -173,6 +173,28 @@ code {
     white-space: pre-wrap;
 }
 
+/*** Session lists ***/
+
+.session-time-place {
+    margin-left: 1.5em;
+}
+
+.session-time-place .regular-time {
+    font-size: inherit;
+}
+
+.session-time-place small.regular-time {
+    color: #888;
+}
+
+.session-time-place .irregular-time-alert {
+    color: #888;
+}
+
+.session-time-place .irregular-time-alert .icon {
+    color: #F0AD4E;
+}
+
 /*** Material lists ***/
 
 ul.material-list {

naucse/templates/course.html

@@ -41,10 +41,35 @@ <h4>
                         <a href="{{ session_url(course.slug, session.slug) }}">
                             {{ session.title }}
                         </a>
-                        {% if session.date %}
-                            <small>({{ session.date | format_date }})</small>
-                        {% endif %}
                     </h4>
+                    {% if session.date %}
+                        <div class="session-time-place">
+                            <div>
+                                {{ session.date | format_date -}}
+                                {%- if session.start_time and session.end_time -%}
+                                    {%- macro _time() -%}
+                                        ,
+                                        {{ session.start_time | format_time -}}
+                                        –
+                                        {{- session.end_time | format_time -}}
+                                    {%- endmacro %}
+                                    {%- if session.has_irregular_time -%}
+                                        <span class="irregular-time">{{ _time() }}</span>
+                                    {%- elif course.default_start_time -%}
+                                        <small class="regular-time">{{ _time() }}</small>
+                                    {%- else -%}
+                                        <span class="regular-time">{{ _time() }}</span>
+                                    {%- endif -%}
+                                {% endif %}
+                            </div>
+                            {% if session.has_irregular_time %}
+                                <div class="irregular-time-alert">
+                                    {{ bytesize_icon('alert') }}
+                                    Pozor, změna času konání!
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% endif %}
                     {% if session.description %}{{ session.description | markdown }}{% endif %}
                     {{ material_list(session.materials) }}
                 </div>

naucse/templates/coverpage.html

@@ -25,8 +25,9 @@ <h1>
             {% endif %}
         </h1>
 
-        {% if course.place is defined and course.time is defined and course.place != None and course.time != None %}
-            <div class="details">{{course.place}}, {{course.time}}</div>
+        {% if course.place is not none and session.start_time is not none %}
+            <div class="details">{{ course.place }},
+                {{ session.start_time | format_time }}–{{ session.end_time | format_time }}</div>
         {% endif %}
 
         {% if session.description %}{{ session.description | markdown }}{% endif %}