From 283a9d0b27607caf0af49e918ba76ae548d920fe Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 14 Jan 2024 17:57:02 +0000
Subject: [PATCH] Link from accommodation list to trip pages

Closes: #109
---
 templates/accommodation.html   |  9 ++++++---
 templates/conference_list.html |  4 +++-
 web_view.py                    | 18 +++++++++++++++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/templates/accommodation.html b/templates/accommodation.html
index 5d85bc4..d2df5e6 100644
--- a/templates/accommodation.html
+++ b/templates/accommodation.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
-{% from "macros.html" import accommodation_row with context %}
+{% from "macros.html" import trip_link, accommodation_row with context %}
 {% block style %}
-{% set column_count = 7 %}
+{% set column_count = 8 %}
 <style>
 .grid-container {
   display: grid;
@@ -23,7 +23,10 @@
 {% macro section(heading, item_list, badge) %}
 {% if item_list %}
 <div class="heading"><h2>{{heading}}</h2></div>
-{% for item in item_list %}{{ accommodation_row(item, badge) }}{% endfor %}
+{% for item in item_list %}
+  {{ accommodation_row(item, badge) }}
+  <div class="grid-item">{% if item.linked_trip %} trip: {{ trip_link(item.linked_trip) }} {% endif %}</div>
+{% endfor %}
 {% endif %}
 {% endmacro %}
 
diff --git a/templates/conference_list.html b/templates/conference_list.html
index 93d8a17..6c66c3b 100644
--- a/templates/conference_list.html
+++ b/templates/conference_list.html
@@ -27,7 +27,9 @@
     <div class="heading"><h2>{{ heading }}</h2></div>
     {% for item in item_list %}
       {{ conference_row(item, badge) }}
-      <div class="grid-item">{% if item.trip %} trip: {{ trip_link(item.trip) }} {% endif %}</div>
+      <div class="grid-item">
+        {% if item.linked_trip %} trip: {{ trip_link(item.linked_trip) }} {% endif %}
+      </div>
     {% endfor %}
   {% endif %}
 {% endmacro %}
diff --git a/web_view.py b/web_view.py
index 4dd78e1..fa0594c 100755
--- a/web_view.py
+++ b/web_view.py
@@ -104,9 +104,9 @@ def conference_list() -> str:
     filepath = os.path.join(data_dir, "conferences.yaml")
     item_list = yaml.safe_load(open(filepath))
     today = date.today()
-    trip_list = agenda.trip.build_trip_list()
+
     conference_trip_lookup = {}
-    for trip in trip_list:
+    for trip in agenda.trip.build_trip_list():
         for trip_conf in trip.conferences:
             key = (trip_conf["start"], trip_conf["name"])
             conference_trip_lookup[key] = trip
@@ -117,7 +117,7 @@ def conference_list() -> str:
 
         key = (conf["start"], conf["name"])
         if this_trip := conference_trip_lookup.get(key):
-            conf["trip"] = this_trip
+            conf["linked_trip"] = this_trip
 
     item_list.sort(key=operator.itemgetter("start_date"))
 
@@ -157,6 +157,18 @@ def accommodation_list() -> str:
         if stay["country"] != "gb"
     )
 
+    trip_lookup = {}
+
+    for trip in agenda.trip.build_trip_list():
+        for trip_stay in trip.accommodation:
+            key = (trip_stay["from"], trip_stay["name"])
+            trip_lookup[key] = trip
+
+    for item in items:
+        key = (item["from"], item["name"])
+        if this_trip := trip_lookup.get(key):
+            item["linked_trip"] = this_trip
+
     return flask.render_template(
         "accommodation.html",
         items=items,