edward/agenda
1
0
Fork 0
Code Issues 18 Pull requests Projects Releases Packages Wiki Activity

Split up trips page and sort like conference page

Browse source 
Closes: #94
This commit is contained in:
Edward Betts 2024-01-06 09:17:34 +00:00
parent 21b67bdc64
commit fd6d3b674b
2 changed files with 64 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
templates/trips.html
View file

@ -2,6 +2,8 @@
{% from "macros.html" import display_date_no_year, conference_row, accommodation_row, flight_row, train_row with context %}
{% set row = { "flight": flight_row, "train": train_row } %}
{% block style %}
{% set conference_column_count = 6 %}
{% set accommodation_column_count = 7 %}
@ -34,42 +36,50 @@
</style>
{% endblock %}
{% macro section(heading, item_list, badge) %}
{% if item_list %}
<div class="heading"><h2>{{ heading }}</h2></div>
{% for trip in item_list %}
{% set end = trip.end %}
<div class="border border-2 rounded mb-2 p-2">
<h3>{{ trip.title }} <small class="text-muted">({{ trip.start.strftime("%b %Y") }})</small></h3>
<div>Countries: {{ trip.countries_str }}</div>
{% if end %}
<div>Dates: {{ display_date_no_year(trip.start) }} to {{ display_date_no_year(end) }}</div>
{% else %}
<div>Start: {{ display_date_no_year(trip.start) }} (end date missing)</div>
{% endif %}
<div class="conferences">
{% for conf in trip.conferences %}
{{ conference_row(conf, "going") }}
{% endfor %}
</div>
<div class="accommodation">
{% for conf in trip.accommodation %}
{{ accommodation_row(conf, "going") }}
{% endfor %}
</div>
<div class="travel">
{% for item in trip.travel %}
{{ row[item.type](item) }}
{% endfor %}
</div>
</div>
{% endfor %}
{% endif %}
{% endmacro %}
{% block content %}
<div class="p-2">
{% set row = { "flight": flight_row, "train": train_row } %}
<h1>Trips</h1>
{% for trip in trips %}
{% set end = trip.end %}
<div class="border border-2 rounded mb-2 p-2">
<h3>{{ trip.title }} <small class="text-muted">({{ trip.start.strftime("%b %Y") }})</small></h3>
<div>Countries: {{ trip.countries_str }}</div>
{% if end %}
<div>Dates: {{ display_date_no_year(trip.start) }} to {{ display_date_no_year(end) }}</div>
{% else %}
<div>Start: {{ display_date_no_year(trip.start) }} (end date missing)</div>
{% endif %}
<div class="conferences">
{% for conf in trip.conferences %}
{{ conference_row(conf, "going") }}
{% endfor %}
</div>
<div class="accommodation">
{% for conf in trip.accommodation %}
{{ accommodation_row(conf, "going") }}
{% endfor %}
</div>
<div class="travel">
{% for item in trip.travel %}
{{ row[item.type](item) }}
{% endfor %}
</div>
</div>
{% endfor %}
{{ section("Current", current, "attending") }}
{{ section("Future", future, "going") }}
{{ section("Past", past|reverse, "went") }}
</div>
{% endblock %}