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

Use get_country for Schengen report

Browse source
This commit is contained in:
Edward Betts 2025-07-15 18:08:55 +02:00
parent f499015466
commit f41930f811
4 changed files with 7 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
agenda/schengen.py
View file

@ -40,47 +40,6 @@ SCHENGEN_COUNTRIES = {
"ch", # Switzerland "ch", # Switzerland
} }
# Country code to emoji flag mapping
COUNTRY_FLAG_MAP = {
"at": "🇦🇹", # Austria
"be": "🇧🇪", # Belgium
"bg": "🇧🇬", # Bulgaria
"hr": "🇭🇷", # Croatia
"cz": "🇨🇿", # Czech Republic
"dk": "🇩🇰", # Denmark
"ee": "🇪🇪", # Estonia
"fi": "🇫🇮", # Finland
"fr": "🇫🇷", # France
"de": "🇩🇪", # Germany
"gr": "🇬🇷", # Greece
"hu": "🇭🇺", # Hungary
"it": "🇮🇹", # Italy
"lv": "🇱🇻", # Latvia
"lt": "🇱🇹", # Lithuania
"lu": "🇱🇺", # Luxembourg
"mt": "🇲🇹", # Malta
"nl": "🇳🇱", # Netherlands
"pl": "🇵🇱", # Poland
"pt": "🇵🇹", # Portugal
"ro": "🇷🇴", # Romania
"sk": "🇸🇰", # Slovakia
"si": "🇸🇮", # Slovenia
"es": "🇪🇸", # Spain
"se": "🇸🇪", # Sweden
"is": "🇮🇸", # Iceland
"li": "🇱🇮", # Liechtenstein
"no": "🇳🇴", # Norway
"ch": "🇨🇭", # Switzerland
}
def get_country_flag(country_code: str) -> str:
"""Get emoji flag for a country code."""
if not country_code or not isinstance(country_code, str):
return ""
return COUNTRY_FLAG_MAP.get(country_code.lower(), "")
def is_schengen_country(country_code: str) -> bool: def is_schengen_country(country_code: str) -> bool:
"""Check if a country is in the Schengen area.""" """Check if a country is in the Schengen area."""
if not country_code or not isinstance(country_code, str): if not country_code or not isinstance(country_code, str):

7
agenda/trip_schengen.py
View file

@ -6,7 +6,7 @@ from datetime import date, timedelta
import flask import flask
from . import trip from . import get_country, trip
from .schengen import calculate_schengen_time, extract_schengen_stays_from_travel from .schengen import calculate_schengen_time, extract_schengen_stays_from_travel
from .types import SchengenCalculation, SchengenStay, StrDict, Trip from .types import SchengenCalculation, SchengenStay, StrDict, Trip
@ -181,7 +181,10 @@ def flask_route_schengen_report() -> str:
trip_list = trip.build_trip_list(data_dir) trip_list = trip.build_trip_list(data_dir)
return flask.render_template( return flask.render_template(
"schengen_report.html", trip_list=trip_list, **dashboard_data "schengen_report.html",
trip_list=trip_list,
get_country=get_country,
**dashboard_data,
) )

3
templates/schengen_report.html
View file

@ -86,7 +86,8 @@
<span class="text-muted">ongoing</span> <span class="text-muted">ongoing</span>
{% endif %} {% endif %}
</td> </td>
<td>{{ stay.country | country_flag }} {{ stay.country.upper() }}</td> {% set country = get_country(stay.country) %}
<td>{{ country.flag }} {{ country.name }}</td>
<td>{{ stay.days }}</td> <td>{{ stay.days }}</td>
<td> <td>
{% if stay.trip_date and stay.trip_name %} {% if stay.trip_date and stay.trip_name %}

7
web_view.py
View file

@ -28,7 +28,6 @@ import agenda.trip
import agenda.trip_schengen import agenda.trip_schengen
import agenda.utils import agenda.utils
from agenda import calendar, format_list_with_ampersand, travel, uk_tz from agenda import calendar, format_list_with_ampersand, travel, uk_tz
from agenda.schengen import get_country_flag
from agenda.types import StrDict, Trip from agenda.types import StrDict, Trip
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -38,12 +37,6 @@ app.config.from_object("config.default")
agenda.error_mail.setup_error_mail(app) agenda.error_mail.setup_error_mail(app)
@app.template_filter("country_flag")
def country_flag_filter(country_code: str) -> str:
"""Convert country code to emoji flag."""
return get_country_flag(country_code)
@app.before_request @app.before_request
def handle_auth() -> None: def handle_auth() -> None:
"""Handle authentication and set global user.""" """Handle authentication and set global user."""