From c1e9993c27bed30e27788aead5631ea5f75b9ab7 Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Thu, 11 May 2023 14:58:54 -0400 Subject: [PATCH] Add option to have actions in a milestone in mission UI --- include/openspace/mission/mission.h | 1 + modules/server/src/topics/missiontopic.cpp | 3 +++ src/mission/mission.cpp | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h index 6ea8adf84c..2e4263cf07 100644 --- a/include/openspace/mission/mission.h +++ b/include/openspace/mission/mission.h @@ -43,6 +43,7 @@ struct Milestone { std::optional description; std::optional image; std::optional link; + std::optional> actions; }; /** diff --git a/modules/server/src/topics/missiontopic.cpp b/modules/server/src/topics/missiontopic.cpp index bed874ffe6..2e1702b696 100644 --- a/modules/server/src/topics/missiontopic.cpp +++ b/modules/server/src/topics/missiontopic.cpp @@ -89,6 +89,9 @@ nlohmann::json MissionTopic::createPhaseJson(const MissionPhase& phase) const { if (date.link.has_value()) { jsonDate["link"] = *date.link; } + if (date.actions.has_value()) { + jsonDate["actions"] = *date.actions; + } milestones.push_back(std::move(jsonDate)); } diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp index e92ddcfa54..e00fb49f42 100644 --- a/src/mission/mission.cpp +++ b/src/mission/mission.cpp @@ -70,6 +70,7 @@ namespace { std::optional description; std::optional image; std::optional link; + std::optional> actions; }; std::optional> milestones; }; @@ -171,6 +172,9 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) { } if (milestone.link.has_value()) { newDate.link = milestone.link.value(); + } + if (milestone.actions.has_value()) { + newDate.actions = milestone.actions.value(); } _milestones.emplace_back(newDate); }