Implements #8

kiesraad · Jan 27, 2025 · bc893ce · bc893ce
1 parent 54d9d39
commit bc893ce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/xsd/210-nomination-kiesraad-strict.xsd b/xsd/210-nomination-kiesraad-strict.xsd
@@ -77,7 +77,7 @@
 					<xs:element name="CandidateIdentifier" type="CandidateIdentifierStructure210"/>
 					<xs:element name="CandidateFullName" type="PersonNameStructure"/>
 					<xs:element name="DateOfBirth" type="xs:date" minOccurs="0"/>
-					<xs:element ref="Gender"/>
+					<xs:element name="Gender" type="GenderTypeKR"/>
 					<xs:element name="QualifyingAddress" type="QualifyingAddressStructureKR"/>
 					<xs:element name="Contact" type="ContactDetailsStructureKR" minOccurs="0"/>
 					<xs:element name="Agent" type="AgentStructureKR" minOccurs="0"/>

diff --git a/xsd/520-result-kiesraad-strict.xsd b/xsd/520-result-kiesraad-strict.xsd
@@ -66,7 +66,7 @@
 				<xs:sequence>
 					<xs:element name="CandidateIdentifier" type="CandidateIdentifierStructure520"/>
 					<xs:element name="CandidateFullName" type="PersonNameStructure"/>
-					<xs:element ref="Gender" minOccurs="0"/>
+					<xs:element name="Gender" type="GenderTypeKR" minOccurs="0"/>
 					<xs:element name="QualifyingAddress" type="MinimalQualifyingAddressStructureKR"/>
 				</xs:sequence>
 			</xs:restriction>

diff --git a/xsd/kiesraad-eml-restrictions.xsd b/xsd/kiesraad-eml-restrictions.xsd
@@ -104,6 +104,16 @@
 			</xs:restriction>
 		</xs:complexContent>
 	</xs:complexType>
+	<xs:simpleType name="GenderTypeKR">
+		<xs:annotation>
+			<xs:documentation>Restricts the base EML gender type to not allow 'unknown', replacing it with 'other'.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="male"/>
+			<xs:enumeration value="female"/>
+			<xs:enumeration value="other"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:complexType name="CandidateStructureKR">
 		<xs:annotation>
 			<xs:documentation>only CandidateIdentifier, CandidateFullName, Gender,  QualifyingAddress, Contact, Agent, kr:DateOfBirthAnnex and kr:NationalIdentificationNumber allowed; re-defined without inheritance because of inflexible rules of restriction</xs:documentation>
@@ -112,7 +122,7 @@
 			<xs:element name="CandidateIdentifier" type="CandidateIdentifierStructureKR"/>
 			<xs:element name="CandidateFullName" type="PersonNameStructure" minOccurs="0"/>
 			<xs:element name="DateOfBirth" type="xs:date" minOccurs="0"/>
-			<xs:element ref="Gender" minOccurs="0"/>
+			<xs:element name="Gender" type="GenderTypeKR" minOccurs="0"/>
 			<xs:element name="QualifyingAddress" type="GenericQualifyingAddressStructureKR" minOccurs="0"/>
 			<xs:element name="Contact" type="ContactDetailsStructureKR" minOccurs="0"/>
 			<xs:element name="Agent" type="AgentStructureKR" minOccurs="0"/>