diff --git a/agenda/data.py b/agenda/data.py index 849b205..32c56f7 100644 --- a/agenda/data.py +++ b/agenda/data.py @@ -265,20 +265,14 @@ async def get_data(now: datetime) -> typing.Mapping[str, str | object]: events += domains.renewal_dates(my_data) for launch in rockets: - dt = None - - if launch["net_precision"] == "Day": - dt = datetime.strptime(launch["net"], "%Y-%m-%dT00:00:00Z").date() - elif launch["t0_time"]: - dt = pytz.utc.localize( - datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ") - ) - - if not dt: + if not launch["t0_time"]: continue - - rocket_name = f'🚀{launch["rocket"]}: {launch["mission"]["name"]}' - e = Event(name="rocket", date=dt, title=rocket_name) + dt = pytz.utc.localize(datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ")) + e = Event( + name="rocket", + date=dt, + title=f'🚀{launch["rocket"]}: {launch["mission"]["name"]}', + ) events.append(e) events.sort(key=operator.attrgetter("as_datetime")) diff --git a/templates/index.html b/templates/index.html index 6911ab2..7e700df 100644 --- a/templates/index.html +++ b/templates/index.html @@ -193,11 +193,7 @@ — {{ launch.orbit.name }} ({{ launch.orbit.abbrev }})
- {% if launch.pad_wikipedia_url %} - {{ launch.pad_name }} - {% else %} - {{ launch.pad_name }} {% if launch.pad_name != "Unknown Pad" %}(no Wikipedia article){% endif %} - {% endif %} + {{ launch.pad_name }} — {{ launch.location }}
{% for line in launch.mission.description.splitlines() %}