From 7f3d26ca9984a7aa70aff53ce127594c37c61363 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Mon, 26 Jun 2023 09:51:18 +0200
Subject: [PATCH] Toevoegen extra velden en type Event toegevoegd aan kalender

---
 .../kalender/2023-05-11-nluug-voorjaar.yaml   |  2 +
 .../kalender/2023-05-20-hcc-opensource.yaml   |  3 +-
 data/evenementen/kalender/2023-05-20-lef.yaml |  3 +-
 .../kalender/2023-06-10-hcc-opensource.yaml   |  3 +-
 .../2023-06-21-devopsdays-amsterdam.yaml      |  3 +-
 .../kalender/2023-09-16-hcc-opensource.yaml   |  4 +-
 .../kalender/2023-11-28-nluug-najaar.yaml     |  5 ++
 .../kalender/2024-02-09-hackerhotel.yaml      |  7 ++-
 themes/nluug/layouts/calendar/single.html     | 48 +++++++++++++++++++
 9 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/data/evenementen/kalender/2023-05-11-nluug-voorjaar.yaml b/data/evenementen/kalender/2023-05-11-nluug-voorjaar.yaml
index b64653d..d906b06 100644
--- a/data/evenementen/kalender/2023-05-11-nluug-voorjaar.yaml
+++ b/data/evenementen/kalender/2023-05-11-nluug-voorjaar.yaml
@@ -6,3 +6,5 @@ event_start: 2023-05-11T09:00:00+0200
 event_end: 2023-05-11T17:00:00+0200
 name: NLUUG voorjaarsconferentie 2023
 nluug_event: true
+event_organizer: NLUUG
+event_organizer_url: https://nluug.nl/
diff --git a/data/evenementen/kalender/2023-05-20-hcc-opensource.yaml b/data/evenementen/kalender/2023-05-20-hcc-opensource.yaml
index 8191f50..93454db 100644
--- a/data/evenementen/kalender/2023-05-20-hcc-opensource.yaml
+++ b/data/evenementen/kalender/2023-05-20-hcc-opensource.yaml
@@ -13,4 +13,5 @@ event_timezone: Europe/Amsterdam
 event_location: Cultuur- & Vergadercentrum H.F. Witte
 link_external: https://opensource.hcc.nl/rss-events/evenement/8-reguliere-opensource-bijeenkomst
 name: Reguliere opensource bijeenkomst
-organizer: HCC!opensource
+event_organizer: HCC!opensource
+event_organizer_url: https://opensource.hcc.nl/
diff --git a/data/evenementen/kalender/2023-05-20-lef.yaml b/data/evenementen/kalender/2023-05-20-lef.yaml
index 347f40b..4e76f93 100644
--- a/data/evenementen/kalender/2023-05-20-lef.yaml
+++ b/data/evenementen/kalender/2023-05-20-lef.yaml
@@ -13,4 +13,5 @@ event_timezone: Europe/Amsterdam
 event_location: Bibliotheek LocHal Tilburg
 link_external: https://linuxeducatie.nl/index.php/lochal-open-source-event/
 name: LocHal Open Source Event
-organizer: Linux Education Foundation
+event_organizer: Linux Education Foundation
+event_organizer_url: https://linuxeducatie.nl/
diff --git a/data/evenementen/kalender/2023-06-10-hcc-opensource.yaml b/data/evenementen/kalender/2023-06-10-hcc-opensource.yaml
index 978a3a0..9b0b05c 100644
--- a/data/evenementen/kalender/2023-06-10-hcc-opensource.yaml
+++ b/data/evenementen/kalender/2023-06-10-hcc-opensource.yaml
@@ -13,4 +13,5 @@ event_timezone: Europe/Amsterdam
 event_location: Cultuur- & Vergadercentrum H.F. Witte
 link_external: https://opensource.hcc.nl/rss-events/evenement/14-reguliere-opensource-bijeenkomst
 name: Reguliere opensource bijeenkomst
-organizer: HCC!opensource
+event_organizer: HCC!opensource
+event_organizer_url: https://opensource.hcc.nl/
diff --git a/data/evenementen/kalender/2023-06-21-devopsdays-amsterdam.yaml b/data/evenementen/kalender/2023-06-21-devopsdays-amsterdam.yaml
index d311b5c..fd9cca7 100644
--- a/data/evenementen/kalender/2023-06-21-devopsdays-amsterdam.yaml
+++ b/data/evenementen/kalender/2023-06-21-devopsdays-amsterdam.yaml
@@ -13,4 +13,5 @@ event_timezone: Europe/Amsterdam
 event_location: Pakhuis de Zwijger - Amsterdam
 link_external: https://devopsdays.org/events/2023-amsterdam/welcome/
 name: Devopsdays Amsterdam
-organizer: devopsdays
+event_organizer: HCC!opensource
+event_organizer_url: https://devopsdays.org/
diff --git a/data/evenementen/kalender/2023-09-16-hcc-opensource.yaml b/data/evenementen/kalender/2023-09-16-hcc-opensource.yaml
index e6d63c5..9281d09 100644
--- a/data/evenementen/kalender/2023-09-16-hcc-opensource.yaml
+++ b/data/evenementen/kalender/2023-09-16-hcc-opensource.yaml
@@ -11,6 +11,8 @@ event_start: 2023-09-16T12:00:00+0200
 event_end: 2023-09-16T16:30:00+0200
 event_timezone: Europe/Amsterdam
 event_location: Cultuur- & Vergadercentrum H.F. Witte
+event_attendance_mode: offline
 link_external: https://opensource.hcc.nl/rss-events/evenement/14-reguliere-opensource-bijeenkomst
 name: Reguliere opensource bijeenkomst
-organizer: HCC!opensource
+event_organizer: HCC!opensource
+event_organizer_url: https://opensource.hcc.nl/
diff --git a/data/evenementen/kalender/2023-11-28-nluug-najaar.yaml b/data/evenementen/kalender/2023-11-28-nluug-najaar.yaml
index a49293a..37b83de 100644
--- a/data/evenementen/kalender/2023-11-28-nluug-najaar.yaml
+++ b/data/evenementen/kalender/2023-11-28-nluug-najaar.yaml
@@ -8,6 +8,11 @@ event_address:
   country: NL
 event_start: 2023-11-28T08:30:00+0200
 event_end: 2023-11-28T18:00:00+0200
+event_attendance_mode: offline
+event_free_access: false
+event_is_online: false
+event_organizer: NLUUG
+event_organizer_url: https://nluug.nl/
 event_url: "/evenementen/nluug/najaarsconferentie-2023/"
 event_location: Van der Valk Hotel Utrecht
 event_timezone: Europe/Amsterdam
diff --git a/data/evenementen/kalender/2024-02-09-hackerhotel.yaml b/data/evenementen/kalender/2024-02-09-hackerhotel.yaml
index 5fda8db..9e9d138 100644
--- a/data/evenementen/kalender/2024-02-09-hackerhotel.yaml
+++ b/data/evenementen/kalender/2024-02-09-hackerhotel.yaml
@@ -6,11 +6,14 @@ event_address:
   postal_code: 3886 MJ
   city: Garderen
   country: NL
-event_timezone: Europe/Amsterdam
 event_start: 2024-02-09T00:00:00+0200
 event_end: 2024-02-11T23:59:59+0200
 event_timezone: Europe/Amsterdam
+event_attendance_mode: offline
 event_location: Westcord Hotel De Veluwe
 link_external: https://hackerhotel.nl/
 name: Hackerhotel 2024
-organizer: Stichting Connected Freedom
+event_organizer: Stichting Connected Freedom
+event_organizer_url: https://hackerhotel.nl/
+event_free_access: false
+event_is_online: false
diff --git a/themes/nluug/layouts/calendar/single.html b/themes/nluug/layouts/calendar/single.html
index bd58f60..75af551 100644
--- a/themes/nluug/layouts/calendar/single.html
+++ b/themes/nluug/layouts/calendar/single.html
@@ -8,6 +8,7 @@
     <div id="{{ anchorize (.date_start | dateFormat "2006-01-02") }}-{{ anchorize .name }}" style="border: 1px solid darkgray; border-radius: 2px; padding:10px; margin:2px;">
       <h3>{{ .date_start | dateFormat "02-01-2006" }} - {{ .name }}</h3>
       {{ with .organizer }}<p><em>Georganiseerd door {{ .}}</em></p>{{ end }}
+      {{ with .event_organizer }}<p><em>Georganiseerd door {{ .}}</em></p>{{ end }}
       {{ if ne .date_start .date_end }}
       <p>Event van meerdere dagen: <time class="g time" datetime="{{ dateFormat "2006-01-02" .date_start }}">{{ .date_start | dateFormat "02-01-2006" }}</time> t/m <time class="g time" datetime="{{ dateFormat "2006-01-02" .date_end }}">{{ .date_end | dateFormat "02-01-2006" }}</time></p>
       {{ end }}
@@ -21,5 +22,52 @@
       <p>&raquo; <a href="{{ . }}" rel="nofollow">Meer informatie (externe link)</a></p>
       {{ end }}
       </div>
+
+        <script type="application/ld+json">
+            {
+                "@context": "https://schema.org",
+                "@type": "Event",
+                "name": "{{ .name }}",
+                "startDate": "{{ .date_start | dateFormat "02-01-2006" }}",
+                "endDate": "{{ .date_end | dateFormat "02-01-2006" }}",
+                "eventAttendanceMode": "https://schema.org/{{ if .event_attendance_mode }}{{ .event_attendance_mode | strings.FirstUpper }}{{ else }}Offline{{ end }}EventAttendanceMode",
+                "eventStatus": "https://schema.org/EventScheduled",
+                {{ with .event_address }}
+                "location": {
+                    "@type": "Place",
+                    "address": {
+                        "@type": "PostalAddress",
+                        {{ with .city }}"addressLocality": "{{ . }}",{{ end }}
+                        {{ with .street_address }}"streetAddress": "{{ . }}",{{ end }}
+                        {{ with .postal_code }}"postalCode": "{{ . }}",{{ end }}
+                        "addressCountry": "{{ if .country }}{{ .country }}{{ else }}The Netherlands{{ end }}"
+                    }
+                },
+                {{ end }}
+                {{ with .event_image }}
+                "image": [
+                    "{{ .url }}"
+                ],
+                {{ end }}
+                "description": "{{ if .event_description }}{{ .event_description }}{{ else }}{{ default .name }}{{ with .event_location}} @ {{ . }}{{ end }}{{ end }}",
+                {{ if .event_organizer }}
+                "performer": {
+                    "@type": "Organization",
+                    "name": "{{ .event_organizer }}"
+                },
+                "organizer": {
+                    "@type": "Organization",
+                    "name": "{{ .event_organizer }}",
+                    "url": "{{ .event_organizer_url }}"
+                },
+                {{ end }}
+                {{ if .event_url }}
+                    "url": "{{ .event_url }}",
+                {{ else if .link_external }}
+                    "url": "{{ .link_external }}",
+                {{ end }}
+                "isAccessibleForFree": {{ if .event_free_access }}true{{ else }}false{{ end }}
+            }
+        </script>
     {{ end }}
 {{ end }}