Corrections to allow to open annotation in Annotation Modeler thanks …

…to Mariana Naboka
gregorwolf · Feb 6, 2018 · 2af9329 · 2af9329
1 parent 2fbeb0d
commit 2af9329
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/webapp/annotations/annotations.xml b/webapp/annotations/annotations.xml
@@ -6,6 +6,24 @@
 	<edmx:Reference Uri="/sap/opu/odata/sap/ZEPM_DEVELOPER_SCENARIO_SRV/$metadata">
 		<edmx:Include Alias="ZEPM_DEVELOPER_SCENARIO_SRV" Namespace="ZEPM_DEVELOPER_SCENARIO_SRV"/>
 	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs02/vocabularies/Org.OData.Aggregation.V1.xml">
+		<edmx:Include Alias="Aggregation" Namespace="Org.OData.Aggregation.V1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+		<edmx:Include Alias="Capabilities" Namespace="Org.OData.Capabilities.V1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470974/Common.xml?api=v2">
+		<edmx:Include Alias="Common" Namespace="com.sap.vocabularies.Common.v1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470971/Communication.xml?api=v2">
+		<edmx:Include Alias="vCard" Namespace="com.sap.vocabularies.Communication.v1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/vocabularies/Org.OData.Core.V1.xml">
+		<edmx:Include Alias="Core" Namespace="Org.OData.Core.V1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/vocabularies/Org.OData.Measures.V1.xml">
+		<edmx:Include Alias="CQP" Namespace="Org.OData.Measures.V1"/>
+	</edmx:Reference>
 	<edmx:DataServices>
 		<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm">
 			<!--===============================================================================
@@ -52,4 +70,4 @@
 			</Annotations>
 		</Schema>
 	</edmx:DataServices>
-</edmx:Edmx>
+</edmx:Edmx>
diff --git a/webapp/annotations/localAnnotations_1.xml b/webapp/annotations/localAnnotations_1.xml
@@ -12,6 +12,18 @@
 	<edmx:Reference Uri="/sap/opu/odata/sap/ZEPM_DEVELOPER_SCENARIO_SRV/$metadata">
 		<edmx:Include Alias="EPM" Namespace="ZEPM_DEVELOPER_SCENARIO_SRV"/>
 	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs02/vocabularies/Org.OData.Aggregation.V1.xml">
+		<edmx:Include Alias="Aggregation" Namespace="Org.OData.Aggregation.V1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+		<edmx:Include Alias="Capabilities" Namespace="Org.OData.Capabilities.V1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470971/Communication.xml?api=v2">
+		<edmx:Include Alias="vCard" Namespace="com.sap.vocabularies.Communication.v1"/>
+	</edmx:Reference>
+	<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/vocabularies/Org.OData.Core.V1.xml">
+		<edmx:Include Alias="Core" Namespace="Org.OData.Core.V1"/>
+	</edmx:Reference>
 	<edmx:DataServices>
 		<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm">
 			<Annotations xmlns="http://docs.oasis-open.org/odata/ns/edm" Target="EPM.Product">
@@ -54,7 +66,8 @@
 								<PropertyValue Property="Value">
 									<Apply Function="odata.concat">
 										<Path>Name</Path>
-										<String> (</String>
+										<String>
+											(</String>
 										<Path>ProductId</Path>
 										<String>)</String>
 									</Apply>
@@ -63,9 +76,8 @@
 						</PropertyValue>
 						<PropertyValue Property="ImageUrl" Path="PictureUrl"/>
 						<PropertyValue Property="Description">
-							<Record Type="UI.DataFieldWithNavigation">
+							<Record Type="UI.DataField">
 								<PropertyValue Property="Value" Path="SupplierName"/>
-								<PropertyValue Property="Target" Path="SupplierName"/>
 							</Record>
 						</PropertyValue>
 					</Record>
@@ -173,4 +185,4 @@
 			</Annotations>
 		</Schema>
 	</edmx:DataServices>
-</edmx:Edmx>
+</edmx:Edmx>