From 31e8197c791828452b9adc2e124167bfcf61f01a Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 14 Jan 2024 17:23:50 +0000
Subject: [PATCH] Link from conference list to trip pages

---
 templates/conference_list.html |  9 ++++++---
 templates/trip_list.html       |  4 ++--
 web_view.py                    | 11 +++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/templates/conference_list.html b/templates/conference_list.html
index 3465f01..93d8a17 100644
--- a/templates/conference_list.html
+++ b/templates/conference_list.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
-{% from "macros.html" import conference_row with context %}
+{% from "macros.html" import trip_link, conference_row with context %}
 
 {% block style %}
-{% set column_count = 6 %}
+{% set column_count = 7 %}
 <style>
 .grid-container {
   display: grid;
@@ -25,7 +25,10 @@
 {% macro section(heading, item_list, badge) %}
   {% if item_list %}
     <div class="heading"><h2>{{ heading }}</h2></div>
-    {% for item in item_list %}{{ conference_row(item, badge) }}{% endfor %}
+    {% for item in item_list %}
+      {{ conference_row(item, badge) }}
+      <div class="grid-item">{% if item.trip %} trip: {{ trip_link(item.trip) }} {% endif %}</div>
+    {% endfor %}
   {% endif %}
 {% endmacro %}
 
diff --git a/templates/trip_list.html b/templates/trip_list.html
index 9c059c1..a43384a 100644
--- a/templates/trip_list.html
+++ b/templates/trip_list.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% from "macros.html" import display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row with context %}
+{% from "macros.html" import trip_link, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row with context %}
 
 {% set row = { "flight": flight_row, "train": train_row } %}
 
@@ -57,7 +57,7 @@
       {% set end = trip.end %}
       <div class="border border-2 rounded mb-2 p-2">
         <h3>
-        <a href="{{ url_for("trip_page", start=trip.start.isoformat()) }}">{{ trip.title }}</a>
+        {{ trip_link(trip) }}
         <small class="text-muted">({{ display_date(trip.start) }})</small></h3>
         <div>Countries: {{ trip.countries_str }}</div>
         {% if end %}
diff --git a/web_view.py b/web_view.py
index 0c57977..4dd78e1 100755
--- a/web_view.py
+++ b/web_view.py
@@ -104,10 +104,21 @@ 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_conf in trip.conferences:
+            key = (trip_conf["start"], trip_conf["name"])
+            conference_trip_lookup[key] = trip
+
     for conf in item_list:
         conf["start_date"] = as_date(conf["start"])
         conf["end_date"] = as_date(conf["end"])
 
+        key = (conf["start"], conf["name"])
+        if this_trip := conference_trip_lookup.get(key):
+            conf["trip"] = this_trip
+
     item_list.sort(key=operator.itemgetter("start_date"))
 
     current = [