Show flight prices on individual trip pages

Closes: #153

agenda/trip.py

@@ -107,12 +107,12 @@ def load_flight_bookings(data_dir: str) -> list[StrDict]:
     return bookings
 
 
-def load_flights(data_dir: str) -> list[StrDict]:
+def load_flights(flight_bookings: list[StrDict]) -> list[StrDict]:
     """Load flights."""
     flights = []
-    for booking in load_flight_bookings(data_dir):
+    for booking in flight_bookings:
         for flight in booking["flights"]:
-            for f in "type", "trip", "booking_reference":
+            for f in "type", "trip", "booking_reference", "price", "currency":
                 if f in booking:
                     flight[f] = booking[f]
             flights.append(flight)
@@ -133,14 +133,17 @@ def build_trip_list(
 
     yaml_trip_lookup = {item["trip"]: item for item in yaml_trip_list}
 
+    flight_bookings = load_flight_bookings(data_dir)
+
     travel_items = sorted(
-        load_flights(data_dir)
+        load_flights(flight_bookings)
         + load_trains(data_dir, route_distances=route_distances)
         + load_ferries(data_dir, route_distances=route_distances),
         key=depart_datetime,
     )
 
     data = {
+        "flight_bookings": flight_bookings,
         "travel": travel_items,
         "accommodation": travel.parse_yaml("accommodation", data_dir),
         "conferences": travel.parse_yaml("conferences", data_dir),

agenda/types.py

@@ -77,6 +77,7 @@ class Trip:
     accommodation: list[StrDict] = field(default_factory=list)
     conferences: list[StrDict] = field(default_factory=list)
     events: list[StrDict] = field(default_factory=list)
+    flight_bookings: list[StrDict] = field(default_factory=list)
     name: str | None = None
     private: bool = False
 
@@ -207,6 +208,11 @@ class Trip:
             else None
         )
 
+    @property
+    def flights(self) -> list[StrDict]:
+        """Flights."""
+        return [item for item in self.travel if item["type"] == "flight"]
+
     def distances_by_transport_type(self) -> list[tuple[str, float]]:
         """Calculate the total distance travelled for each type of transport.