From 95f9558754cd711c0dc5479ecdc3b067a6d938bd Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Feb 2023 10:50:23 +0100
Subject: [PATCH 1/5] draft 103120 CR034 proposal for AssociatedObjectStatuses

Proposed variation to CR034 to support a collection
StatusOfAssociatedObjects of
	{AssociatedObject, Status}
(as StatusOfAssociatedObjects) in NotificationObject.

This is a branch off cr/103120/034.
---
 103120/schema/ts_103120_Core.xsd         | 11 +++++++++++
 103120/schema/ts_103120_Notification.xsd |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd
index 1105f2c..df32bae 100644
--- a/103120/schema/ts_103120_Core.xsd
+++ b/103120/schema/ts_103120_Core.xsd
@@ -187,6 +187,17 @@
 			<xs:element name="AssociatedObject" type="ObjectIdentifier" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="AssociatedObjectStatuses">
+		<xs:sequence>
+			<xs:element name="AssociatedObjectStatus" type="AssociatedObjectStatus" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AssociatedObjectStatus">
+		<xs:sequence>
+			<xs:element name="AssociatedObject" type="ObjectIdentifier"/>
+			<xs:element name="Status" type="common:DictionaryEntry"/>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="NationalHandlingParameters" abstract="true">
 		<xs:sequence>
 			<xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd
index 50cbc2d..9c0ea47 100644
--- a/103120/schema/ts_103120_Notification.xsd
+++ b/103120/schema/ts_103120_Notification.xsd
@@ -20,7 +20,7 @@
 					<xs:element name="NotificationType" type="common:DictionaryEntry" minOccurs="0"></xs:element>
 					<xs:element name="NewNotification" type="xs:boolean" minOccurs="0"></xs:element>
 					<xs:element name="NotificationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
-					<xs:element name="NewStatusOfAssociatedObjects" type="common:DictionaryEntry" minOccurs="0"></xs:element>					
+					<xs:element name="StatusOfAssociatedObjects" type="common:AssociatedObjectStatuses" minOccurs="0"></xs:element>
 					<xs:element name="NationalNotificationParameters" type="NationalNotificationParameters" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
-- 
GitLab


From f85a6ecdacaea0f47ec2dded96b147fb58fd1257 Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Feb 2023 10:57:36 +0100
Subject: [PATCH 2/5] 103120: fix namespace of AssociatedObjectStatuses

---
 103120/schema/ts_103120_Notification.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd
index 9c0ea47..e7997b1 100644
--- a/103120/schema/ts_103120_Notification.xsd
+++ b/103120/schema/ts_103120_Notification.xsd
@@ -20,7 +20,7 @@
 					<xs:element name="NotificationType" type="common:DictionaryEntry" minOccurs="0"></xs:element>
 					<xs:element name="NewNotification" type="xs:boolean" minOccurs="0"></xs:element>
 					<xs:element name="NotificationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
-					<xs:element name="StatusOfAssociatedObjects" type="common:AssociatedObjectStatuses" minOccurs="0"></xs:element>
+					<xs:element name="StatusOfAssociatedObjects" type="core:AssociatedObjectStatuses" minOccurs="0"></xs:element>
 					<xs:element name="NationalNotificationParameters" type="NationalNotificationParameters" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
-- 
GitLab


From f625cec72198d1ec513cc6ce7faae8c1dcf1c98c Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Feb 2023 11:11:59 +0100
Subject: [PATCH 3/5] 103120: add optional Details to AssociatedObjectStatus

---
 103120/schema/ts_103120_Core.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd
index df32bae..0794a85 100644
--- a/103120/schema/ts_103120_Core.xsd
+++ b/103120/schema/ts_103120_Core.xsd
@@ -196,6 +196,7 @@
 		<xs:sequence>
 			<xs:element name="AssociatedObject" type="ObjectIdentifier"/>
 			<xs:element name="Status" type="common:DictionaryEntry"/>
+			<xs:element name="Details" type="etsi:LongString" minOccurs="0"></xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="NationalHandlingParameters" abstract="true">
-- 
GitLab


From bd103bbb27045b62aae4e4e3ecaa27654238b40c Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Feb 2023 12:00:05 +0100
Subject: [PATCH 4/5] 103120 CR034 move AssociatedObjectStatus* to Notification

No need for AssociatedObjectStatus and AssociatedObjectStatuses to
be in core
---
 103120/schema/ts_103120_Core.xsd         | 12 ------------
 103120/schema/ts_103120_Notification.xsd | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd
index 0794a85..1105f2c 100644
--- a/103120/schema/ts_103120_Core.xsd
+++ b/103120/schema/ts_103120_Core.xsd
@@ -187,18 +187,6 @@
 			<xs:element name="AssociatedObject" type="ObjectIdentifier" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="AssociatedObjectStatuses">
-		<xs:sequence>
-			<xs:element name="AssociatedObjectStatus" type="AssociatedObjectStatus" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AssociatedObjectStatus">
-		<xs:sequence>
-			<xs:element name="AssociatedObject" type="ObjectIdentifier"/>
-			<xs:element name="Status" type="common:DictionaryEntry"/>
-			<xs:element name="Details" type="etsi:LongString" minOccurs="0"></xs:element>
-		</xs:sequence>
-	</xs:complexType>
 	<xs:complexType name="NationalHandlingParameters" abstract="true">
 		<xs:sequence>
 			<xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd
index e7997b1..1747745 100644
--- a/103120/schema/ts_103120_Notification.xsd
+++ b/103120/schema/ts_103120_Notification.xsd
@@ -20,12 +20,24 @@
 					<xs:element name="NotificationType" type="common:DictionaryEntry" minOccurs="0"></xs:element>
 					<xs:element name="NewNotification" type="xs:boolean" minOccurs="0"></xs:element>
 					<xs:element name="NotificationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
-					<xs:element name="StatusOfAssociatedObjects" type="core:AssociatedObjectStatuses" minOccurs="0"></xs:element>
+					<xs:element name="StatusOfAssociatedObjects" type="AssociatedObjectStatuses" minOccurs="0"></xs:element>
 					<xs:element name="NationalNotificationParameters" type="NationalNotificationParameters" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
+	<xs:complexType name="AssociatedObjectStatuses">
+		<xs:sequence>
+			<xs:element name="AssociatedObjectStatus" type="AssociatedObjectStatus" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AssociatedObjectStatus">
+		<xs:sequence>
+			<xs:element name="AssociatedObject" type="core:ObjectIdentifier"/>
+			<xs:element name="Status" type="common:DictionaryEntry"/>
+			<xs:element name="Details" type="etsi:LongString" minOccurs="0"></xs:element>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="NationalNotificationParameters" abstract="true">
 		<xs:sequence>
 			<xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
-- 
GitLab


From bd4bcc395a8320d2006638b335c5afab0615ba07 Mon Sep 17 00:00:00 2001
From: Luke Mewburn <Luke.Mewburn@softelsystems.com.au>
Date: Wed, 1 Feb 2023 14:05:01 +0100
Subject: [PATCH 5/5] TS 103 120 CR034 rename to ListOfAssociatedObjectStatus

Use ListOfAssociatedObjectStatus instead of AssociatedObjectStatuses
---
 103120/schema/ts_103120_Notification.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd
index 1747745..9a3d36f 100644
--- a/103120/schema/ts_103120_Notification.xsd
+++ b/103120/schema/ts_103120_Notification.xsd
@@ -20,15 +20,15 @@
 					<xs:element name="NotificationType" type="common:DictionaryEntry" minOccurs="0"></xs:element>
 					<xs:element name="NewNotification" type="xs:boolean" minOccurs="0"></xs:element>
 					<xs:element name="NotificationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
-					<xs:element name="StatusOfAssociatedObjects" type="AssociatedObjectStatuses" minOccurs="0"></xs:element>
+					<xs:element name="StatusOfAssociatedObjects" type="ListOfAssociatedObjectStatus" minOccurs="0"></xs:element>
 					<xs:element name="NationalNotificationParameters" type="NationalNotificationParameters" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="AssociatedObjectStatuses">
+	<xs:complexType name="ListOfAssociatedObjectStatus">
 		<xs:sequence>
-			<xs:element name="AssociatedObjectStatus" type="AssociatedObjectStatus" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="AssociatedObjectStatus" type="AssociatedObjectStatus" minOccurs="1" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AssociatedObjectStatus">
-- 
GitLab