update to 0.4.2

make the reviews a composition inside SubmittedProposals
ivoa · May 29, 2024 · 9c2ebce · 9c2ebce
1 parent 589a466
commit 9c2ebce
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/main/vo-dml/proposalManagement.vo-dml.xml b/src/main/vo-dml/proposalManagement.vo-dml.xml
@@ -9,7 +9,7 @@
       <title></title>
       <author>Paul Harrison</author>
       <version>0.4</version>
-      <lastModified>2024-05-24T14:21:25Z</lastModified>
+      <lastModified>2024-05-29T14:57:11Z</lastModified>
       <import>
         <name>null</name><!--should not be needed in modern vo-dml -->
         <url>IVOA-v1.0.vo-dml.xml</url>
@@ -302,6 +302,18 @@
                    <maxOccurs>1</maxOccurs>
                  </multiplicity>
                </attribute>
+               <composition>
+                 <vodml-id>SubmittedProposal.reviews</vodml-id>
+                 <name>reviews</name>
+                 <description>the reviews</description>	    
+                 <datatype>
+                    <vodml-ref>proposalManagement:ProposalReview</vodml-ref>
+                 </datatype>
+                 <multiplicity>
+                   <minOccurs>1</minOccurs>
+                   <maxOccurs>-1</maxOccurs>
+                 </multiplicity>
+               </composition>
                <reference>
                  <vodml-id>SubmittedProposal.proposal</vodml-id>
                  <name>proposal</name>
@@ -397,18 +409,6 @@
                    <maxOccurs>1</maxOccurs>
                  </multiplicity>
                </attribute>
-               <reference>
-                 <vodml-id>ProposalReview.proposal</vodml-id>
-                 <name>proposal</name>
-                 <description>the submitted proposal</description>	    
-                 <datatype>
-                   <vodml-ref>proposalManagement:SubmittedProposal</vodml-ref>
-                 </datatype>
-                 <multiplicity>
-                   <minOccurs>1</minOccurs>
-                   <maxOccurs>1</maxOccurs>
-                 </multiplicity>
-               </reference>
                <reference>
                  <vodml-id>ProposalReview.reviewer</vodml-id>
                  <name>reviewer</name>

diff --git a/src/main/vodsl/proposalManagement.vodsl b/src/main/vodsl/proposalManagement.vodsl
@@ -57,6 +57,7 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
  	submissionDate : ivoa:datetime "the date that the proposal was submitted";
  	successful : ivoa:boolean "the proposal can go on to allocation";
  	reviewsCompleteDate : ivoa:datetime "the date when all the proposals are due";
+ 	reviews : ProposalReview @+ as composition "the reviews";
  	}
 
 
@@ -66,7 +67,6 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
  }
 
  otype ProposalReview "A review of a proposal" {
- 	proposal references SubmittedProposal "the submitted proposal";
  	reviewer references Reviewer "the reviewer making this review";
  	comment: ivoa:string "Description";
  	score : ivoa:real "the review score";

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java
@@ -173,7 +173,7 @@ public  EmerlinExample () {
               }
         ));
         // "submit" proposal
-        final SubmittedProposal submittedProposal = new SubmittedProposal( new GregorianCalendar(2022, 3, 14).getTime(), false, new GregorianCalendar(2022, 4, 30).getTime(), proposal);
+        final SubmittedProposal submittedProposal = new SubmittedProposal( new GregorianCalendar(2022, 3, 14).getTime(),  false, new GregorianCalendar(2022, 4, 30).getTime(), null, proposal);
         cycle.setSubmittedProposals(
               Arrays.asList(submittedProposal));