Skip to content

Commit

Permalink
Merge pull request #6 from orppst/alternativeSubmitted
Browse files Browse the repository at this point in the history
new proposal hierarchy
  • Loading branch information
pahjbo authored Nov 22, 2024
2 parents c7b4008 + c9387e7 commit 3ec22af
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/main/java/org/orph2020/pst/common/json/ProposalSynopsis.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
but significantly less information than held in an entire ObservingProposal object
*/

import org.ivoa.dm.proposal.prop.AbstractProposal;
import org.ivoa.dm.proposal.prop.ObservingProposal;
import org.ivoa.dm.proposal.prop.ProposalKind;

Expand All @@ -23,27 +24,25 @@ public class ProposalSynopsis {
//kind (of observation - see enum)
public ProposalKind kind;

//submitted status
public Boolean submitted;


public ProposalSynopsis(long code, String title, String summary, ProposalKind kind, Boolean submitted)

public ProposalSynopsis(long code, String title, String summary, ProposalKind kind)
{
this.code = code;
this.title = title;
this.summary = summary;
this.kind = kind;
this.submitted = submitted;

}


public ProposalSynopsis(ObservingProposal proposal)
public ProposalSynopsis(AbstractProposal proposal)
{
this.code = proposal.getId();
this.title = proposal.getTitle();
this.summary = proposal.getSummary();
this.kind = proposal.getKind();
this.submitted = proposal.getSubmitted();
}

public ProposalSynopsis() {}
Expand Down

0 comments on commit 3ec22af

Please sign in to comment.