From 3ea329c23fb39ca20f4310d3e9e3e625d2158dba Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Fri, 10 Jan 2025 12:24:41 +0100
Subject: [PATCH] =?UTF-8?q?F=C3=B6rderrichtung=20und=20Motorseite=20wird?=
 =?UTF-8?q?=20beim=20Variof=C3=B6rderer=20mit=20exportiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index bcaceb0..823ea6f 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-01-10T11:41:54" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-01-10T12:24:13" LanguageVersion="2014.1.3.699" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -854,7 +854,7 @@
 					<FIELD Id="RDK:22305684" Name="Höhe Anfang" Type="string" />
 					<FIELD Id="RDK:22305686" Name="Höhe Ende" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:18111807" Name="FoerdererMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:18111807" Name="FoerdererMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18131140" Name="Höhe ETF oben in Meter" Type="string" />
 					<FIELD Id="RDK:18131142" Name="Höhe ETF unten in Meter" Type="string" />
@@ -866,8 +866,10 @@
 					<FIELD Id="RDK:22305692" Name="Höhe Anfang" Type="string" />
 					<FIELD Id="RDK:22305694" Name="Höhe Ende" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:22028983" Name="VarioFoerdererMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:22028983" Name="VarioFoerdererMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
+					<FIELD Id="RDK:22425783" Name="Förderrichtung" Type="string" />
+					<FIELD Id="RDK:22425781" Name="Motorseite" Type="string" />
 					<FIELD Id="RDK:22028979" Name="Anzahl Zusatzseparatoren" Type="string" />
 					<FIELD Id="RDK:22028980" Name="Gesamtanzahl Separatoren" Type="string" />
 					<FIELD Id="RDK:22028981" Name="Länge in Meter" Type="string" />
@@ -907,7 +909,7 @@
 					<FIELD Id="RDK:22028895" Name="Anzahl der Scanner" Type="integer" />
 					<FIELD Id="RDK:22305675" Name="Höhe in m" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:22028922" Name="GefälleStreckeMerkmaleType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:22028922" Name="GefälleStreckeMerkmaleType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028911" Name="AnzahlGeraden" Type="integer" />
 					<FIELD Id="RDK:22028912" Name="Länge in Meter" Type="double[]" />
@@ -921,7 +923,7 @@
 					<FIELD Id="RDK:22028921" Name="Anzahl der Scanner" Type="integer" />
 					<FIELD Id="RDK:22305677" Name="Höhe in m" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:22023206" Name="GruppeMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:22023206" Name="GruppeMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22023208" Name="ids" Type="string" />
 					<FIELD Id="RDK:22028225" Name="Anzahl Fördergruppen" Type="integer" />
@@ -22532,6 +22534,12 @@ me.x
 								</GROUP>
 								<GROUP Id="RDK:22305451" Name="Merkmale" SubType="Generic">
 									<SET_STRUCT Id="RDK:22305449" VarRef="VarioFoerdererMerkmale" ClearAll="True">
+										<PAR Name="Förderrichtung">
+											<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.Typ]]></EXP>
+										</PAR>
+										<PAR Name="Motorseite">
+											<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.AntriebNebenStrecke]]></EXP>
+										</PAR>
 										<PAR Name="Anzahl Zusatzseparatoren">
 											<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.n_Sep - VarioFoerdererData_defaults.n_Sep]]></EXP>
 										</PAR>