Skip to content

Commit

Permalink
Fix proposalToolSchemas and update patch file
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanEngland committed Jun 14, 2024
1 parent e491ec5 commit 869145d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 16 deletions.
46 changes: 30 additions & 16 deletions src/main/webui/[email protected]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- proposalToolSchemas.ts.orig 2024-04-24 10:15:03
+++ proposalToolSchemas.ts 2024-06-13 16:44:15
+++ proposalToolSchemas.ts 2024-06-14 08:55:06
@@ -129,6 +129,7 @@
* An observation that is intended for calibration
*/
Expand Down Expand Up @@ -150,7 +150,7 @@
* the proposals that have been successful and allocated time
*/
allocatedProposals?: AllocatedProposal[];
@@ -1119,7 +1130,7 @@
@@ -1119,12 +1130,13 @@
observationSessionEnd?: Date;
};

Expand All @@ -159,15 +159,21 @@

/**
* A review of a proposal
@@ -1207,6 +1218,7 @@
*/
export type ProposalReview = {
+ _id?: number;
/**
* Description
*/
@@ -1207,6 +1219,7 @@
* A real value with a unit.
*/
export type RealQuantity = {
+ "@type"?: string; // ivoa:RealQuantity
/**
* Must conform to definition of unit in VOUnit spec.
*/
@@ -1238,6 +1250,8 @@
@@ -1238,6 +1251,8 @@
* A resource that will be consumed by allocating an observation from a proposal
*/
export type Resource = {
Expand All @@ -176,15 +182,15 @@
/**
* The amount of the resource
*
@@ -1268,6 +1282,7 @@
@@ -1268,6 +1283,7 @@
* a type of resource
*/
export type ResourceType = {
+ _id?: number;
/**
* the name of the resource type
*/
@@ -1277,52 +1292,10 @@
@@ -1277,52 +1293,10 @@
};

/**
Expand Down Expand Up @@ -238,7 +244,7 @@
/**
* person connected with the proposal
*/
@@ -1354,6 +1327,8 @@
@@ -1354,6 +1328,8 @@
/**
* Science oriented definition of a spectral window.
*/
Expand All @@ -247,23 +253,23 @@
spectralWindowSetup?: SpectralWindowSetup;
expectedSpectralLine?: ExpectedSpectralLine[];
};
@@ -1398,6 +1373,7 @@
@@ -1398,6 +1374,7 @@
* A SpaceFrame is specified by its reference frame (orientation), and a reference position (origin). Currently only standard reference frames are allowed. An equinox MUST be provided for pre-ICRS reference frames. A planetary ephemeris MAY be provided if relevant. If needed, but not provided, it is assumed to be 'DE405'.
*/
export type SpaceFrame = {
+ "@type": string; // coords:SpaceFrame
/**
* RefLocation defines the origin of the spatial coordinate space. This location is represented either by a standard reference position (for which the absolute location in phase space is known by definition), or a specified point in another Spatial frame. This object is used as the origin of the SpaceFrame here, but also to specify the Spatial Reference Position (refPosition) associated with other domain Frames. For example, in the Time domain, the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which might be different from the detector location.
*/
@@ -1420,6 +1396,7 @@
@@ -1420,6 +1397,7 @@
* Specialized coordinate system for the Spatial domain. This object SHOULD include an appropriate SpaceFrame. In Appendix B, we define two standard spatial coordinate space instances (Spherical and Cartesian), which may be referenced in serializations. If a CoordSpace is not provided, it is assumed to be represented by a Standard Spherical Coordinate Space.
*/
export type SpaceSys = {
+ "@type": string; // coords:SpaceSys
xmlId?: string;
/**
* Abstract head of coordinate spaces related to physical properties.
@@ -1503,7 +1480,7 @@
@@ -1503,7 +1481,7 @@
/**
* person connected with the proposal
*/
Expand All @@ -272,7 +278,15 @@
uid?: string;
inKeycloakRealm?: boolean;
};
@@ -1519,6 +1496,21 @@
@@ -1512,6 +1490,7 @@
* an instance of a proposal that has been submitted
*/
export type SubmittedProposal = {
+ _id?: number;
/**
* the date that the proposal was submitted
*
@@ -1519,6 +1498,21 @@
* @example "2022-03-10T00:00:00.000Z"
*/
submissionDate?: Date;
Expand All @@ -294,7 +308,7 @@
/**
* a complete proposal
*/
@@ -1553,23 +1545,26 @@
@@ -1553,23 +1547,26 @@
/**
* A role within the timeAllocation committee
*/
Expand Down Expand Up @@ -322,23 +336,23 @@
xmlId?: string;
name?: string;
};
@@ -1578,6 +1573,7 @@
@@ -1578,6 +1575,7 @@
* an observation of the scientific target
*/
export type TargetObservation = {
+ "@type"?: string;
/**
* any constraints on the observation
*/
@@ -1605,6 +1601,7 @@
@@ -1605,6 +1603,7 @@
*/
performance?: PerformanceParameters;
spectrum?: ScienceSpectralWindow[];
+ _id?: number;
xmlId?: string;
};

@@ -1645,7 +1642,7 @@
@@ -1645,7 +1644,7 @@
/**
* acceptable text formats for document submission
*/
Expand All @@ -347,7 +361,7 @@

/**
* A TimeFrame SHALL include a time scale and reference position. It MAY also include a reference direction.
@@ -1708,6 +1705,10 @@
@@ -1708,6 +1707,10 @@
* particular time range
*/
export type TimingWindow = {
Expand Down
2 changes: 2 additions & 0 deletions src/main/webui/src/generated/proposalToolSchemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,7 @@ export type ProposalKind = "Standard" | "ToO" | "Survey";
* A review of a proposal
*/
export type ProposalReview = {
_id?: number;
/**
* Description
*/
Expand Down Expand Up @@ -1489,6 +1490,7 @@ export type SubjectMap = {
* an instance of a proposal that has been submitted
*/
export type SubmittedProposal = {
_id?: number;
/**
* the date that the proposal was submitted
*
Expand Down

0 comments on commit 869145d

Please sign in to comment.