Skip to content

Commit

Permalink
Merge pull request #1014 from OP-TED/Review-XSD-Update_TEDEFO-3059
Browse files Browse the repository at this point in the history 
XSD changes to deal with Review (TEDEFO-3059)
  • Loading branch information
@YvesJo
YvesJo committed Sep 5, 2024
2 parents 3a2138e + c43de58 commit afef430
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 36 deletions.
50 changes: 25 additions & 25 deletions schemas/common/EFORMS-ExtensionAggregateComponents-2.3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<xsd:element name="AppealIrregularity" type="AppealIrregularityType"/>
<xsd:element name="AppealRequestsStatistics" type="AppealRequestsStatisticsType"/>
<xsd:element name="AppealRemedy" type="AppealRemedyType"/>
<xsd:element name="AppealStatus" type="AppealStatusType"/>
<xsd:element name="AppealInformation" type="AppealInformationType"/>
<xsd:element name="AppealedItem" type="AppealedItemType"/>
<xsd:element name="AppealProcessingParty" type="AppealProcessingPartyType"/>
<xsd:element name="AppealsInformation" type="AppealsInformationType"/>
<xsd:element name="Appeals" type="AppealsType"/>
<xsd:element name="AppealingParty" type="AppealingPartyType"/>
<xsd:element name="AppliedMeasure" type="AppliedMeasureType"/>
<xsd:element name="Asset" type="AssetType"/>
Expand Down Expand Up @@ -129,39 +129,39 @@
<xsd:element ref="efbc:StatisticsNumeric" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AppealStatusType">
<xsd:complexType name="AppealInformationType">
<xsd:sequence>
<xsd:element ref="cbc:ID" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="cbc:Date" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="cbc:Title" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element ref="cbc:Description" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element ref="cbc:URI" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="cbc:Date" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="cbc:Title" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="cbc:Description" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="cbc:FeeAmount" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:AppealStageCode" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:AppealStageID" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:AppealPreviousStageID" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:RemedyAmount" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="cbc:URI" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:AppealID" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:AppealRemedyValue" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:AppealStageCode" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:PreviousAppealID" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:WithdrawnAppealIndicator" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:WithdrawnAppealDate" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:WithdrawnAppealReasons" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealDecision" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealIrregularity" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealProcessingParty" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efac:AppealedItem" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealingParty" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealProcessingParty" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efac:AppealDecision" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealRemedy" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealedItem" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealingParty" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AppealsInformationType">
<xsd:complexType name="AppealsType">
<xsd:sequence>
<xsd:element ref="efac:AppealStatus" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealInformation" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AppealingPartyType">
<xsd:sequence>
<xsd:element ref="efbc:AppealingPartyTypeCode" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:AppealingPartyTypeCode" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:AppealingPartyTypeDescription" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="cac:Party" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="cac:Party" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AppliedMeasureType">
Expand All @@ -173,9 +173,9 @@
</xsd:complexType>
<xsd:complexType name="AssetType">
<xsd:sequence>
<xsd:element ref="efbc:AssetDescription" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element ref="efbc:AssetSignificance" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:AssetPredominance" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:AssetDescription" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efbc:AssetSignificance" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:AssetPredominance" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AssetLabelType">
Expand All @@ -186,7 +186,7 @@
</xsd:complexType>
<xsd:complexType name="AssetsListType">
<xsd:sequence>
<xsd:element ref="efac:Asset" minOccurs="1" maxOccurs="unbounded"/>
<xsd:element ref="efac:Asset" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AssetMetricType">
Expand All @@ -200,7 +200,7 @@
<xsd:sequence>
<xsd:element ref="efac:FieldsPrivacy" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efbc:ParameterCode" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efbc:ParameterNumeric" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:ParameterNumeric" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="BusinessPartyGroupType">
Expand Down Expand Up @@ -300,7 +300,7 @@
<xsd:complexType name="DecisionReasonType">
<xsd:sequence>
<xsd:element ref="efac:FieldsPrivacy" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efbc:DecisionReasonCode" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="efbc:DecisionReasonCode" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="DurationJustificationType">
Expand Down
2 changes: 1 addition & 1 deletion schemas/common/EFORMS-ExtensionApex-2.3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<xsd:element ref="efbc:TransmissionTime" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efac:AnswerReceptionPeriod" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="efac:AppealRequestsStatistics" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AppealsInformation" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:Appeals" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:AwardCriterionParameter" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:BuyingPartyReference" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="efac:Changes" minOccurs="0" maxOccurs="1"/>
Expand Down
26 changes: 16 additions & 10 deletions schemas/common/EFORMS-ExtensionBasicComponents-2.3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<!-- ===== Element Declarations ===== -->
<xsd:element name="AccessToolName" type="AccessToolNameType"/>
<xsd:element name="AcquiringCPBIndicator" type="AcquiringCPBIndicatorType"/>
<xsd:element name="AppealStageCode" type="AppealStageCodeType"/>
<xsd:element name="AppealStageID" type="AppealStageIDType"/>
<xsd:element name="AppealPreviousStageID" type="AppealPreviousStageIDType"/>
<xsd:element name="AppealID" type="AppealIDType"/>
<xsd:element name="AppealProcessingPartyTypeDescription" type="AppealProcessingPartyTypeDescriptionType"/>
<xsd:element name="AppealProcessingPartyTypeCode" type="AppealProcessingPartyTypeCodeType"/>
<xsd:element name="AppealStageCode" type="AppealStageCodeType"/>
<xsd:element name="AppealingPartyTypeDescription" type="AppealingPartyTypeDescriptionType"/>
<xsd:element name="AppealingPartyTypeCode" type="AppealingPartyTypeCodeType"/>
<xsd:element name="AppealRemedyValue" type="AppealRemedyValueType"/>
<xsd:element name="ApplicableLegalBasis" type="ApplicableLegalBasisType"/>
<xsd:element name="AreaCode" type="AreaCodeType"/>
<xsd:element name="AssetCategoryCode" type="AssetCategoryCodeType"/>
Expand Down Expand Up @@ -69,6 +69,7 @@
<xsd:element name="ParameterCode" type="ParameterCodeType"/>
<xsd:element name="PenaltiesAmount" type="PenaltiesAmountType"/>
<xsd:element name="PercentageKnownIndicator" type="PercentageKnownIndicatorType"/>
<xsd:element name="PreviousAppealID" type="PreviousAppealIDType"/>
<xsd:element name="PublicationDate" type="PublicationDateType"/>
<xsd:element name="PublicTransportationCumulatedDistance" type="PublicTransportationCumulatedDistanceType"/>
<xsd:element name="ProcedureRelaunchIndicator" type="ProcedureRelaunchIndicatorType"/>
Expand Down Expand Up @@ -112,12 +113,7 @@
<xsd:restriction base="udt:IndicatorType"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="AppealStageCodeType">
<xsd:simpleContent>
<xsd:restriction base="udt:CodeType"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="AppealStageIDType">
<xsd:complexType name="AppealIDType">
<xsd:simpleContent>
<xsd:restriction base="udt:IdentifierType"/>
</xsd:simpleContent>
Expand All @@ -142,11 +138,21 @@
<xsd:restriction base="udt:CodeType"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="AppealPreviousStageIDType">
<xsd:complexType name="PreviousAppealIDType">
<xsd:simpleContent>
<xsd:restriction base="udt:IdentifierType"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="AppealRemedyValueType">
<xsd:simpleContent>
<xsd:restriction base="udt:AmountType"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="AppealStageCodeType">
<xsd:simpleContent>
<xsd:restriction base="udt:CodeType"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="ApplicableLegalBasisType">
<xsd:simpleContent>
<xsd:restriction base="udt:CodeType"/>
Expand Down

0 comments on commit afef430

Please sign in to comment.