indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Check that the end time is greater

merge-requests/30/head
Bob Mottram 2023-01-17 13:01:53 +00:00
parent 9f37dd1368
commit 8ebef73249
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
webapp_calendar.py
View File

@ -274,16 +274,22 @@ def _html_calendar_day(person_cache: {}, translate: {},
event_class = 'calendar__day__event__public__rtl' event_class = 'calendar__day__event__public__rtl'
cal_item_class = 'calItemPublic' cal_item_class = 'calItemPublic'
if event_time: if event_time:
if event_end_time and start_time_str != end_time_str: event_time = \
event_time = \ '<time datetime="' + start_time_str + '">' + \
'<time datetime="' + start_time_str + '">' + \ event_time + '</time>'
event_time + '</time> - ' + \ if event_time and event_end_time and \
'<time datetime="' + end_time_str + '">' + \ start_time_str != end_time_str:
event_end_time + '</time>' event_time_int_str = event_time.replace(':', '')
else: event_end_time_int_str = event_end_time.replace(':', '')
event_time = \ if event_time_int_str.isdigit() and \
'<time datetime="' + start_time_str + '">' + \ event_end_time_int_str.isdigit():
event_time + '</time>' if int(event_end_time_int_str) > \
int(event_time_int_str):
event_time = \
'<time datetime="' + start_time_str + '">' + \
event_time + '</time> - ' + \
'<time datetime="' + end_time_str + '">' + \
event_end_time + '</time>'
if event_time and event_description and event_place: if event_time and event_description and event_place:
calendar_str += \ calendar_str += \
'<tr class="' + cal_item_class + '">' + \ '<tr class="' + cal_item_class + '">' + \