From 4f7480c48bbbec48f64e1c924995b28fe45d4426 Mon Sep 17 00:00:00 2001 From: Raphael Lehmann Date: Tue, 28 May 2024 17:57:25 +0200 Subject: [PATCH 1/4] Add a Dockerfile that works for Raphael locally --- Dockerfile.pfusch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Dockerfile.pfusch diff --git a/Dockerfile.pfusch b/Dockerfile.pfusch new file mode 100644 index 0000000..8d5a698 --- /dev/null +++ b/Dockerfile.pfusch @@ -0,0 +1,22 @@ +FROM ubuntu:22.04 +LABEL maintainer="Raphael Lehmann " +LABEL description="Jekyll Pfusch image" + +WORKDIR /work + +ADD Gemfile /work + +ENV LANG="en_US.UTF-8" +ENV TZ=Europe/Berlin +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -qq && \ + apt-get upgrade -y -qq && \ + apt-get install -y -qq \ + ruby-full \ + rubygems \ + libffi-dev \ + build-essential && \ + apt-get clean -qq +RUN gem install jekyll bundler +RUN bundle install From a186e148ad8abf05df9b7308eb927b54c9b97237 Mon Sep 17 00:00:00 2001 From: Raphael Lehmann Date: Tue, 28 May 2024 17:43:39 +0200 Subject: [PATCH 2/4] A new attempt to fix the ICS calendar --- static/calendar.ics | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/static/calendar.ics b/static/calendar.ics index e07e308..9bfa250 100644 --- a/static/calendar.ics +++ b/static/calendar.ics @@ -24,22 +24,18 @@ RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 END:STANDARD END:VTIMEZONE {% for termin in site.data.calendar -%} -{% assign start_uhrzeit = termin.uhrzeit | remove: "h" | remove: "." | append: "00" -%} -{% assign start = termin.datum | remove: "-" | append: "T" | append: start_uhrzeit -%} +{% assign start_date = termin.datum | append: " " | append: termin.uhrzeit | remove: "h" | replace: ".", ":" | date: '%s' -%} {% if termin.dauer -%} -{% assign dauer = termin.dauer | times: 100 -%} +{% assign dauer_seconds = termin.dauer | times: 3600 -%} {% else -%} -{% assign dauer = 100 -%} +{% assign dauer_seconds = 3600 -%} {% endif -%} -{% assign end_uhrzeit = termin.uhrzeit | remove: "h" | remove: "." | plus: dauer -%} -{% assign dauer_tage = end_uhrzeit | divided_by: 2400 -%} -{% assign end_uhrzeit = end_uhrzeit | modulo: 2400 -%} -{% assign end = termin.datum | remove: "-" | plus: dauer_tage | append: "T" | append: end_uhrzeit | append: "00" -%} +{% assign end = start_date | plus: dauer_seconds | round | date: '%Y%m%dT%H%M%S' -%} BEGIN:VEVENT -UID:meeting+{{ start }}@techaachen.de +UID:meeting+{{ start_date | date: '%Y%m%dT%H%M%S' }}@techaachen.de SUMMARY:TechAachen - {{ termin.title }} LOCATION:{{ termin.ort }} -DTSTART;TZID=Europe/Berlin:{{ start }} +DTSTART;TZID=Europe/Berlin:{{ start_date | date: '%Y%m%dT%H%M%S' }} DTEND;TZID=Europe/Berlin:{{ end }} DTSTAMP:{{ site.time | date: '%Y%m%dT%H%M%SZ' }} END:VEVENT From 016a5f08981e790094b2bdd3d0e3725e50e6dad3 Mon Sep 17 00:00:00 2001 From: Raphael Lehmann Date: Tue, 28 May 2024 18:04:07 +0200 Subject: [PATCH 3/4] Kalender: Fix TechTurbo entries (across monthly borders) --- _data/calendar.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/_data/calendar.yml b/_data/calendar.yml index 53c2791..f9bdb77 100644 --- a/_data/calendar.yml +++ b/_data/calendar.yml @@ -635,12 +635,7 @@ - title: TechTurbo 2023 datum: "2023-11-30" uhrzeit: "16.00h" - dauer: 8 - ort: "Gruppenunterkunft Auszeit Eifel, Auf der Batterie 9, Schleiden" -- title: TechTurbo 2023 - datum: "2023-12-01" - uhrzeit: "00.00h" - dauer: 62 + dauer: 70 ort: "Gruppenunterkunft Auszeit Eifel, Auf der Batterie 9, Schleiden" - title: Frühstück @@ -825,12 +820,7 @@ - title: TechTurbo 2024 datum: "2024-11-28" uhrzeit: "18.00h" - dauer: 54 - ort: "Gruppenunterkunft Auszeit Eifel, Auf der Batterie 9, Schleiden" -- title: TechTurbo 2024 - datum: "2024-12-01" - uhrzeit: "00.00h" - dauer: 14 + dauer: 68 ort: "Gruppenunterkunft Auszeit Eifel, Auf der Batterie 9, Schleiden" - title: Geschäftsführende Versammlung From 903613838040d10526c4089aa0a479a2fff78a7e Mon Sep 17 00:00:00 2001 From: Raphael Lehmann Date: Tue, 28 May 2024 19:00:25 +0200 Subject: [PATCH 4/4] Ensure unique iCalendar UIDs for events starting at the same time --- static/calendar.ics | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/static/calendar.ics b/static/calendar.ics index 9bfa250..d9d269e 100644 --- a/static/calendar.ics +++ b/static/calendar.ics @@ -23,8 +23,17 @@ DTSTART:19701025T030000 RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 END:STANDARD END:VTIMEZONE +{% assign uids = "" -%} {% for termin in site.data.calendar -%} {% assign start_date = termin.datum | append: " " | append: termin.uhrzeit | remove: "h" | replace: ".", ":" | date: '%s' -%} +{% assign start = start_date | date: '%Y%m%dT%H%M%S' -%} +{% if uids contains start -%} +{% assign uidaddition = termin.ort | url_encode -%} +{% assign uid = start | append: uidaddition -%} +{% else -%} +{% assign uid = start -%} +{% endif -%} +{% assign uids = uids | append: "," | append: uid -%} {% if termin.dauer -%} {% assign dauer_seconds = termin.dauer | times: 3600 -%} {% else -%} @@ -32,10 +41,10 @@ END:VTIMEZONE {% endif -%} {% assign end = start_date | plus: dauer_seconds | round | date: '%Y%m%dT%H%M%S' -%} BEGIN:VEVENT -UID:meeting+{{ start_date | date: '%Y%m%dT%H%M%S' }}@techaachen.de +UID:meeting+{{ uid }}@techaachen.de SUMMARY:TechAachen - {{ termin.title }} LOCATION:{{ termin.ort }} -DTSTART;TZID=Europe/Berlin:{{ start_date | date: '%Y%m%dT%H%M%S' }} +DTSTART;TZID=Europe/Berlin:{{ start }} DTEND;TZID=Europe/Berlin:{{ end }} DTSTAMP:{{ site.time | date: '%Y%m%dT%H%M%SZ' }} END:VEVENT