From 441115b6806cf0fa6ec501a5e3e9cfdfd79f10d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 5 Feb 2014 10:30:28 +0000
Subject: [PATCH] =?UTF-8?q?UID=20Generierung=20bei=20Lehrg=C3=A4ngen=20im?=
 =?UTF-8?q?=20Sommersemester=20korrigiert=20damit=20es=20keine=20=C3=9Cber?=
 =?UTF-8?q?schneidungen=20bei=20der=20UID=20gibt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/tw/generateuid.inc.php |   2 +
 system/FH-Complete.txp         | 502 ++++++++++-----------------------
 2 files changed, 155 insertions(+), 349 deletions(-)

diff --git a/include/tw/generateuid.inc.php b/include/tw/generateuid.inc.php
index b946119e6..4e7167513 100644
--- a/include/tw/generateuid.inc.php
+++ b/include/tw/generateuid.inc.php
@@ -40,6 +40,8 @@ function generateUID($stgkzl,$jahr, $stgtyp, $matrikelnummer)
 		$nr = $nr+500;
 	elseif($art=='0' && $stgtyp=='m') //Incoming im Masterstudiengang
 		$nr = $nr+500;
+	elseif($art=='4' && $stgtyp=='l') // Lehrgangsteilnehmer im Sommersemester
+		$nr = $nr+500;
 
 
 	return mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr);
diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index 328e3d130..6042b4fc9 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -2372,7 +2372,6 @@
 					<LineList>
 						<Id>{BBB9C434-6ED4-4AD5-997D-C10EE442E12C}</Id>
 						<Id>{E3792876-3C80-42AE-9D33-20DE81B8FD01}</Id>
-						<Id>{607F494F-9CAB-4204-AC77-9C7A160ED648}</Id>
 					</LineList>
 					<DisplayIndexes>0</DisplayIndexes>
 					<AlignInColumns>0</AlignInColumns>
@@ -10091,7 +10090,6 @@
 					<FullBackground>0</FullBackground>
 					<LineList>
 						<Id>{23B9F73D-FB25-4BA3-9502-816CB13F7FEE}</Id>
-						<Id>{607F494F-9CAB-4204-AC77-9C7A160ED648}</Id>
 					</LineList>
 					<DisplayIndexes>0</DisplayIndexes>
 					<AlignInColumns>0</AlignInColumns>
@@ -29841,49 +29839,6 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{607F494F-9CAB-4204-AC77-9C7A160ED648}</Id>
-					<Name>fk_lehrform_lehrtyp</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{93CCDE9D-BC32-49E3-8589-387655BD0175}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{C3A9B229-7C67-453F-A2BA-B5CD2247980A}</ParentBaseID>
-					<PenWidth>1</PenWidth>
-					<PenColor>0</PenColor>
-					<BrushColor>15780518</BrushColor>
-					<FontCharset>238</FontCharset>
-					<FontColor>0</FontColor>
-					<FontName>Arial</FontName>
-					<FontStyle>0</FontStyle>
-					<FormatLocked>0</FormatLocked>
-					<FontHeight>-28</FontHeight>
-					<WorkSpaceShape1>
-						<Id>{B695F7DA-794D-4930-9F37-F09C8B023EBE}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{4964C7FD-DD69-4474-98DB-902C29FB6258}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>1556</NamePositionX>
-					<NamePositionY>2065</NamePositionY>
-					<Points>
-						<Point>
-							<x>1157</x>
-							<y>2600</y>
-						</Point>
-						<Point>
-							<x>1188</x>
-							<y>2600</y>
-						</Point>
-						<Point>
-							<x>2124</x>
-							<y>1650</y>
-						</Point>
-						<Point>
-							<x>2155</x>
-							<y>1650</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{8F6DE553-C39E-4C22-B50D-A80826AD00FB}</Id>
 					<Name>fk_studienordnung_semester_studiensemester</Name>
@@ -56414,7 +56369,7 @@
 					<Top>18</Top>
 					<Left>28</Left>
 					<z>0</z>
-					<Width>492</Width>
+					<Width>438</Width>
 					<Height>288</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56470,7 +56425,7 @@
 					<Top>24</Top>
 					<Left>1511</Left>
 					<z>0</z>
-					<Width>911</Width>
+					<Width>807</Width>
 					<Height>629</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56511,7 +56466,7 @@
 					<Top>1633</Top>
 					<Left>38</Left>
 					<z>0</z>
-					<Width>763</Width>
+					<Width>683</Width>
 					<Height>239</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56552,7 +56507,7 @@
 					<Top>40</Top>
 					<Left>567</Left>
 					<z>0</z>
-					<Width>880</Width>
+					<Width>788</Width>
 					<Height>1253</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56591,7 +56546,7 @@
 					<Top>5</Top>
 					<Left>2470</Left>
 					<z>0</z>
-					<Width>724</Width>
+					<Width>651</Width>
 					<Height>590</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56629,7 +56584,7 @@
 					<Top>740</Top>
 					<Left>1899</Left>
 					<z>0</z>
-					<Width>971</Width>
+					<Width>859</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56714,11 +56669,11 @@
 					<Top>1942</Top>
 					<Left>1018</Left>
 					<z>0</z>
-					<Width>685</Width>
-					<Height>200</Height>
+					<Width>594</Width>
+					<Height>176</Height>
 					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
+					<RecalculateSizes>0</RecalculateSizes>
+					<UseWorkSpaceRecalculateSizes>0</UseWorkSpaceRecalculateSizes>
 					<Shadow>1</Shadow>
 					<FullBackground>1</FullBackground>
 					<LineList>
@@ -56752,7 +56707,7 @@
 					<Top>1165</Top>
 					<Left>2906</Left>
 					<z>0</z>
-					<Width>763</Width>
+					<Width>683</Width>
 					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56791,7 +56746,7 @@
 					<Top>620</Top>
 					<Left>2954</Left>
 					<z>0</z>
-					<Width>875</Width>
+					<Width>775</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56878,7 +56833,6 @@
 					<FullBackground>1</FullBackground>
 					<LineList>
 						<Id>{9D363FFE-4469-434E-81B0-E5D448D2F131}</Id>
-						<Id>{52DCC4A9-739F-4739-9C18-3820FAAB87F1}</Id>
 					</LineList>
 					<DisplayIndexes>1</DisplayIndexes>
 					<AlignInColumns>1</AlignInColumns>
@@ -56907,7 +56861,7 @@
 					<Top>1923</Top>
 					<Left>48</Left>
 					<z>0</z>
-					<Width>857</Width>
+					<Width>768</Width>
 					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56941,19 +56895,18 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1713</Top>
-					<Left>1013</Left>
+					<Top>1731</Top>
+					<Left>1024</Left>
 					<z>0</z>
-					<Width>669</Width>
-					<Height>200</Height>
+					<Width>606</Width>
+					<Height>186</Height>
 					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
+					<RecalculateSizes>0</RecalculateSizes>
+					<UseWorkSpaceRecalculateSizes>0</UseWorkSpaceRecalculateSizes>
 					<Shadow>1</Shadow>
 					<FullBackground>1</FullBackground>
 					<LineList>
 						<Id>{9BD947D3-9D3C-4F0E-A99B-E3F4C163F96C}</Id>
-						<Id>{52DCC4A9-739F-4739-9C18-3820FAAB87F1}</Id>
 					</LineList>
 					<DisplayIndexes>1</DisplayIndexes>
 					<AlignInColumns>1</AlignInColumns>
@@ -56982,7 +56935,7 @@
 					<Top>1305</Top>
 					<Left>951</Left>
 					<z>0</z>
-					<Width>829</Width>
+					<Width>731</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -57020,7 +56973,7 @@
 					<Top>1722</Top>
 					<Left>2836</Left>
 					<z>0</z>
-					<Width>737</Width>
+					<Width>667</Width>
 					<Height>902</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -57057,7 +57010,7 @@
 					<Top>1329</Top>
 					<Left>54</Left>
 					<z>0</z>
-					<Width>644</Width>
+					<Width>576</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -57094,7 +57047,7 @@
 					<Top>2332</Top>
 					<Left>80</Left>
 					<z>0</z>
-					<Width>763</Width>
+					<Width>683</Width>
 					<Height>317</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -57132,7 +57085,7 @@
 					<Top>2156</Top>
 					<Left>1002</Left>
 					<z>0</z>
-					<Width>640</Width>
+					<Width>567</Width>
 					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -57172,24 +57125,24 @@
 					<WorkSpaceShape2>
 						<Id>{D5915873-AA55-4FB0-9EAE-7236D558CCBB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1072</NamePositionX>
-					<NamePositionY>768</NamePositionY>
+					<NamePositionX>1148</NamePositionX>
+					<NamePositionY>1020</NamePositionY>
 					<Points>
 						<Point>
-							<x>801</x>
+							<x>721</x>
 							<y>1729</y>
 						</Point>
 						<Point>
-							<x>832</x>
+							<x>752</x>
 							<y>1729</y>
 						</Point>
 						<Point>
-							<x>1480</x>
-							<y>181</y>
+							<x>1713</x>
+							<y>684</y>
 						</Point>
 						<Point>
-							<x>1511</x>
-							<y>181</y>
+							<x>1713</x>
+							<y>653</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57215,24 +57168,24 @@
 					<WorkSpaceShape2>
 						<Id>{D5915873-AA55-4FB0-9EAE-7236D558CCBB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1073</NamePositionX>
-					<NamePositionY>869</NamePositionY>
+					<NamePositionX>1250</NamePositionX>
+					<NamePositionY>1042</NamePositionY>
 					<Points>
 						<Point>
-							<x>801</x>
+							<x>721</x>
 							<y>1776</y>
 						</Point>
 						<Point>
-							<x>832</x>
+							<x>752</x>
 							<y>1776</y>
 						</Point>
 						<Point>
-							<x>1480</x>
-							<y>338</y>
+							<x>1914</x>
+							<y>684</y>
 						</Point>
 						<Point>
-							<x>1511</x>
-							<y>338</y>
+							<x>1914</x>
+							<y>653</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57258,24 +57211,24 @@
 					<WorkSpaceShape2>
 						<Id>{D5915873-AA55-4FB0-9EAE-7236D558CCBB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1396</NamePositionX>
-					<NamePositionY>408</NamePositionY>
+					<NamePositionX>1350</NamePositionX>
+					<NamePositionY>329</NamePositionY>
 					<Points>
 						<Point>
-							<x>1447</x>
+							<x>1355</x>
 							<y>666</y>
 						</Point>
 						<Point>
-							<x>1478</x>
+							<x>1386</x>
 							<y>666</y>
 						</Point>
 						<Point>
 							<x>1480</x>
-							<y>496</y>
+							<y>338</y>
 						</Point>
 						<Point>
 							<x>1511</x>
-							<y>496</y>
+							<y>338</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57301,15 +57254,15 @@
 					<WorkSpaceShape2>
 						<Id>{01F6CD74-BD1B-46B0-B6A1-154B3625A34C}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2346</NamePositionX>
+					<NamePositionX>2294</NamePositionX>
 					<NamePositionY>208</NamePositionY>
 					<Points>
 						<Point>
-							<x>2422</x>
+							<x>2318</x>
 							<y>338</y>
 						</Point>
 						<Point>
-							<x>2453</x>
+							<x>2349</x>
 							<y>338</y>
 						</Point>
 						<Point>
@@ -57344,7 +57297,7 @@
 					<WorkSpaceShape2>
 						<Id>{D82FC4FC-DDAD-488C-907E-08576AD96294}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2311</NamePositionX>
+					<NamePositionX>2283</NamePositionX>
 					<NamePositionY>473</NamePositionY>
 					<Points>
 						<Point>
@@ -57356,11 +57309,11 @@
 							<y>398</y>
 						</Point>
 						<Point>
-							<x>2384</x>
+							<x>2328</x>
 							<y>709</y>
 						</Point>
 						<Point>
-							<x>2384</x>
+							<x>2328</x>
 							<y>740</y>
 						</Point>
 					</Points>
@@ -57387,35 +57340,35 @@
 					<WorkSpaceShape2>
 						<Id>{D82FC4FC-DDAD-488C-907E-08576AD96294}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3176</NamePositionX>
-					<NamePositionY>1157</NamePositionY>
+					<NamePositionX>3151</NamePositionX>
+					<NamePositionY>1167</NamePositionY>
 					<Points>
 						<Point>
-							<x>2870</x>
+							<x>2758</x>
 							<y>1055</y>
 						</Point>
 						<Point>
-							<x>2901</x>
+							<x>2789</x>
 							<y>1055</y>
 						</Point>
 						<Point>
-							<x>2901</x>
+							<x>2789</x>
 							<y>1055</y>
 						</Point>
 						<Point>
-							<x>2901</x>
+							<x>2789</x>
 							<y>1244</y>
 						</Point>
 						<Point>
-							<x>2542</x>
+							<x>2468</x>
 							<y>1244</y>
 						</Point>
 						<Point>
-							<x>2546</x>
+							<x>2472</x>
 							<y>1244</y>
 						</Point>
 						<Point>
-							<x>2546</x>
+							<x>2472</x>
 							<y>1213</y>
 						</Point>
 					</Points>
@@ -57442,7 +57395,7 @@
 					<WorkSpaceShape2>
 						<Id>{D82FC4FC-DDAD-488C-907E-08576AD96294}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2122</NamePositionX>
+					<NamePositionX>2104</NamePositionX>
 					<NamePositionY>1170</NamePositionY>
 					<Points>
 						<Point>
@@ -57454,11 +57407,11 @@
 							<y>1236</y>
 						</Point>
 						<Point>
-							<x>2223</x>
+							<x>2185</x>
 							<y>1244</y>
 						</Point>
 						<Point>
-							<x>2223</x>
+							<x>2185</x>
 							<y>1213</y>
 						</Point>
 					</Points>
@@ -57485,8 +57438,8 @@
 					<WorkSpaceShape2>
 						<Id>{99B7A99C-399B-4702-9416-9BBFF181ED56}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1698</NamePositionX>
-					<NamePositionY>2174</NamePositionY>
+					<NamePositionX>1652</NamePositionX>
+					<NamePositionY>2166</NamePositionY>
 					<Points>
 						<Point>
 							<x>1956</x>
@@ -57497,12 +57450,12 @@
 							<y>2434</y>
 						</Point>
 						<Point>
-							<x>1734</x>
-							<y>2075</y>
+							<x>1643</x>
+							<y>2059</y>
 						</Point>
 						<Point>
-							<x>1703</x>
-							<y>2075</y>
+							<x>1612</x>
+							<y>2059</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57528,24 +57481,24 @@
 					<WorkSpaceShape2>
 						<Id>{99B7A99C-399B-4702-9416-9BBFF181ED56}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1662</NamePositionX>
-					<NamePositionY>2023</NamePositionY>
+					<NamePositionX>1617</NamePositionX>
+					<NamePositionY>1903</NamePositionY>
 					<Points>
 						<Point>
 							<x>1956</x>
-							<y>2200</y>
+							<y>1967</y>
 						</Point>
 						<Point>
 							<x>1925</x>
-							<y>2200</y>
+							<y>1967</y>
 						</Point>
 						<Point>
-							<x>1734</x>
-							<y>2009</y>
+							<x>1643</x>
+							<y>2001</y>
 						</Point>
 						<Point>
-							<x>1703</x>
-							<y>2009</y>
+							<x>1612</x>
+							<y>2001</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57571,8 +57524,8 @@
 					<WorkSpaceShape2>
 						<Id>{7DD3FBD6-8AEC-43CA-8E72-02883BBE1F25}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2730</NamePositionX>
-					<NamePositionY>1666</NamePositionY>
+					<NamePositionX>2973</NamePositionX>
+					<NamePositionY>1767</NamePositionY>
 					<Points>
 						<Point>
 							<x>2755</x>
@@ -57583,12 +57536,12 @@
 							<y>1967</y>
 						</Point>
 						<Point>
-							<x>2875</x>
-							<y>1506</y>
+							<x>3361</x>
+							<y>1708</y>
 						</Point>
 						<Point>
-							<x>2906</x>
-							<y>1506</y>
+							<x>3361</x>
+							<y>1677</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57614,24 +57567,24 @@
 					<WorkSpaceShape2>
 						<Id>{7DD3FBD6-8AEC-43CA-8E72-02883BBE1F25}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1694</NamePositionX>
-					<NamePositionY>1268</NamePositionY>
+					<NamePositionX>1653</NamePositionX>
+					<NamePositionY>1311</NamePositionY>
 					<Points>
 						<Point>
-							<x>801</x>
+							<x>721</x>
 							<y>1824</y>
 						</Point>
 						<Point>
-							<x>832</x>
+							<x>752</x>
 							<y>1824</y>
 						</Point>
 						<Point>
 							<x>2875</x>
-							<y>1336</y>
+							<y>1421</y>
 						</Point>
 						<Point>
 							<x>2906</x>
-							<y>1336</y>
+							<y>1421</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57657,23 +57610,23 @@
 					<WorkSpaceShape2>
 						<Id>{D1ACE1AA-97D9-454E-BE39-720F9DF575E7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3378</NamePositionX>
-					<NamePositionY>528</NamePositionY>
+					<NamePositionX>3163</NamePositionX>
+					<NamePositionY>476</NamePositionY>
 					<Points>
 						<Point>
-							<x>3564</x>
-							<y>595</y>
+							<x>3216</x>
+							<y>524</y>
 						</Point>
 						<Point>
-							<x>3564</x>
-							<y>626</y>
+							<x>3185</x>
+							<y>524</y>
 						</Point>
 						<Point>
-							<x>3392</x>
+							<x>3342</x>
 							<y>589</y>
 						</Point>
 						<Point>
-							<x>3392</x>
+							<x>3342</x>
 							<y>620</y>
 						</Point>
 					</Points>
@@ -57701,34 +57654,34 @@
 						<Id>{D1ACE1AA-97D9-454E-BE39-720F9DF575E7}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3624</NamePositionX>
-					<NamePositionY>1089</NamePositionY>
+					<NamePositionY>1099</NamePositionY>
 					<Points>
 						<Point>
-							<x>3829</x>
+							<x>3729</x>
 							<y>856</y>
 						</Point>
 						<Point>
-							<x>3860</x>
+							<x>3760</x>
 							<y>856</y>
 						</Point>
 						<Point>
-							<x>3868</x>
+							<x>3768</x>
 							<y>857</y>
 						</Point>
 						<Point>
-							<x>3868</x>
+							<x>3768</x>
 							<y>1124</y>
 						</Point>
 						<Point>
-							<x>3400</x>
+							<x>3350</x>
 							<y>1124</y>
 						</Point>
 						<Point>
-							<x>3392</x>
+							<x>3342</x>
 							<y>1124</y>
 						</Point>
 						<Point>
-							<x>3392</x>
+							<x>3342</x>
 							<y>1093</y>
 						</Point>
 					</Points>
@@ -57841,24 +57794,24 @@
 					<WorkSpaceShape2>
 						<Id>{EC357F68-C26A-41FB-93FB-4114A2D4001F}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1154</NamePositionX>
-					<NamePositionY>1939</NamePositionY>
+					<NamePositionX>1110</NamePositionX>
+					<NamePositionY>2055</NamePositionY>
 					<Points>
 						<Point>
-							<x>905</x>
+							<x>816</x>
 							<y>2120</y>
 						</Point>
 						<Point>
-							<x>936</x>
+							<x>847</x>
 							<y>2120</y>
 						</Point>
 						<Point>
 							<x>1925</x>
-							<y>1967</y>
+							<y>2200</y>
 						</Point>
 						<Point>
 							<x>1956</x>
-							<y>1967</y>
+							<y>2200</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -57884,16 +57837,16 @@
 					<WorkSpaceShape2>
 						<Id>{EC357F68-C26A-41FB-93FB-4114A2D4001F}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1642</NamePositionX>
-					<NamePositionY>1474</NamePositionY>
+					<NamePositionX>1616</NamePositionX>
+					<NamePositionY>1480</NamePositionY>
 					<Points>
 						<Point>
-							<x>1682</x>
-							<y>1813</y>
+							<x>1630</x>
+							<y>1824</y>
 						</Point>
 						<Point>
-							<x>1713</x>
-							<y>1813</y>
+							<x>1661</x>
+							<y>1824</y>
 						</Point>
 						<Point>
 							<x>1925</x>
@@ -57905,49 +57858,6 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{52DCC4A9-739F-4739-9C18-3820FAAB87F1}</Id>
-					<Name>fk_lehrform_lehrtyp</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{5C39B898-8B27-4828-AB16-88EAE42DE1AB}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{C3A9B229-7C67-453F-A2BA-B5CD2247980A}</ParentBaseID>
-					<PenWidth>1</PenWidth>
-					<PenColor>0</PenColor>
-					<BrushColor>15780518</BrushColor>
-					<FontCharset>238</FontCharset>
-					<FontColor>0</FontColor>
-					<FontName>Arial</FontName>
-					<FontStyle>0</FontStyle>
-					<FormatLocked>0</FormatLocked>
-					<FontHeight>-28</FontHeight>
-					<WorkSpaceShape1>
-						<Id>{85878610-D13C-4FCA-A914-04C89D88BDD5}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{A9936DCB-8B2A-4A50-A727-CB127D7870BD}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>1246</NamePositionX>
-					<NamePositionY>1641</NamePositionY>
-					<Points>
-						<Point>
-							<x>1344</x>
-							<y>1689</y>
-						</Point>
-						<Point>
-							<x>1344</x>
-							<y>1720</y>
-						</Point>
-						<Point>
-							<x>1348</x>
-							<y>1682</y>
-						</Point>
-						<Point>
-							<x>1348</x>
-							<y>1713</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{B5D50A7D-5620-42A5-8FB0-35A4C7E6C7F0}</Id>
 					<Name>fk_studienordnung_semester_studiensemester</Name>
@@ -57970,15 +57880,15 @@
 					<WorkSpaceShape2>
 						<Id>{7B93B128-4D6B-49D8-A654-7C43C55BD3BB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>793</NamePositionX>
+					<NamePositionX>753</NamePositionX>
 					<NamePositionY>1356</NamePositionY>
 					<Points>
 						<Point>
-							<x>801</x>
+							<x>721</x>
 							<y>1681</y>
 						</Point>
 						<Point>
-							<x>832</x>
+							<x>752</x>
 							<y>1681</y>
 						</Point>
 						<Point>
@@ -58013,23 +57923,23 @@
 					<WorkSpaceShape2>
 						<Id>{7B93B128-4D6B-49D8-A654-7C43C55BD3BB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1790</NamePositionX>
+					<NamePositionX>1815</NamePositionX>
 					<NamePositionY>963</NamePositionY>
 					<Points>
 						<Point>
-							<x>1966</x>
+							<x>2116</x>
 							<y>653</y>
 						</Point>
 						<Point>
-							<x>1966</x>
+							<x>2116</x>
 							<y>684</y>
 						</Point>
 						<Point>
-							<x>1811</x>
+							<x>1713</x>
 							<y>1405</y>
 						</Point>
 						<Point>
-							<x>1780</x>
+							<x>1682</x>
 							<y>1405</y>
 						</Point>
 					</Points>
@@ -58056,23 +57966,23 @@
 					<WorkSpaceShape2>
 						<Id>{7DD3FBD6-8AEC-43CA-8E72-02883BBE1F25}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3146</NamePositionX>
+					<NamePositionX>3052</NamePositionX>
 					<NamePositionY>1629</NamePositionY>
 					<Points>
 						<Point>
-							<x>3204</x>
+							<x>3170</x>
 							<y>1722</y>
 						</Point>
 						<Point>
-							<x>3204</x>
+							<x>3170</x>
 							<y>1691</y>
 						</Point>
 						<Point>
-							<x>3288</x>
+							<x>3134</x>
 							<y>1708</y>
 						</Point>
 						<Point>
-							<x>3288</x>
+							<x>3134</x>
 							<y>1677</y>
 						</Point>
 					</Points>
@@ -58099,15 +58009,15 @@
 					<WorkSpaceShape2>
 						<Id>{D1ACE1AA-97D9-454E-BE39-720F9DF575E7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2812</NamePositionX>
+					<NamePositionX>2756</NamePositionX>
 					<NamePositionY>778</NamePositionY>
 					<Points>
 						<Point>
-							<x>2870</x>
+							<x>2758</x>
 							<y>898</y>
 						</Point>
 						<Point>
-							<x>2901</x>
+							<x>2789</x>
 							<y>898</y>
 						</Point>
 						<Point>
@@ -58142,23 +58052,23 @@
 					<WorkSpaceShape2>
 						<Id>{31E28D6F-6572-44C1-8F5C-BD76876634A5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>695</NamePositionX>
+					<NamePositionX>645</NamePositionX>
 					<NamePositionY>1317</NamePositionY>
 					<Points>
 						<Point>
-							<x>698</x>
+							<x>630</x>
 							<y>1429</y>
 						</Point>
 						<Point>
-							<x>729</x>
+							<x>661</x>
 							<y>1429</y>
 						</Point>
 						<Point>
-							<x>860</x>
+							<x>830</x>
 							<y>1324</y>
 						</Point>
 						<Point>
-							<x>860</x>
+							<x>830</x>
 							<y>1293</y>
 						</Point>
 					</Points>
@@ -58185,24 +58095,24 @@
 					<WorkSpaceShape2>
 						<Id>{3059631C-7D36-4060-BFE0-75D91D3BE869}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>914</NamePositionX>
-					<NamePositionY>1847</NamePositionY>
+					<NamePositionX>714</NamePositionX>
+					<NamePositionY>1752</NamePositionY>
 					<Points>
 						<Point>
-							<x>1154</x>
+							<x>1092</x>
 							<y>1293</y>
 						</Point>
 						<Point>
-							<x>1154</x>
+							<x>1092</x>
 							<y>1324</y>
 						</Point>
 						<Point>
-							<x>874</x>
-							<y>2490</y>
+							<x>535</x>
+							<y>2301</y>
 						</Point>
 						<Point>
-							<x>843</x>
-							<y>2490</y>
+							<x>535</x>
+							<y>2332</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -58228,23 +58138,23 @@
 					<WorkSpaceShape2>
 						<Id>{3059631C-7D36-4060-BFE0-75D91D3BE869}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>341</NamePositionX>
+					<NamePositionX>244</NamePositionX>
 					<NamePositionY>2042</NamePositionY>
 					<Points>
 						<Point>
-							<x>420</x>
+							<x>380</x>
 							<y>1872</y>
 						</Point>
 						<Point>
-							<x>420</x>
+							<x>380</x>
 							<y>1903</y>
 						</Point>
 						<Point>
-							<x>462</x>
+							<x>308</x>
 							<y>2301</y>
 						</Point>
 						<Point>
-							<x>462</x>
+							<x>308</x>
 							<y>2332</y>
 						</Point>
 					</Points>
@@ -59706,7 +59616,7 @@
 			<Company>Technikum Wien</Company>
 			<Version>3.0</Version>
 			<CreatedDate>2009-04-17T10:15:21.000+01:00</CreatedDate>
-			<ModifiedDate>2014-01-27T14:25:09.651+01:00</ModifiedDate>
+			<ModifiedDate>2014-02-04T13:04:14.244+01:00</ModifiedDate>
 			<Project>FH-Complete 3.0</Project>
 			<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
 </Description>
@@ -86280,7 +86190,6 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 			<Relations>
 				<Id>{E13A6BA0-47AA-42FC-B9C6-7F50C7B570B6}</Id>
 				<Id>{EB8DB5AF-2BD5-4150-B5FF-DC12B140DA1B}</Id>
-				<Id>{C3A9B229-7C67-453F-A2BA-B5CD2247980A}</Id>
 			</Relations>
 			<Attributes>
 				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -86411,49 +86320,6 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
-				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
-					<Id>{8F323C44-5E0F-4800-85B9-1AE9348F1917}</Id>
-					<Name>lehrtyp_kurzbz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{98676B89-418E-43E6-8F3B-F15E405F7F7B}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<RNOffset>0</RNOffset>
-					<RNLength>0</RNLength>
-					<IgnoreNC>0</IgnoreNC>
-					<GenerateCode>1</GenerateCode>
-					<BeforeScript></BeforeScript>
-					<AfterScript></AfterScript>
-					<Notes></Notes>
-					<Comments></Comments>
-					<DataTypeParam1>32</DataTypeParam1>
-					<DataTypeParam2></DataTypeParam2>
-					<KeepForeignKey>0</KeepForeignKey>
-					<DefaultValue></DefaultValue>
-					<NotNull>0</NotNull>
-					<Migrated>1</Migrated>
-					<Caption>lehrtyp_kurzbz</Caption>
-					<Unique>0</Unique>
-					<OriginalName></OriginalName>
-					<CheckConstraint></CheckConstraint>
-					<CheckConstraintName></CheckConstraintName>
-					<KeyConstraintItems/>
-					<PKForeignKeys/>
-					<FKForeignKeys>
-						<Id>{97321E38-6580-4A9D-AF76-FD2C572C7A14}</Id>
-					</FKForeignKeys>
-					<DictType/>
-					<Domain/>
-					<DataType>
-						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
-					</DataType>
-					<UserDataType/>
-					<IndexItems/>
-					<Default/>
-					<CheckConstraints/>
-					<KeyConstraint/>
-					<ArrDims></ArrDims>
-					<IsArray>0</IsArray>
-				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -172092,7 +171958,6 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 			<Size>0</Size>
 			<Relations>
 				<Id>{058A42F3-0324-4572-9BD3-321F31B9C464}</Id>
-				<Id>{C3A9B229-7C67-453F-A2BA-B5CD2247980A}</Id>
 			</Relations>
 			<Attributes>
 				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -172125,7 +171990,6 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					</KeyConstraintItems>
 					<PKForeignKeys>
 						<Id>{F42CF052-9449-447C-9A34-5FB775E74A91}</Id>
-						<Id>{97321E38-6580-4A9D-AF76-FD2C572C7A14}</Id>
 					</PKForeignKeys>
 					<FKForeignKeys/>
 					<DictType/>
@@ -172217,13 +172081,11 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 							</Attribute>
 							<ForeignKeys>
 								<Id>{F42CF052-9449-447C-9A34-5FB775E74A91}</Id>
-								<Id>{97321E38-6580-4A9D-AF76-FD2C572C7A14}</Id>
 							</ForeignKeys>
 						</PERKeyConstraintItemPG83>
 					</KeyItems>
 					<Relations>
 						<Id>{058A42F3-0324-4572-9BD3-321F31B9C464}</Id>
-						<Id>{C3A9B229-7C67-453F-A2BA-B5CD2247980A}</Id>
 					</Relations>
 					<Attribute/>
 					<Tablespace/>
@@ -203388,64 +203250,6 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 			<MatchType>SIMPLE</MatchType>
 			<CreateIndexToFK>1</CreateIndexToFK>
 		</PERRelationPG83>
-		<PERRelationPG83 ObjectType="2004" CSAOName="PERRelationPG83">
-			<Id>{C3A9B229-7C67-453F-A2BA-B5CD2247980A}</Id>
-			<Name>fk_lehrform_lehrtyp</Name>
-			<Ordinal>0</Ordinal>
-			<HistoryID>{5449B48B-4040-4A0A-82C5-E801EA8296BF}</HistoryID>
-			<GlobalOrder>0</GlobalOrder>
-			<O1>
-				<Id>{B35A786D-7F08-445C-821F-47C9CB46A36C}</Id>
-			</O1>
-			<O2>
-				<Id>{902CBFB0-EE53-4FF3-8BB0-459F1175A1D5}</Id>
-			</O2>
-			<GenerateCode>1</GenerateCode>
-			<Comments></Comments>
-			<Notes></Notes>
-			<Identifying>0</Identifying>
-			<MandatoryParent>0</MandatoryParent>
-			<MandatoryChild>0</MandatoryChild>
-			<CardinalityChild>-1</CardinalityChild>
-			<InverseName></InverseName>
-			<Caption>fk_lehrform_lehrtyp</Caption>
-			<InverseCaption></InverseCaption>
-			<RefIntegrityParentUpdate>0</RefIntegrityParentUpdate>
-			<RefIntegrityParentDelete>0</RefIntegrityParentDelete>
-			<RefIntegrityChildUpdate>0</RefIntegrityChildUpdate>
-			<RefIntegrityChildInsert>0</RefIntegrityChildInsert>
-			<Key>
-				<Id>{08EB2361-EBC1-4FCD-9684-E685FBD26D7C}</Id>
-			</Key>
-			<ForeignKeys>
-				<PERForeignKeyPG83 ObjectType="2014" CSAOName="PERForeignKeyPG83">
-					<Id>{97321E38-6580-4A9D-AF76-FD2C572C7A14}</Id>
-					<Name>FK lehrtyp_kurzbz - lehrtyp_kurzbz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{85CDD6A0-EA6E-47EF-B832-5D849B3FBD38}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<GenerateCode>1</GenerateCode>
-					<BeforeScript></BeforeScript>
-					<AfterScript></AfterScript>
-					<Notes></Notes>
-					<Comments></Comments>
-					<AttrParent>
-						<Id>{B2CAE817-4EB7-436F-AC61-56AC3ED57FC9}</Id>
-					</AttrParent>
-					<AttrChild>
-						<Id>{8F323C44-5E0F-4800-85B9-1AE9348F1917}</Id>
-					</AttrChild>
-					<KeyConstraintItem>
-						<Id>{3214F66A-3BA9-4EE0-BAB3-52C758BABCA2}</Id>
-					</KeyConstraintItem>
-				</PERForeignKeyPG83>
-			</ForeignKeys>
-			<ToDoItems/>
-			<Deferred>0</Deferred>
-			<Deferrable>0</Deferrable>
-			<MatchType>SIMPLE</MatchType>
-			<CreateIndexToFK>1</CreateIndexToFK>
-		</PERRelationPG83>
 		<PERRelationPG83 ObjectType="2004" CSAOName="PERRelationPG83">
 			<Id>{3F9B3F1B-A1E2-4360-A4AE-D72B33EA82E7}</Id>
 			<Name>fk_studienordnung_semester_studiensemester</Name>