From 3970948c7c83ea0c046c5c0bcf8cb35f0b35ccad Mon Sep 17 00:00:00 2001 From: Allan England Date: Wed, 23 Oct 2024 12:13:59 +0100 Subject: [PATCH 1/2] Add observatory into ProposalCycleDates --- .../org/orph2020/pst/common/json/ProposalCycleDates.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java b/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java index 30442fc..0fffde9 100644 --- a/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java +++ b/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java @@ -1,5 +1,7 @@ package org.orph2020.pst.common.json; +import org.ivoa.dm.proposal.prop.Observatory; + import java.util.Date; public class ProposalCycleDates { @@ -7,13 +9,15 @@ public class ProposalCycleDates { public Date submissionDeadline; public Date observationSessionStart; public Date observationSessionEnd; + public Observatory observatory; - public ProposalCycleDates(String title, Date submissionDeadline, Date observationSessionStart, Date observationSessionEnd) + public ProposalCycleDates(String title, Date submissionDeadline, Date observationSessionStart, Date observationSessionEnd, Observatory observatory) { this.title = title; this.submissionDeadline = submissionDeadline; this.observationSessionStart = observationSessionStart; this.observationSessionEnd = observationSessionEnd; + this.observatory = observatory; } public ProposalCycleDates() {} From 53377f423691f668f56c672b2d788db4ef283554 Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Thu, 24 Oct 2024 14:15:52 +0100 Subject: [PATCH 2/2] adjust for new api --- .../java/org/orph2020/pst/common/json/ProposalCycleDates.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java b/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java index 0fffde9..e743c9e 100644 --- a/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java +++ b/src/main/java/org/orph2020/pst/common/json/ProposalCycleDates.java @@ -1,6 +1,6 @@ package org.orph2020.pst.common.json; -import org.ivoa.dm.proposal.prop.Observatory; +import org.ivoa.dm.proposal.management.Observatory; import java.util.Date;