From e2afe0ffa455b4c37bfb7cb9022b65b44b9cceee Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Wed, 17 Apr 2024 11:40:13 +0100
Subject: [PATCH] Show prices for logged in users

Trip prices are visible on trip list, accommodation list,
conference list and travel list.

Prices are hidden if not logged in, except conference prices.

Still need to show prices on individual trip page.
---
 agenda/trip.py                 | 11 +++++++++++
 templates/accommodation.html   |  2 +-
 templates/conference_list.html |  2 +-
 templates/macros.html          | 20 ++++++++++++++++++++
 templates/travel.html          |  8 ++++++--
 templates/trip_list.html       |  6 +++---
 web_view.py                    | 11 +++++++++++
 7 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/agenda/trip.py b/agenda/trip.py
index 837deb4..a5f3537 100644
--- a/agenda/trip.py
+++ b/agenda/trip.py
@@ -1,5 +1,6 @@
 """Trips."""
 
+import decimal
 import os
 import typing
 from datetime import date, datetime, time
@@ -100,6 +101,11 @@ def build_trip_list(
         key=depart_datetime,
     )
 
+    for item in travel_items:
+        price = item.get("price")
+        if price:
+            item["price"] = decimal.Decimal(price)
+
     data = {
         "travel": travel_items,
         "accommodation": travel.parse_yaml("accommodation", data_dir),
@@ -107,6 +113,11 @@ def build_trip_list(
         "events": travel.parse_yaml("events", data_dir),
     }
 
+    for item in data["accommodation"]:
+        price = item.get("price")
+        if price:
+            item["price"] = decimal.Decimal(price)
+
     for key, item_list in data.items():
         assert isinstance(item_list, list)
         for item in item_list:
diff --git a/templates/accommodation.html b/templates/accommodation.html
index cd65dea..1df44fa 100644
--- a/templates/accommodation.html
+++ b/templates/accommodation.html
@@ -2,7 +2,7 @@
 {% from "macros.html" import trip_link, accommodation_row with context %}
 {% block title %}Accommodation - Edward Betts{% endblock %}
 {% block style %}
-{% set column_count = 8 %}
+{% set column_count = 9 %}
 <style>
 .grid-container {
   display: grid;
diff --git a/templates/conference_list.html b/templates/conference_list.html
index fe11ef0..b46376e 100644
--- a/templates/conference_list.html
+++ b/templates/conference_list.html
@@ -5,7 +5,7 @@
 {% block title %}Conferences - Edward Betts{% endblock %}
 
 {% block style %}
-{% set column_count = 8 %}
+{% set column_count = 9 %}
 <style>
 .grid-container {
   display: grid;
diff --git a/templates/macros.html b/templates/macros.html
index 3cbdec6..3d834cf 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -29,6 +29,11 @@
       <span class="badge text-bg-success">transport</span>
     {% endif %}
   </div>
+  <div class="grid-item text-end">
+    {% if item.price and item.currency %}
+      <span class="badge bg-info text-nowrap">{{ "{:,d}".format(item.price | int) }} {{ item.currency }}</span>
+    {% endif %}
+  </div>
   <div class="grid-item">{{ item.topic }}</div>
   <div class="grid-item">{{ item.location }}</div>
   <div class="grid-item text-end">{{ display_date(item.cfp_end) if item.cfp_end else "" }}</div>
@@ -70,6 +75,11 @@
       {{ item.name }}
     {% endif %}
   </div>
+  <div class="grid-item text-end">
+    {% if g.user.is_authenticated and item.price and item.currency %}
+      <span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
+    {% endif %}
+  </div>
 {% endmacro %}
 
 {% macro flight_row(item) %}
@@ -103,6 +113,11 @@
       {{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
     {% endif %}
   </div>
+  <div class="grid-item text-end">
+    {% if g.user.is_authenticated and item.price and item.currency %}
+      <span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
+    {% endif %}
+  </div>
 {% endmacro %}
 
 {% macro train_row(item) %}
@@ -141,4 +156,9 @@
       {{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
     {% endif %}
   </div>
+  <div class="grid-item text-end">
+    {% if g.user.is_authenticated and item.price and item.currency %}
+      <span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
+    {% endif %}
+  </div>
 {% endmacro %}
diff --git a/templates/travel.html b/templates/travel.html
index eedf89d..3772d0e 100644
--- a/templates/travel.html
+++ b/templates/travel.html
@@ -3,18 +3,20 @@
 
 {% block title %}Travel - Edward Betts{% endblock %}
 
+{% set column_count = 10 %}
+
 {% block style %}
 <style>
 .grid-container {
   display: grid;
-  grid-template-columns: repeat(9, auto);
+  grid-template-columns: repeat({{ column_count }}, auto);
   gap: 10px;
   justify-content: start;
 }
 
 .train-grid-container {
   display: grid;
-  grid-template-columns: repeat(9, auto);
+  grid-template-columns: repeat({{ column_count }}, auto);
   gap: 10px;
   justify-content: start;
 }
@@ -43,6 +45,7 @@
       <div class="grid-item">reference</div>
       <div class="grid-item">tracking</div>
       <div class="grid-item"></div>
+      <div class="grid-item"></div>
 
     {% for item in flights | sort(attribute="depart") %}
       {{ flight_row(item) }}
@@ -61,6 +64,7 @@
       <div class="grid-item">reference</div>
       <div class="grid-item"></div>
       <div class="grid-item"></div>
+      <div class="grid-item"></div>
 
     {% for item in trains | sort(attribute="depart") %}
       {{ train_row(item) }}
diff --git a/templates/trip_list.html b/templates/trip_list.html
index 8f5e868..1304c51 100644
--- a/templates/trip_list.html
+++ b/templates/trip_list.html
@@ -10,9 +10,9 @@
 
  <link rel="stylesheet" href="{{ url_for("static", filename="leaflet/leaflet.css") }}">
 
-{% set conference_column_count = 7 %}
-{% set accommodation_column_count = 7 %}
-{% set travel_column_count = 9 %}
+{% set conference_column_count = 8 %}
+{% set accommodation_column_count = 8 %}
+{% set travel_column_count = 10 %}
 <style>
 .conferences {
   display: grid;
diff --git a/web_view.py b/web_view.py
index 90e9aaf..fd61549 100755
--- a/web_view.py
+++ b/web_view.py
@@ -2,6 +2,7 @@
 
 """Web page to show upcoming events."""
 
+import decimal
 import inspect
 import operator
 import os.path
@@ -125,6 +126,12 @@ def travel_list() -> str:
         if all("distance" in leg for leg in train["legs"]):
             train["distance"] = sum(leg["distance"] for leg in train["legs"])
 
+    for travel_type in flights, trains:
+        for item in travel_type:
+            price = item.get("price")
+            if price:
+                item["price"] = decimal.Decimal(price)
+
     return flask.render_template("travel.html", flights=flights, trains=trains)
 
 
@@ -180,6 +187,10 @@ def accommodation_list() -> str:
     """Page showing a list of past, present and future accommodation."""
     data_dir = app.config["PERSONAL_DATA"]
     items = travel.parse_yaml("accommodation", data_dir)
+    for item in items:
+        price = item.get("price")
+        if price:
+            item["price"] = decimal.Decimal(price)
 
     stays_in_2024 = [item for item in items if item["from"].year == 2024]
     total_nights_2024 = sum(