CSPACE-2933: Moved three Current Location-related fields into a repeatable group...

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
index 513a48d82f8dd9d8773849b19c61fc11b37c7fa3..39ef60777ed4b75555bd7eb5b4d50068938d1680 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
@@ -92,11 +92,7 @@
     \r
     <!-- Object Location Information Group -->\r
 \r
-    <!-- FIXME Start of Current location repeatable group -->\r
-    <xs:element name="currentLocation" type="xs:string"/>\r
-    <xs:element name="currentLocationFitness" type="xs:string"/>\r
-    <xs:element name="currentLocationNote" type="xs:string"/>\r
-    <!-- FIXME End of Current location repeatable group -->\r
+    <xs:element name="currentLocationList" type="currentLocationList"/>\r
 \r
     <xs:element name="locationDate" type="xs:string"/>\r
     <xs:element name="normalLocation" type="xs:string"/>\r
@@ -127,4 +123,18 @@
         </xs:complexType>\r
     </xs:element>\r
 \r
+    <xs:complexType name="currentLocationList">\r
+        <xs:sequence>\r
+            <xs:element name="currentLocationGroup" type="currentLocationGroup" minOccurs="0" maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
+\r
+    <xs:complexType name="currentLocationGroup">\r
+        <xs:sequence>\r
+            <xs:element name="currentLocation" type="xs:string"/>\r
+            <xs:element name="currentLocationFitness" type="xs:string"/>\r
+            <xs:element name="currentLocationNote" type="xs:string"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
+\r
 </xs:schema>\r

diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index cae340d7a6982993a804dcd5aa33cc8cfc9ce861..4a8f70569a72b6a8f78f65d84194254d8c9d460e 100644 (file)
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -67,9 +67,7 @@
                 <xs:element name="insurers" type="insurerList"/>
 
                 <!-- Object Location Information Group -->
-                <xs:element name="currentLocation" type="xs:string"/>
-                <xs:element name="currentLocationFitness" type="xs:string"/>
-                <xs:element name="currentLocationNote" type="xs:string"/>
+                <xs:element name="currentLocationList" type="currentLocationList"/>
                 <xs:element name="locationDate" type="xs:string"/>
                 <xs:element name="normalLocation" type="xs:string"/>
 
@@ -121,6 +119,20 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="currentLocationList">
+        <xs:sequence>
+            <xs:element name="currentLocationGroup" type="currentLocationGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="currentLocationGroup">
+        <xs:sequence>
+            <xs:element name="currentLocation" type="xs:string"/>
+            <xs:element name="currentLocationFitness" type="xs:string"/>
+            <xs:element name="currentLocationNote" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="conditionCheckMethodList">
         <xs:sequence>
             <xs:element name="conditionCheckMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>