Compare commits
No commits in common. "d9852762fe2c32f53bdaf192ab31a539cb42d4e3" and "6c95231e89399d237a65b6117cd52ce697a85a3e" have entirely different histories.
d9852762fe
...
6c95231e89
|
|
@ -5,11 +5,6 @@ type: docker
|
|||
name: default
|
||||
|
||||
steps:
|
||||
- name: fetch-schedule
|
||||
image: python:3.10-alpine
|
||||
commands:
|
||||
- bin/fetch_schedule.py
|
||||
|
||||
- name: build
|
||||
image: klakegg/hugo:ext-alpine-ci
|
||||
when:
|
||||
|
|
@ -17,7 +12,7 @@ steps:
|
|||
- live
|
||||
|
||||
- name: build-staging
|
||||
image: klakegg/hugo:ext-alpine-ci
|
||||
image: klakegg/hugo:ext-debian-ci
|
||||
commands:
|
||||
- hugo --baseURL="https://staging.www.iger.events/"
|
||||
when:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
.hugo_build.lock
|
||||
data/schedule.json
|
||||
public/
|
||||
resources/_gen/
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from json import dumps, loads
|
||||
from pathlib import Path
|
||||
from urllib.request import urlopen
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
GRANULARITY = 30
|
||||
SCHEDULE_URL = 'https://cfp.fairydust.reisen/iger-2022/schedule/export/schedule.json'
|
||||
TIMEZONE = 'Europe/Berlin'
|
||||
|
||||
def parse_duration(s, num_parts):
|
||||
duration = 0
|
||||
for t in s.split(':', maxsplit=num_parts-1):
|
||||
duration *= 60
|
||||
duration += int(t)
|
||||
|
||||
return duration
|
||||
|
||||
def main():
|
||||
with urlopen(SCHEDULE_URL) as f:
|
||||
data = loads(f.read())
|
||||
|
||||
conference = data['schedule']['conference']
|
||||
|
||||
rooms = {}
|
||||
for day in conference['days']:
|
||||
for room in conference['rooms']:
|
||||
name = room['name']
|
||||
if name not in day['rooms']:
|
||||
continue
|
||||
if name not in rooms:
|
||||
rooms[name] = []
|
||||
|
||||
rooms[name] += day['rooms'][name]
|
||||
|
||||
timezone = ZoneInfo(TIMEZONE)
|
||||
|
||||
start_date = None
|
||||
end_date = None
|
||||
for _, events in rooms.items():
|
||||
for event in events:
|
||||
date = datetime.fromisoformat(event['date']).astimezone(timezone)
|
||||
if start_date is None or date < start_date:
|
||||
start_date = date
|
||||
|
||||
event['start_date'] = date
|
||||
|
||||
date += timedelta(seconds=parse_duration(event['duration'], 2)*60)
|
||||
if end_date is None or date > end_date:
|
||||
end_date = date
|
||||
|
||||
event['end_date'] = date
|
||||
|
||||
timeline = []
|
||||
timeslot = parse_duration(conference['timeslot_duration'], 2)
|
||||
for offset in range(0, int((end_date-start_date).total_seconds()), GRANULARITY*60):
|
||||
date = start_date + timedelta(seconds=offset)
|
||||
timeline.append({'date': date.strftime('%Y-%m-%d'), 'start': offset//(timeslot*60)+1, 'time': date.strftime('%H:%M')})
|
||||
|
||||
out_data = {
|
||||
'days': [day['date'] for day in conference['days']],
|
||||
'end_date': end_date.isoformat(timespec='seconds'),
|
||||
'rooms': {name: [{
|
||||
'end': int((event['end_date']-start_date).total_seconds())//(timeslot*60)+1,
|
||||
'end_time': event['end_date'].strftime('%H:%M'),
|
||||
'speaker': ', '.join(person['public_name'] for person in event['persons']),
|
||||
'start': int((event['start_date']-start_date).total_seconds())//(timeslot*60)+1,
|
||||
'start_time': event['start_date'].strftime('%H:%M'),
|
||||
'title': event['title'],
|
||||
'url': event['url'],
|
||||
} for event in events] for name, events in rooms.items()},
|
||||
'span': GRANULARITY // timeslot,
|
||||
'start_date': start_date.isoformat(timespec='seconds'),
|
||||
'timeline': timeline,
|
||||
'timezone': TIMEZONE,
|
||||
'version': data['schedule']['version'],
|
||||
}
|
||||
|
||||
with open(Path(__file__).resolve().parent.parent / 'data' / 'schedule.json', 'w') as f:
|
||||
f.write(dumps(out_data))
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
@ -9,4 +9,4 @@ menu:
|
|||
Wir werden in den nächsten Tagen nach und nach weitere Programmpunkte veröffentlichen.
|
||||
Bitte beachtet, dass die zeitliche Planung sich aktuell noch jederzeit ändern kann.
|
||||
|
||||
{{<schedule>}}
|
||||
{{<schedule url="https://cfp.fairydust.reisen/iger-2022/schedule/export/schedule.json">}}
|
||||
|
|
|
|||
|
|
@ -1,47 +1,102 @@
|
|||
{{ with $.Site.Data.schedule }}
|
||||
{{ $data := getJSON (.Get "url") }}
|
||||
{{ with $data.schedule }}
|
||||
|
||||
{{ $timeslotDuration := 0 }}
|
||||
{{ range split .conference.timeslot_duration ":" }}
|
||||
{{ $timeslotDuration = add (mul $timeslotDuration 60) (int .) }}
|
||||
{{ end }}
|
||||
|
||||
{{ $rooms := dict }}
|
||||
{{ range $day := .conference.days }}
|
||||
{{ range $room := $data.schedule.conference.rooms }}
|
||||
{{ with index $day.rooms $room.name }}
|
||||
{{ if index $rooms $room.name }}
|
||||
{{ $rooms = merge $rooms (dict $room.name ((index $rooms $room.name) | append .)) }}
|
||||
{{ else }}
|
||||
{{ $rooms = merge $rooms (dict $room.name .) }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
{{ $events := slice }}
|
||||
{{ range $rooms }}
|
||||
{{ with . }}
|
||||
{{ if $events }}
|
||||
{{ $events = $events | append . }}
|
||||
{{ else }}
|
||||
{{ $events = . }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
{{ $events = sort $events "date" }}
|
||||
{{ $startDate := time (index $events 0).date }}
|
||||
{{ $endDate := 0 }}
|
||||
{{ with index $events (sub (len $events) 1) }}
|
||||
{{ $lastDuration := 0 }}
|
||||
{{ range split .duration ":" }}
|
||||
{{ $lastDuration = add (mul $lastDuration 60) (int .) }}
|
||||
{{ end }}
|
||||
{{ $endDate = time (add (time .date).Unix (mul $lastDuration 60)) }}
|
||||
{{ end }}
|
||||
|
||||
<p class="schedule-info">
|
||||
Version: <span class="schedule-version">{{ .version }}</span>
|
||||
<br>Zeitangaben in <span class="schedule-timezone">{{ .timezone }}</span>
|
||||
<br>Zeitangaben in <span class="schedule-timezone">{{ $startDate.Format "MST" }}</span>
|
||||
</p>
|
||||
|
||||
<div class="schedule-days">
|
||||
{{ range .days }}
|
||||
<a href="#{{ . }}">{{ . }}</a>·
|
||||
{{ range .conference.days }}
|
||||
<a href="#{{ .date }}">{{ .date }}</a>·
|
||||
{{ end }}
|
||||
<a href="#">zurück nach oben</a>
|
||||
</div>
|
||||
|
||||
<div class="schedule">
|
||||
<div class="schedule-grid schedule-timeline" style="--span: {{ .span }}">
|
||||
<div class="schedule-grid schedule-timeline" style="--span: {{ div 30 $timeslotDuration }}">
|
||||
<h3 class="schedule-title"></h3>
|
||||
{{ $lastDate := "" }}
|
||||
{{ range .timeline }}
|
||||
<div class="schedule-time" style="--start: {{ .start }}">
|
||||
{{ if ne .date $lastDate }}
|
||||
<div class="schedule-date" id="{{ .date }}">{{ .date }}</div>
|
||||
{{ $lastDate := 0 }}
|
||||
{{ range seq 1 (div 30 $timeslotDuration) (div ($endDate.Sub $startDate).Minutes $timeslotDuration) }}
|
||||
{{ $date := time (add $startDate.Unix (mul (sub . 1) (mul $timeslotDuration 60))) }}
|
||||
<div class="schedule-time" style="--start: {{ . }}">
|
||||
{{ if or (not $lastDate) (ne ($date.Format "2006-01-02") ($lastDate.Format "2006-01-02")) }}
|
||||
<div class="schedule-date" id="{{ $date.Format "2006-01-02" }}">{{ $date.Format "2006-01-02" }}</div>
|
||||
{{ end }}
|
||||
{{ .time }}
|
||||
{{ $date.Format "15:04" }}
|
||||
</div>
|
||||
{{ $lastDate = .date }}
|
||||
{{ $lastDate = $date }}
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ range $name, $events := .rooms }}
|
||||
{{ range sort $data.schedule.conference.rooms "name" }}
|
||||
{{ $name := .name }}
|
||||
{{ $room := index $rooms $name }}
|
||||
{{ with $room }}
|
||||
<div class="schedule-grid schedule-room">
|
||||
<h3 class="schedule-title">{{ $name }}</h3>
|
||||
{{ range $events }}
|
||||
<a class="schedule-event" href="{{ .url }}" style="--start: {{ .start }};--end: {{ .end }}" target="_blank">
|
||||
{{ range . }}
|
||||
{{ $start := add (div ((time .date).Sub $startDate).Minutes $timeslotDuration) 1 }}
|
||||
{{ $duration := 0 }}
|
||||
{{ range split .duration ":" }}
|
||||
{{ $duration = add (mul $duration 60) (int .) }}
|
||||
{{ end }}
|
||||
{{ $end := add $start (div $duration $timeslotDuration) }}
|
||||
<a class="schedule-event" href="{{ .url }}" style="--start: {{ $start }};--end: {{ $end }}" target="_blank">
|
||||
<div class="schedule-event-time">
|
||||
<span>{{ .start_time }}</span>
|
||||
<span>{{ (time .date).Format "15:04" }}</span>
|
||||
<span>–</span>
|
||||
<span>{{ .end_time }}</span>
|
||||
<span>{{ (time (int (add $startDate.Unix (mul (sub $end 1) (mul $timeslotDuration 60))))).Format "15:04" }}</span>
|
||||
</div>
|
||||
<div class="schedule-event-detail">
|
||||
<h4 class="schedule-title" title="{{ .title }}">{{ .title }}</h4>
|
||||
<p class="schedule-speaker" title="{{ .speaker }}">{{ .speaker }}</p>
|
||||
{{ $speaker := delimit (apply .persons "index" "." "public_name") ", " }}
|
||||
<p class="schedule-speaker" title="{{ $speaker }}">{{ $speaker }}</p>
|
||||
</div>
|
||||
</a>
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ end }}
|
||||
</div>
|
||||
|
||||
{{ end }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue