Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Making Department a (non-nested) ComplexType #453

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions vip_spec.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -311,45 +311,45 @@
</xs:sequence>
</xs:complexType>

<xs:complexType name="ElectionAdministration">
<xs:complexType name="Department" maxOccurs="unbounded">
<xs:sequence>
<xs:element name="AbsenteeUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="AmIRegisteredUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="BallotTrackingUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="BallotProvisionalTrackingUri" type="xs:anyURI" minOccurs="0" />
<!-- A locality may have more than one department with each handling different services. -->
<xs:element name="Department" maxOccurs="unbounded">
<xs:element name="ContactInformation" type="ContactInformation" minOccurs="0" />
<xs:element name="ElectionOfficialPersonId" type="xs:IDREF" minOccurs="0" />
<xs:element name="VoterService" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:all>
<!--
The contact information below can be used to override or
add specific fields to the base Departmental contact information if
the service has different information. For example, if the voter
service has its own phone number, the ContactInformation object
below can be an object containing only a Phone element.
-->
<xs:element name="ContactInformation" type="ContactInformation" minOccurs="0" />
<xs:element name="Description" type="InternationalizedText" minOccurs="0" />
<!--
This is for use if a certain person handles the particular service,
for example a contact person for overseas voting.
-->
<xs:element name="ElectionOfficialPersonId" type="xs:IDREF" minOccurs="0" />
<xs:element name="VoterService" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
<!--
The contact information below can be used to override or
add specific fields to the base Departmental contact information if
the service has different information. For example, if the voter
service has its own phone number, the ContactInformation object
below can be an object containing only a Phone element.
-->
<xs:element name="ContactInformation" type="ContactInformation" minOccurs="0" />
<xs:element name="Description" type="InternationalizedText" minOccurs="0" />
<!--
This is for use if a certain person handles the particular service,
for example a contact person for overseas voting.
-->
<xs:element name="ElectionOfficialPersonId" type="xs:IDREF" minOccurs="0" />
<xs:element name="Type" type="VoterServiceType" minOccurs="0" />
<xs:element name="OtherType" type="xs:string" minOccurs="0" />
</xs:all>
<xs:attribute name="label" type="xs:string" />
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:element name="Type" type="VoterServiceType" minOccurs="0" />
<xs:element name="OtherType" type="xs:string" minOccurs="0" />
</xs:all>
<xs:attribute name="label" type="xs:string" />
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="label" type="xs:string" />
</xs:complexType>

<xs:complexType name="ElectionAdministration">
<xs:sequence>
<xs:element name="AbsenteeUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="AmIRegisteredUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="BallotTrackingUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="BallotProvisionalTrackingUri" type="xs:anyURI" minOccurs="0" />
<!-- A locality may have more than one department with each handling different services. -->
<xs:element name="Department" type="Department" maxOccurs="unbounded" />
<xs:element name="ElectionNotice" type="ElectionNotice" minOccurs="0" />
<xs:element name="ElectionsUri" type="xs:anyURI" minOccurs="0" />
<xs:element name="RegistrationUri" type="xs:anyURI" minOccurs="0" />
Expand Down