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

Show end times for travel

Browse source
This commit is contained in:
Edward Betts 2024-05-27 10:57:46 +02:00
parent 38f2e10c6d
commit 75242c2952
3 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
agenda/types.py
View file

@ -38,10 +38,13 @@ def as_datetime(d: DateOrDateTime) -> datetime.datetime:
class TripElement:
"""Trip element."""
when: DateOrDateTime
start_time: DateOrDateTime
title: str
element_type: str
detail: StrDict
end_time: DateOrDateTime | None = None
start_loc: str | None = None
end_loc: str | None = None
def get_emoji(self) -> str | None:
"""Emoji for trip element."""
@ -207,7 +210,7 @@ class Trip:
for item in self.accommodation:
title = "Airbnb" if item.get("operator") == "airbnb" else item["name"]
start = TripElement(
when=item["from"],
start_time=item["from"],
title=title,
detail=item,
element_type="check-in",
@ -216,7 +219,7 @@ class Trip:
elements.append(start)
end = TripElement(
when=item["to"],
start_time=item["to"],
title=title,
detail=item,
element_type="check-out",
@ -233,10 +236,13 @@ class Trip:
elements.append(
TripElement(
when=item["depart"],
start_time=item["depart"],
end_time=item.get("arrive"),
title=name,
detail=item,
element_type="flight",
start_loc=airport_label(item["from_airport"]),
end_loc=airport_label(item["to_airport"]),
)
)
if item["type"] == "train":
@ -250,10 +256,13 @@ class Trip:
name = f"{leg['from']} {from_flag} → {leg['to']} {to_flag}"
elements.append(
TripElement(
when=leg["depart"],
start_time=leg["depart"],
end_time=leg["arrive"],
title=name,
detail=leg,
element_type="train",
start_loc=f"{leg['from']} {from_flag}",
end_loc=f"{leg['to']} {to_flag}",
)
)
if item["type"] == "ferry":
@ -267,14 +276,17 @@ class Trip:
name = f"{item['from']} {from_flag} → {item['to']} {to_flag}"
elements.append(
TripElement(
when=item["depart"],
start_time=item["depart"],
end_time=item["arrive"],
title=name,
detail=item,
element_type="ferry",
start_loc=f"{item['from']} {from_flag}",
end_loc=f"{item['to']} {to_flag}",
)
)
return sorted(elements, key=lambda e: as_datetime(e.when))
return sorted(elements, key=lambda e: as_datetime(e.start_time))
def elements_grouped_by_day(self) -> list[tuple[datetime.date, list[TripElement]]]:
"""Group trip elements by day."""
@ -285,7 +297,7 @@ class Trip:
for element in self.elements():
# Extract the date part of the 'when' attribute
day = as_date(element.when)
day = as_date(element.start_time)
grouped_elements[day].append(element)
# Sort elements within each day
@ -294,7 +306,7 @@ class Trip:
key=lambda e: (
e.element_type == "check-in", # check-out elements last
e.element_type != "check-out", # check-in elements first
as_datetime(e.when), # then sort by time
as_datetime(e.start_time), # then sort by time
)
)