parent
31e8197c79
commit
283a9d0b27
|
@ -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 %}
|
||||
|
||||
|
|
|
@ -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 %}
|
||||
|
|
18
web_view.py
18
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,
|
||||
|
|
Loading…
Reference in a new issue