Change lines for Loop (formula for min & max)

laurentC35 · Jun 4, 2021 · b1f115b · b1f115b
1 parent 8326afb
commit b1f115b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd
@@ -65,7 +65,7 @@
             <xs:extension base="ComponentType">
                 <xs:sequence>
                     <xs:element name="loopDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:element name="lines" type="LinesRoster" minOccurs="0"/>
+                    <xs:element name="lines" type="LinesLoop" minOccurs="0"/>
                     <xs:element name="components" type="ComponentType" minOccurs="0" maxOccurs="unbounded"/>
                 </xs:sequence>
                 <xs:attribute name="maxPage" type="xs:string"/>
@@ -76,6 +76,11 @@
         </xs:complexContent>
     </xs:complexType>
 
+    <xs:complexType name="LinesLoop">
+        <xs:attribute name="min" type="xs:string" use="required"/>
+        <xs:attribute name="max" type="xs:string" use="required"/>
+    </xs:complexType>
+
     <xs:complexType name="ConditionFilterType">
         <xs:sequence>
             <xs:element name="value" type="xs:string"/>

diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd
@@ -57,8 +57,8 @@
         <xs:complexContent>
             <xs:extension base="ComponentType">
                 <xs:sequence>
-                    <xs:element name="lines" type="LinesRoster" minOccurs="0"/>
                     <xs:element name="loopDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element name="lines" type="LinesLoop" minOccurs="0"/>
                     <xs:element name="components" type="ComponentType" minOccurs="0" maxOccurs="unbounded"/>
                 </xs:sequence>
                 <xs:attribute name="maxPage" type="xs:string"/>
@@ -69,6 +69,11 @@
         </xs:complexContent>
     </xs:complexType>
 
+    <xs:complexType name="LinesLoop">
+        <xs:attribute name="min" type="xs:string" use="required"/>
+        <xs:attribute name="max" type="xs:string" use="required"/>
+    </xs:complexType>
+
     <xs:complexType name="ConditionFilterType">
         <xs:sequence>
             <xs:element name="value" type="xs:string"/>