diff --git a/agenda/thespacedevs.py b/agenda/thespacedevs.py index de2857d..01f3933 100644 --- a/agenda/thespacedevs.py +++ b/agenda/thespacedevs.py @@ -81,7 +81,7 @@ def summarize_launch(launch: Launch) -> Summary: return { "name": launch["name"], - "status": launch["status"]["abbrev"], + "status": launch["status"], "t0_date": t0_date, "t0_time": t0_time, "window_start": launch["window_start"], @@ -89,10 +89,13 @@ def summarize_launch(launch: Launch) -> Summary: "launch_provider": launch_provider, "launch_provider_abbrev": launch_provider_abbrev, "launch_provider_type": launch["launch_service_provider"]["type"], - "rocket": launch["rocket"]["configuration"]["name"], - "mission": launch["mission"]["name"] if launch["mission"] else "N/A", + "rocket": launch["rocket"]["configuration"]["full_name"], + "mission": launch["mission"], + "pad_name": launch["pad"]["name"], + "pad_wikipedia_url": launch["pad"]["wiki_url"], "location": launch["pad"]["location"]["name"], "country_code": launch["pad"]["country_code"], + "orbit": launch["mission"]["orbit"], } diff --git a/templates/index.html b/templates/index.html index 91ced63..878042d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -78,26 +78,40 @@

{{ market }}

{% endfor %} -

Rocket launches

+

Space launches

{% for launch in rockets %} - - - + - + ({{ launch.launch_provider_type }}) + — + {{ launch.orbit.name }} ({{ launch.orbit.abbrev }}) +
+ {{ launch.pad_name }} + — {{ launch.location }}
+ + {% for line in launch.mission.description.splitlines() %} +

{{ line }}

+ {% endfor %} + + + {% endfor %} -
{{ launch.t0_date }} {% if launch.t0_time %}
{{ launch.t0_time }}{% endif %}
{{ launch.status }}{{ launch.rocket }}
{{launch.mission }}
+ {{ launch.status.abbrev }}{{ launch.rocket }} + — + {{launch.mission.name }} + — + {% if launch.launch_provider_abbrev %} {{ launch.launch_provider_abbrev }} {% else %} {{ launch.launch_provider }} {% endif %} - ({{ launch.launch_provider_type }}){{ launch.location }}
+