update to 0.4.2

remove the ReviewedProposal construct - all metadata is addded to the SubmittedProposal

README.md

@@ -16,7 +16,7 @@ The model is described in more detail [here](https://ivoa.github.io/ProposalDM/)
 
 
 
-The IVOA standard in development is a Working Draft at version 0.3 and a
+The IVOA standard in development is a Working Draft at version 0.4 and a
 [![PDF-Preview](https://img.shields.io/badge/Preview-PDF-blue)](../../releases/download/auto-pdf-preview/ProposalDM-draft.pdf)
 is automatically produced from this repository when changes are made.
 

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.javastro.ivoa.dm"
-version = "0.4.1-SNAPSHOT"
+version = "0.4.2-SNAPSHOT"
 
 
 vodml {

src/main/vo-dml/proposalManagement.vo-dml.xml

@@ -9,7 +9,7 @@
       <title></title>
       <author>Paul Harrison</author>
       <version>0.4</version>
-      <lastModified>2024-04-26T17:38:33Z</lastModified>
+      <lastModified>2024-05-24T14:21:25Z</lastModified>
       <import>
         <name>null</name><!--should not be needed in modern vo-dml -->
         <url>IVOA-v1.0.vo-dml.xml</url>
@@ -174,18 +174,6 @@
                    <maxOccurs>-1</maxOccurs>
                  </multiplicity>
                </composition>
-               <composition>
-                 <vodml-id>ProposalCycle.reviewedProposals</vodml-id>
-                 <name>reviewedProposals</name>
-                 <description>the proposals that have been reviewed in this cycle</description>	    
-                 <datatype>
-                    <vodml-ref>proposalManagement:ReviewedProposal</vodml-ref>
-                 </datatype>
-                 <multiplicity>
-                   <minOccurs>0</minOccurs>
-                   <maxOccurs>-1</maxOccurs>
-                 </multiplicity>
-               </composition>
                <composition>
                  <vodml-id>ProposalCycle.allocatedProposals</vodml-id>
                  <name>allocatedProposals</name>
@@ -290,25 +278,8 @@
                    <maxOccurs>1</maxOccurs>
                  </multiplicity>
                </attribute>
-               <reference>
-                 <vodml-id>SubmittedProposal.proposal</vodml-id>
-                 <name>proposal</name>
-                 <description>the proposal that was submitted</description>	    
-                 <datatype>
-                   <vodml-ref>proposal:ObservingProposal</vodml-ref>
-                 </datatype>
-                 <multiplicity>
-                   <minOccurs>1</minOccurs>
-                   <maxOccurs>1</maxOccurs>
-                 </multiplicity>
-               </reference>
-            </objectType>
-            <objectType>
-               <vodml-id>ReviewedProposal</vodml-id>
-               <name>ReviewedProposal</name>
-               <description>an instance of a proposal that is in review</description>	    
                <attribute>
-                 <vodml-id>ReviewedProposal.successful</vodml-id>
+                 <vodml-id>SubmittedProposal.successful</vodml-id>
                  <name>successful</name>
                  <description>the proposal can go on to allocation</description>	    
                  <datatype>
@@ -320,7 +291,7 @@
                  </multiplicity>
                </attribute>
                <attribute>
-                 <vodml-id>ReviewedProposal.reviewsCompleteDate</vodml-id>
+                 <vodml-id>SubmittedProposal.reviewsCompleteDate</vodml-id>
                  <name>reviewsCompleteDate</name>
                  <description>the date when all the proposals are due</description>	    
                  <datatype>
@@ -331,24 +302,12 @@
                    <maxOccurs>1</maxOccurs>
                  </multiplicity>
                </attribute>
-               <composition>
-                 <vodml-id>ReviewedProposal.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>ReviewedProposal.submitted</vodml-id>
-                 <name>submitted</name>
-                 <description></description>	    
+                 <vodml-id>SubmittedProposal.proposal</vodml-id>
+                 <name>proposal</name>
+                 <description>the proposal that was submitted</description>	    
                  <datatype>
-                   <vodml-ref>proposalManagement:SubmittedProposal</vodml-ref>
+                   <vodml-ref>proposal:ObservingProposal</vodml-ref>
                  </datatype>
                  <multiplicity>
                    <minOccurs>1</minOccurs>
@@ -438,6 +397,18 @@
                    <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>

src/main/vodsl/proposalManagement.vodsl

@@ -25,7 +25,6 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
  	possibleGrades : AllocationGrade @+ as composition "The possible grades that can be allocated for this cycle";
  	tac : TAC as composition "The time allocation committee";
  	submittedProposals : SubmittedProposal @* as composition "the proposals that have been submitted in this cycle";
- 	reviewedProposals : ReviewedProposal @* as composition "the proposals that have been reviewed in this cycle";
  	allocatedProposals : AllocatedProposal @* as composition "the proposals that have been successful and allocated time";
  }
 
@@ -56,22 +55,18 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
  otype SubmittedProposal "an instance of a proposal that has been submitted" {
  	proposal references proposal:ObservingProposal "the proposal that was submitted"; //note although this is a reference, the proposal is "frozen" when submitted.
  	submissionDate : ivoa:datetime "the date that the proposal was submitted";
- }
-
- otype ReviewedProposal "an instance of a proposal that is in review" {
-//	cycle references ProposalCycle ""; //IMPL does not necessarily need this back reference as owned by the cycle - might be possible to put in automatically with tooling...
- 	submitted references SubmittedProposal ""; 	
- 	reviews : ProposalReview @+ as composition "the reviews";
  	successful : ivoa:boolean "the proposal can go on to allocation";
  	reviewsCompleteDate : ivoa:datetime "the date when all the proposals are due";
- }
+ 	}
+
 
  otype AllocatedProposal "an instance of a proposal that is allocated observing time" {
  	submitted references SubmittedProposal "the proposal"; 	
  	allocation : AllocatedBlock @+ as ordered composition "what is allocated to the proposal";
  }
 
  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";

src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java

@@ -173,26 +173,21 @@ public  EmerlinExample () {
               }
         ));
         // "submit" proposal
-        final SubmittedProposal submittedProposal = new SubmittedProposal( new GregorianCalendar(2022, 3, 14).getTime(), proposal);
+        final SubmittedProposal submittedProposal = new SubmittedProposal( new GregorianCalendar(2022, 3, 14).getTime(), false, new GregorianCalendar(2022, 4, 30).getTime(), proposal);
         cycle.setSubmittedProposals(
               Arrays.asList(submittedProposal));
 
         // "review" proposal
-
-        cycle.setReviewedProposals(Arrays.asList(ReviewedProposal.createReviewedProposal(r -> {
-                  r.submitted = submittedProposal;
-                  r.reviewsCompleteDate = new GregorianCalendar(2022, 4, 14).getTime();
-                  r.successful = true;
-                  r.reviews = Arrays.asList(ProposalReview.createProposalReview(pr -> {
+        ProposalReview review = ProposalReview.createProposalReview(pr -> {
                       pr.comment = "it is good";
                       pr.score = 10.0;
                       pr.reviewer = new Reviewer(people[4]);
                       pr.technicalFeasibility = true;
                       pr.reviewDate = new GregorianCalendar(2022, 4, 14).getTime();
-                  }));
-              })
-        ));
-        
+                  });
+
+       // set that the submitted proposal is ok to be allocated. 
+       submittedProposal.setSuccessful(true);
 
         // "allocate" proposal
 

std/Makefile

@@ -4,7 +4,7 @@
 DOCNAME = ProposalDM
 
 # count up; you probably do not want to bother with versions <1.0
-DOCVERSION = 0.3
+DOCVERSION = 0.4
 
 # Publication date, ISO format; update manually for "releases"
 DOCDATE = ???