Merge pull request #76 from InseeFr/dev-lunatic-format-control-type

Dev lunatic format control type
InseeFr · Oct 19, 2022 · 926a4ef · 926a4ef
2 parents 390a08a + 9dad64a
commit 926a4ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,9 @@
 	<groupId>fr.insee.lunatic</groupId>
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
-	<version>2.3.0</version>
+
+	<version>2.3.1</version>
+
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>http://www.insee.fr</url>

diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd
@@ -537,14 +537,14 @@
             <xs:enumeration value="DETACHABLE"/>
         </xs:restriction>
     </xs:simpleType>
-
     <xs:complexType name="ControlType">
         <xs:sequence>
             <xs:element name="control" type="labelType"/>
             <xs:element name="errorMessage" type="labelType"/>
             <xs:element name="bindingDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" />
+        <xs:attribute name="typeOfControl" type="ControlTypeOfControlEnum"/>
         <xs:attribute name="criticality" type="ControlCriticityEnum"/>
     </xs:complexType>
     <xs:simpleType name="ControlCriticityEnum">
@@ -554,6 +554,12 @@
             <xs:enumeration value="ERROR"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="ControlTypeOfControlEnum">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="FORMAT"/>
+            <xs:enumeration value="CONSISTENCY"/>
+        </xs:restriction>
+    </xs:simpleType>
 
     <xs:complexType name="CleaningType">
         <xs:sequence maxOccurs="unbounded">

diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd
@@ -540,6 +540,7 @@
             <xs:element name="bindingDependencies" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="id" type="xs:ID" />
+        <xs:attribute name="typeOfControl" type="ControlTypeOfControlEnum"/>
         <xs:attribute name="criticality" type="ControlCriticityEnum"/>
     </xs:complexType>
     <xs:simpleType name="ControlCriticityEnum">
@@ -549,6 +550,12 @@
             <xs:enumeration value="ERROR"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="ControlTypeOfControlEnum">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="FORMAT"/>
+            <xs:enumeration value="CONSISTENCY"/>
+        </xs:restriction>
+    </xs:simpleType>
 
     <xs:complexType name="CleaningType">
         <xs:sequence maxOccurs="unbounded">