CSPACE-5128: Converted org foundingDate and dissolutionDate to structuredDateGroups

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
index 40174648763c181bc1961617ae0cb4aab1b8c117..fdce4dd39b36f0a421958bca0411bc9e121cece8 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -89,8 +89,6 @@
         <!-- Repeatable fields are commented out for now until we -->
         <!-- identify how to represent these complex types in layouts. -->
 <!--        <row><widget>contactName</widget></row>-->
-        <row><widget>foundingDate</widget></row>
-        <row><widget>dissolutionDate</widget></row>
         <row><widget>foundingPlace</widget></row>
 <!--        <row><widget>group</widget></row> -->
 <!--        <row><widget>function</widget></row> -->
@@ -218,33 +216,7 @@
         </properties>
       </widget>
 -->
-      
-      <widget name="foundingDate" type="text">
-        <labels>
-          <label mode="any">foundingDate</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="organizations_common">foundingDate</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="dissolutionDate" type="text">
-        <labels>
-          <label mode="any">dissolutionDate</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="organizations_common">dissolutionDate</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
+            
       <widget name="foundingPlace" type="text">
         <labels>
           <label mode="any">foundingPlace</label>

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
index 6a9f12e0bf5a22356a65b7aa8187da8304208713..b49f2d98afd250e0ce44d17cf79ee829f83911e8 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
@@ -30,8 +30,8 @@
     <!-- Term Information repeatable group -->
     <xs:element name="orgTermGroupList" type="orgTermGroupList"/>
     
-    <xs:element name="foundingDate" type="xs:string"/>
-    <xs:element name="dissolutionDate" type="xs:string"/>
+    <xs:element name="foundingDateGroup" type="structuredDateGroup"/>
+    <xs:element name="dissolutionDateGroup" type="structuredDateGroup"/>
     <xs:element name="foundingPlace" type="xs:string"/>
     
     <xs:element name="groups">
@@ -92,5 +92,36 @@
         </xs:sequence>
     </xs:complexType>
     
+    <!-- Before (re)using this generic complex type in any record type -->
+    <!-- other than CollectionObject, be sure to verify that Nuxeo handles -->
+    <!-- that correctly in its table creation/row linking. -->
+    <xs:complexType name="structuredDateGroup">
+        <xs:sequence>
+            <xs:element name="dateDisplayDate" type="xs:string"/>
+            <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:integer"/>
+            <xs:element name="dateLatestMonth" type="xs:integer"/>
+            <xs:element name="dateLatestDay" type="xs:integer"/>
+            <xs:element name="dateLatestEra" type="xs:string"/>
+            <xs:element name="dateLatestCertainty" type="xs:string"/>
+            <xs:element name="dateLatestQualifier" type="xs:string"/>
+            <xs:element name="dateLatestQualifierValue" type="xs:integer"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
+            <xs:element name="datePeriod" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+        </xs:sequence>
+    </xs:complexType>
+    
 </xs:schema>
 

diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
index 13e9eb5369ddd5d9fdf524b76182205972fff8a8..4d6b203e4e5429ee194aa4bdbb649c266548ea68 100644 (file)
--- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
+++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
@@ -39,6 +39,8 @@ import org.jboss.resteasy.client.ClientResponse;
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
+import org.collectionspace.services.organization.StructuredDateGroup;\r
+\r
 /**\r
  * OrgAuthorityClientUtils.\r
  */\r
@@ -251,10 +253,16 @@ public class OrgAuthorityClientUtils {
                contactNames.addAll(values);\r
                 organization.setContactNames(contactsList);\r
         }\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_DATE))!=null)\r
-               organization.setFoundingDate(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.DISSOLUTION_DATE))!=null)\r
-               organization.setDissolutionDate(value);\r
+        if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_DATE))!=null) {\r
+            StructuredDateGroup foundingDate = new StructuredDateGroup();\r
+            foundingDate.setDateDisplayDate(value);\r
+            organization.setFoundingDateGroup(foundingDate);\r
+        }\r
+        if((value = (String)orgInfo.get(OrganizationJAXBSchema.DISSOLUTION_DATE))!=null) {\r
+            StructuredDateGroup dissolutionDate = new StructuredDateGroup();\r
+            dissolutionDate.setDateDisplayDate(value);\r
+            organization.setDissolutionDateGroup(dissolutionDate);\r
+        }\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_PLACE))!=null)\r
                organization.setFoundingPlace(value);\r
         if((values = (List<String>)orgRepeatablesInfo.get(OrganizationJAXBSchema.GROUPS))!=null) {\r

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 56752982127c4d6bbc1f53f8eae3e16ebecc3158..9e8894fe390d3f0822812a0003c289e0296d0bf7 100644 (file)
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -28,8 +28,8 @@
                 <!-- Term Information repeatable group -->
                 <xs:element name="orgTermGroupList" type="orgTermGroupList"/>
                                 
-                <xs:element name="foundingDate" type="xs:string"/>
-                <xs:element name="dissolutionDate" type="xs:string"/>
+                <xs:element name="foundingDateGroup" type="structuredDateGroup"/>
+                <xs:element name="dissolutionDateGroup" type="structuredDateGroup"/>
                 <xs:element name="foundingPlace" type="xs:string"/>
                 
                 <xs:element name="groups" type="groupList"/>
@@ -90,5 +90,36 @@
         </xs:sequence>
     </xs:complexType>
 
+    <!-- Before (re)using this generic complex type in any record type -->
+    <!-- other than CollectionObject, be sure to verify that Nuxeo handles -->
+    <!-- that correctly in its table creation/row linking. -->
+    <xs:complexType name="structuredDateGroup">
+        <xs:sequence>
+            <xs:element name="dateDisplayDate" type="xs:string"/>
+            <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:integer"/>
+            <xs:element name="dateLatestMonth" type="xs:integer"/>
+            <xs:element name="dateLatestDay" type="xs:integer"/>
+            <xs:element name="dateLatestEra" type="xs:string"/>
+            <xs:element name="dateLatestCertainty" type="xs:string"/>
+            <xs:element name="dateLatestQualifier" type="xs:string"/>
+            <xs:element name="dateLatestQualifierValue" type="xs:integer"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
+            <xs:element name="datePeriod" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+        </xs:sequence>
+    </xs:complexType>
+    
 </xs:schema>