File tree Expand file tree Collapse file tree 3 files changed +27
-3
lines changed Expand file tree Collapse file tree 3 files changed +27
-3
lines changed Original file line number Diff line number Diff line change @@ -354,14 +354,30 @@ def _time(self, time):
354
354
return datetime .datetime .combine (self .date , time )
355
355
return None
356
356
357
+ def _session_time (self , key ):
358
+ sesion_time = self .info .get ('time' )
359
+ if sesion_time :
360
+ return time_from_string (sesion_time [key ])
361
+ return None
362
+
363
+ @reify
364
+ def has_custom_time (self ):
365
+ return self ._session_time ('start' ) is not None
366
+
357
367
@reify
358
368
def start_time (self ):
369
+ session_time = self ._session_time ('start' )
370
+ if session_time :
371
+ return self ._time (session_time )
359
372
if self .course :
360
373
return self ._time (self .course .default_start_time )
361
374
return None
362
375
363
376
@reify
364
377
def end_time (self ):
378
+ session_time = self ._session_time ('end' )
379
+ if session_time :
380
+ return self ._time (session_time )
365
381
if self .course :
366
382
return self ._time (self .course .default_end_time )
367
383
return None
Original file line number Diff line number Diff line change 39
39
{{ session.title }}
40
40
</ a >
41
41
{% if session.date %}
42
- < small > ({{ session.date | format_date }})</ small >
42
+ < small > ({{ session.date | format_date -}}
43
+ {%- if session.has_custom_time -%}
44
+ , {{ session.start_time | format_time }}–{{ session.end_time | format_time -}}
45
+ {% endif -%}
46
+ )</ small >
43
47
{% endif %}
44
48
</ h4 >
49
+ {% if session.has_custom_time %}
50
+ < div > {{ bytesize_icon('alert') }} Pozor, změna času!</ div >
51
+ {% endif %}
45
52
{% if session.description %}{{ session.description | markdown }}{% endif %}
46
53
{{ material_list(session.materials) }}
47
54
</ div >
Original file line number Diff line number Diff line change 25
25
{% endif %}
26
26
</ h1 >
27
27
28
- {% if course.place is defined and course.time is defined and course.place != None and course.time != None %}
29
- < div class ="details "> {{course.place}}, {{course.time}}</ div >
28
+ {% if course.place is not none and session.start_time is not none %}
29
+ < div class ="details "> {{ course.place }},
30
+ {{ session.start_time | format_time }}–{{ session.end_time | format_time }}</ div >
30
31
{% endif %}
31
32
32
33
{% if session.description %}{{ session.description | markdown }}{% endif %}
You can’t perform that action at this time.
0 commit comments