From 49bb686d1e612de0675d15f729a4fa182dcff70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 23 Jul 2013 14:31:21 +0000
Subject: [PATCH] Zeitumstellungsbugfixes Im Semesterplan im Tempus wird die
 Woche 43 2x angezeigt und beginnt mit einem Sonntag

---
 config/cis.config-default.inc.php |    6 +-
 include/functions.inc.php         |   16 +-
 locale/de-AT/tempus.dtd           |    2 +-
 system/FH-Complete.txp            | 1082 +++++++----------------------
 4 files changed, 283 insertions(+), 823 deletions(-)

diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 4eaed41e5..7bfa9168d 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -141,10 +141,8 @@ define('MAIL_INTERNATIONAL_OUTGOING', 'invalid@technikum-wien.at');
 // ***** MOODLE *****
 // Moodle verwenden Ja/Nein
 define('MOODLE',true);
-// Pfad zum Moodle
-define('MOODLE_PATH','http://www.technikum-wien.at/moodle/');
-// Connection String fuer Moodle Datenbank (nur Posgresql)
-define("CONN_STRING_MOODLE","host=localhost dbname=bla user=bla password=bla");
+// Webservice TOKEN fuer Moodle 2.4
+define('MOODLE_TOKEN24','');
 
 // ***** OPUS *****
 // Angaben fuer OPUS Schnittstelle
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 1feca0448..e1792059c 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -201,7 +201,7 @@ function kalenderwoche($datum)
 {
 	//$woche=date("W",mktime($date[hours],$date[minutes],$date[seconds],$date[mon],$date[mday],$date[year]));
 	if (!date("w",$datum))
-		$datum+=86400;
+		$datum=strtotime("+1 day",$datum);
 	//echo date("l j.m.Y - W",$datum);
 	$woche=date("W",$datum);
 	//if ($woche==53)
@@ -219,10 +219,16 @@ function montag($datum)
 	$wt=date("w",$datum);
 	// Sonntag?
 	if (!$wt)
-		$wt++;
-	if($wt!=1)
-		$datum-=86400*($wt-1);
-
+	{
+		// Wenn es ein Sonntag ist, auf Montag springen
+		$datum=strtotime('+1 day',$datum);
+	}
+	else
+	{
+	
+		if($wt!=1)
+			$datum-=86400*($wt-1);
+	}
 	return $datum;
 }
 
diff --git a/locale/de-AT/tempus.dtd b/locale/de-AT/tempus.dtd
index 9ebdc7db8..887ffcf7a 100644
--- a/locale/de-AT/tempus.dtd
+++ b/locale/de-AT/tempus.dtd
@@ -1,5 +1,5 @@
 <!ENTITY window.title			"Tempus"> 
-<!ENTITY window.version			"2.0 vom 12.Feb.2007"> 
+<!ENTITY window.version			"2.0"> 
 
 
 <!ENTITY menu-file.label              	"Datei">
diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index 6b89458c6..388949965 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -36991,7 +36991,7 @@
 					<Top>73</Top>
 					<Left>2353</Left>
 					<z>0</z>
-					<Width>842</Width>
+					<Width>827</Width>
 					<Height>980</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -37856,7 +37856,7 @@
 					<WorkSpaceShape2>
 						<Id>{42BA0970-9A63-4935-AE74-39EB94DC4175}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2394</NamePositionX>
+					<NamePositionX>2393</NamePositionX>
 					<NamePositionY>1252</NamePositionY>
 					<Points>
 						<Point>
@@ -37876,11 +37876,11 @@
 							<y>1084</y>
 						</Point>
 						<Point>
-							<x>2521</x>
+							<x>2518</x>
 							<y>1084</y>
 						</Point>
 						<Point>
-							<x>2521</x>
+							<x>2518</x>
 							<y>1053</y>
 						</Point>
 					</Points>
@@ -38044,7 +38044,7 @@
 					<WorkSpaceShape2>
 						<Id>{42BA0970-9A63-4935-AE74-39EB94DC4175}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2078</NamePositionX>
+					<NamePositionX>2079</NamePositionX>
 					<NamePositionY>2464</NamePositionY>
 					<Points>
 						<Point>
@@ -38064,11 +38064,11 @@
 							<y>2305</y>
 						</Point>
 						<Point>
-							<x>2690</x>
+							<x>2684</x>
 							<y>1084</y>
 						</Point>
 						<Point>
-							<x>2690</x>
+							<x>2684</x>
 							<y>1053</y>
 						</Point>
 					</Points>
@@ -38095,15 +38095,15 @@
 					<WorkSpaceShape2>
 						<Id>{8AAB225E-78B9-4DF3-8DEA-33141001F169}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2855</NamePositionX>
-					<NamePositionY>1095</NamePositionY>
+					<NamePositionX>2852</NamePositionX>
+					<NamePositionY>1100</NamePositionY>
 					<Points>
 						<Point>
-							<x>3027</x>
+							<x>3015</x>
 							<y>1053</y>
 						</Point>
 						<Point>
-							<x>3027</x>
+							<x>3015</x>
 							<y>1084</y>
 						</Point>
 						<Point>
@@ -38453,14 +38453,14 @@
 						<Id>{3F01DD27-8A29-4794-9659-4E10B3F9DDBD}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2750</NamePositionX>
-					<NamePositionY>1560</NamePositionY>
+					<NamePositionY>1559</NamePositionY>
 					<Points>
 						<Point>
-							<x>2858</x>
+							<x>2849</x>
 							<y>1053</y>
 						</Point>
 						<Point>
-							<x>2858</x>
+							<x>2849</x>
 							<y>1084</y>
 						</Point>
 						<Point>
@@ -38503,15 +38503,15 @@
 					<WorkSpaceShape2>
 						<Id>{01128650-EDCC-4FD9-831B-C8152BFEDBB7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3306</NamePositionX>
-					<NamePositionY>562</NamePositionY>
+					<NamePositionX>3299</NamePositionX>
+					<NamePositionY>561</NamePositionY>
 					<Points>
 						<Point>
-							<x>3195</x>
+							<x>3180</x>
 							<y>563</y>
 						</Point>
 						<Point>
-							<x>3226</x>
+							<x>3211</x>
 							<y>563</y>
 						</Point>
 						<Point>
@@ -38967,7 +38967,7 @@
 					<Top>542</Top>
 					<Left>62</Left>
 					<z>0</z>
-					<Width>842</Width>
+					<Width>827</Width>
 					<Height>980</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -40374,11 +40374,11 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1187</Top>
+					<Top>1174</Top>
 					<Left>4175</Left>
 					<z>0</z>
 					<Width>744</Width>
-					<Height>239</Height>
+					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -40411,8 +40411,8 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1589</Top>
-					<Left>4179</Left>
+					<Top>1711</Top>
+					<Left>4181</Left>
 					<z>0</z>
 					<Width>744</Width>
 					<Height>200</Height>
@@ -41201,15 +41201,15 @@
 					<WorkSpaceShape2>
 						<Id>{02C6AC5B-AB84-4C4E-BD74-1AB3359C421B}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>937</NamePositionX>
+					<NamePositionX>930</NamePositionX>
 					<NamePositionY>1041</NamePositionY>
 					<Points>
 						<Point>
-							<x>904</x>
+							<x>889</x>
 							<y>1195</y>
 						</Point>
 						<Point>
-							<x>935</x>
+							<x>920</x>
 							<y>1195</y>
 						</Point>
 						<Point>
@@ -41244,15 +41244,15 @@
 					<WorkSpaceShape2>
 						<Id>{90A755D7-E5D6-4C64-86E8-507696C00BFA}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>999</NamePositionX>
+					<NamePositionX>991</NamePositionX>
 					<NamePositionY>659</NamePositionY>
 					<Points>
 						<Point>
-							<x>904</x>
+							<x>889</x>
 							<y>869</y>
 						</Point>
 						<Point>
-							<x>935</x>
+							<x>920</x>
 							<y>869</y>
 						</Point>
 						<Point>
@@ -41287,15 +41287,15 @@
 					<WorkSpaceShape2>
 						<Id>{EF55016E-E46B-4BE5-8E09-E8134DC1A8D1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>742</NamePositionX>
+					<NamePositionX>739</NamePositionX>
 					<NamePositionY>369</NamePositionY>
 					<Points>
 						<Point>
-							<x>483</x>
+							<x>476</x>
 							<y>542</y>
 						</Point>
 						<Point>
-							<x>483</x>
+							<x>476</x>
 							<y>511</y>
 						</Point>
 						<Point>
@@ -42202,24 +42202,24 @@
 					<WorkSpaceShape2>
 						<Id>{218B3815-BF6A-490B-B8CF-BB9BC3CBB4BC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4449</NamePositionX>
-					<NamePositionY>1448</NamePositionY>
+					<NamePositionX>4450</NamePositionX>
+					<NamePositionY>1600</NamePositionY>
 					<Points>
 						<Point>
-							<x>4551</x>
-							<y>1589</y>
+							<x>4553</x>
+							<y>1711</y>
 						</Point>
 						<Point>
-							<x>4551</x>
-							<y>1558</y>
+							<x>4553</x>
+							<y>1680</y>
 						</Point>
 						<Point>
 							<x>4547</x>
-							<y>1457</y>
+							<y>1639</y>
 						</Point>
 						<Point>
 							<x>4547</x>
-							<y>1426</y>
+							<y>1608</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -43067,7 +43067,7 @@
 					<Left>125</Left>
 					<z>0</z>
 					<Width>845</Width>
-					<Height>1214</Height>
+					<Height>1253</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43886,15 +43886,15 @@
 						<Id>{07671D5F-C98D-435D-9506-BEDB90120E11}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1079</NamePositionX>
-					<NamePositionY>2181</NamePositionY>
+					<NamePositionY>2191</NamePositionY>
 					<Points>
 						<Point>
 							<x>970</x>
-							<y>2517</y>
+							<y>2536</y>
 						</Point>
 						<Point>
 							<x>1001</x>
-							<y>2517</y>
+							<y>2536</y>
 						</Point>
 						<Point>
 							<x>1323</x>
@@ -44024,7 +44024,7 @@
 					<Left>2224</Left>
 					<z>0</z>
 					<Width>845</Width>
-					<Height>1214</Height>
+					<Height>1253</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -45021,7 +45021,7 @@
 						<Id>{F2B18445-FEE4-472E-A0E1-D4F5D1A67936}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1947</NamePositionX>
-					<NamePositionY>2020</NamePositionY>
+					<NamePositionY>2030</NamePositionY>
 					<Points>
 						<Point>
 							<x>1967</x>
@@ -45033,11 +45033,11 @@
 						</Point>
 						<Point>
 							<x>2193</x>
-							<y>1892</y>
+							<y>1912</y>
 						</Point>
 						<Point>
 							<x>2224</x>
-							<y>1892</y>
+							<y>1912</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -45064,7 +45064,7 @@
 						<Id>{F2B18445-FEE4-472E-A0E1-D4F5D1A67936}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3067</NamePositionX>
-					<NamePositionY>1839</NamePositionY>
+					<NamePositionY>1852</NamePositionY>
 					<Points>
 						<Point>
 							<x>3319</x>
@@ -45076,11 +45076,11 @@
 						</Point>
 						<Point>
 							<x>3100</x>
-							<y>2094</y>
+							<y>2120</y>
 						</Point>
 						<Point>
 							<x>3069</x>
-							<y>2094</y>
+							<y>2120</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -45537,7 +45537,7 @@
 						<Id>{F2B18445-FEE4-472E-A0E1-D4F5D1A67936}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3151</NamePositionX>
-					<NamePositionY>1417</NamePositionY>
+					<NamePositionY>1424</NamePositionY>
 					<Points>
 						<Point>
 							<x>3295</x>
@@ -45549,11 +45549,11 @@
 						</Point>
 						<Point>
 							<x>3100</x>
-							<y>1690</y>
+							<y>1703</y>
 						</Point>
 						<Point>
 							<x>3069</x>
-							<y>1690</y>
+							<y>1703</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -50023,9 +50023,6 @@
 					<FullBackground>0</FullBackground>
 					<LineList>
 						<Id>{04797FD9-0CD7-43CE-A88B-46E8004CE350}</Id>
-						<Id>{36774CB8-2DEA-4143-96B2-050A242A2190}</Id>
-						<Id>{D153424E-9E0B-4FB0-8F0F-7E3D71562B89}</Id>
-						<Id>{DDDBECD9-8C3E-4251-BC3E-6E41F0F39550}</Id>
 						<Id>{3F70B3B5-44FA-4C8D-B707-79E3DB8CA863}</Id>
 						<Id>{B3AD4148-96B4-49B8-9B91-22B610414DC6}</Id>
 						<Id>{86A66DEA-0F76-4ADE-AAF1-328BD7112A32}</Id>
@@ -50039,119 +50036,6 @@
 					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
 					<Gradient>1</Gradient>
 				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{918B440D-C9FE-4C66-9BEA-18D6814D211D}</Id>
-					<Name>tbl_projekt</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{8752A114-354A-40FD-90B5-F7EC1A2A3C0A}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{4D39CCFB-84BC-4F12-A922-B781943C31B3}</ParentBaseID>
-					<PenWidth>1</PenWidth>
-					<PenColor>0</PenColor>
-					<BrushColor>16711935</BrushColor>
-					<FontCharset>238</FontCharset>
-					<FontColor>0</FontColor>
-					<FontName>Arial</FontName>
-					<FontStyle>0</FontStyle>
-					<FormatLocked>0</FormatLocked>
-					<FontHeight>-28</FontHeight>
-					<Top>766</Top>
-					<Left>2411</Left>
-					<z>0</z>
-					<Width>658</Width>
-					<Height>395</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{36774CB8-2DEA-4143-96B2-050A242A2190}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{9C283DC1-D953-4571-B27A-22E0518BA68C}</Id>
-					<Name>tbl_projektphase</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{3EE1FAA0-311A-4E3F-8AF7-A7050937A6FE}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{3AB4277B-A321-447D-B052-5D3FC63BE7F2}</ParentBaseID>
-					<PenWidth>1</PenWidth>
-					<PenColor>0</PenColor>
-					<BrushColor>16711935</BrushColor>
-					<FontCharset>238</FontCharset>
-					<FontColor>0</FontColor>
-					<FontName>Arial</FontName>
-					<FontStyle>0</FontStyle>
-					<FormatLocked>0</FormatLocked>
-					<FontHeight>-28</FontHeight>
-					<Top>1227</Top>
-					<Left>2359</Left>
-					<z>0</z>
-					<Width>659</Width>
-					<Height>590</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{D153424E-9E0B-4FB0-8F0F-7E3D71562B89}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7}</Id>
-					<Name>tbl_projekttask</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{78DB9F12-E938-43D9-98BB-BB238104033D}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{C5F36B02-0EF1-444A-8BAE-6C67957E8673}</ParentBaseID>
-					<PenWidth>1</PenWidth>
-					<PenColor>0</PenColor>
-					<BrushColor>16711935</BrushColor>
-					<FontCharset>238</FontCharset>
-					<FontColor>0</FontColor>
-					<FontName>Arial</FontName>
-					<FontStyle>0</FontStyle>
-					<FormatLocked>0</FormatLocked>
-					<FontHeight>-28</FontHeight>
-					<Top>1915</Top>
-					<Left>2311</Left>
-					<z>0</z>
-					<Width>672</Width>
-					<Height>590</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{DDDBECD9-8C3E-4251-BC3E-6E41F0F39550}</Id>
-						<Id>{AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E}</Id>
-						<Id>{AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
 				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
 					<Id>{950941FE-7219-4043-82FD-8E6AE76BD8A7}</Id>
 					<Name>tbl_benutzer</Name>
@@ -50219,7 +50103,6 @@
 					<FullBackground>0</FullBackground>
 					<LineList>
 						<Id>{B3AD4148-96B4-49B8-9B91-22B610414DC6}</Id>
-						<Id>{29BA5F2B-0D81-4FF3-9A35-D5AA42FEF8F0}</Id>
 					</LineList>
 					<DisplayIndexes>1</DisplayIndexes>
 					<AlignInColumns>1</AlignInColumns>
@@ -50249,7 +50132,7 @@
 					<Left>59</Left>
 					<z>0</z>
 					<Width>845</Width>
-					<Height>1214</Height>
+					<Height>1253</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -50359,196 +50242,6 @@
 					<FullBackground>0</FullBackground>
 					<LineList/>
 				</WorkSpaceShapeNotePG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{B06EDF5A-6F92-4A38-A1BF-4D65F443A661}</Id>
-					<Name>tbl_moodle_version</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{7226BA22-B842-4A37-A297-D2707DF7E468}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{01F05CFC-8356-41B6-8FFC-48C174B10CFE}</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>
-					<Top>3400</Top>
-					<Left>4645</Left>
-					<z>0</z>
-					<Width>672</Width>
-					<Height>200</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList/>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{1A2E8E64-6771-45B4-91C4-3B0FCC7ADE1D}</Id>
-					<Name>tbl_kompetenz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{8B571CC9-EB1F-48F9-A2A3-AE5C278D0A4C}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{35F3B1A5-EBEE-42BD-84B5-70B6E51D4A50}</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>
-					<Top>658</Top>
-					<Left>1887</Left>
-					<z>0</z>
-					<Width>858</Width>
-					<Height>473</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{B72218BD-9542-41D0-8913-51CFA7510C57}</Id>
-						<Id>{524DBF9B-DF87-448B-92FF-65DAE080009F}</Id>
-						<Id>{29BA5F2B-0D81-4FF3-9A35-D5AA42FEF8F0}</Id>
-						<Id>{A9A3F683-F7C2-42A0-AF37-5AFB8A591E8E}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{6EF5CE3B-BE21-4E92-BD16-8B23D555451E}</Id>
-					<Name>tbl_kompetenztyp</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{F001A1EF-6E11-4C1C-9EF6-314DBD244901}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{8F3B3794-6935-42D8-9839-1AEB33CB3160}</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>
-					<Top>266</Top>
-					<Left>1361</Left>
-					<z>0</z>
-					<Width>780</Width>
-					<Height>200</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{89ED4B2A-AC97-4486-BB6B-9F24AFF9628D}</Id>
-						<Id>{89ED4B2A-AC97-4486-BB6B-9F24AFF9628D}</Id>
-						<Id>{B72218BD-9542-41D0-8913-51CFA7510C57}</Id>
-						<Id>{14554542-92DE-4CD1-9E46-788A764B74AF}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{41ECB5F0-6031-464D-9B1E-AE3EE92A9492}</Id>
-					<Name>tbl_kompetenzerwerbstyp</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{533B26B0-9F27-4BA5-AE18-34F09CBAD260}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{734D9B26-42BC-4A0E-B888-9E9472085103}</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>
-					<Top>778</Top>
-					<Left>1530</Left>
-					<z>0</z>
-					<Width>858</Width>
-					<Height>200</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{524DBF9B-DF87-448B-92FF-65DAE080009F}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
-				<WorkSpaceShapePEREntityPG83 ObjectType="2502" CSAOName="WorkSpaceShapePEREntityPG83">
-					<Id>{4E0ECB53-3491-4E3D-980A-1A647A46D590}</Id>
-					<Name>tbl_kompetenzniveaustufe</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{ACDF0EB9-D88E-4812-B4E8-BE2E44C0547E}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{6893C569-147B-406F-857E-70D36071B417}</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>
-					<Top>364</Top>
-					<Left>3099</Left>
-					<z>0</z>
-					<Width>778</Width>
-					<Height>200</Height>
-					<dz>0</dz>
-					<RecalculateSizes>1</RecalculateSizes>
-					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
-					<Shadow>1</Shadow>
-					<FullBackground>0</FullBackground>
-					<LineList>
-						<Id>{14554542-92DE-4CD1-9E46-788A764B74AF}</Id>
-						<Id>{A9A3F683-F7C2-42A0-AF37-5AFB8A591E8E}</Id>
-					</LineList>
-					<DisplayIndexes>1</DisplayIndexes>
-					<AlignInColumns>1</AlignInColumns>
-					<DisplayMode>5</DisplayMode>
-					<DisplayTypes>1</DisplayTypes>
-					<DisplayDictTypesAsDataTypes>0</DisplayDictTypesAsDataTypes>
-					<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
-					<Gradient>1</Gradient>
-				</WorkSpaceShapePEREntityPG83>
 			</ShapeList>
 			<LineList>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
@@ -50680,135 +50373,6 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{36774CB8-2DEA-4143-96B2-050A242A2190}</Id>
-					<Name>fk_notizzuordnung_projekt</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{5A5B2B15-84BB-45E8-8C55-E17E0238862F}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{3BF7C90B-0CBD-49E5-810C-57F6E34BA270}</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>{918B440D-C9FE-4C66-9BEA-18D6814D211D}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>1991</NamePositionX>
-					<NamePositionY>778</NamePositionY>
-					<Points>
-						<Point>
-							<x>2411</x>
-							<y>964</y>
-						</Point>
-						<Point>
-							<x>2380</x>
-							<y>964</y>
-						</Point>
-						<Point>
-							<x>1995</x>
-							<y>901</y>
-						</Point>
-						<Point>
-							<x>1964</x>
-							<y>901</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{D153424E-9E0B-4FB0-8F0F-7E3D71562B89}</Id>
-					<Name>fk_notizzuordnung_projektphase</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{4FFACF14-227C-4942-9EA5-B2B3B048C60B}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{9A202DD9-9963-4507-AC29-6045267F53C3}</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>{9C283DC1-D953-4571-B27A-22E0518BA68C}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>2129</NamePositionX>
-					<NamePositionY>1128</NamePositionY>
-					<Points>
-						<Point>
-							<x>2359</x>
-							<y>1522</y>
-						</Point>
-						<Point>
-							<x>2328</x>
-							<y>1522</y>
-						</Point>
-						<Point>
-							<x>1995</x>
-							<y>1059</y>
-						</Point>
-						<Point>
-							<x>1964</x>
-							<y>1059</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{DDDBECD9-8C3E-4251-BC3E-6E41F0F39550}</Id>
-					<Name>fk_notizzuordnung_projekttask</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{AEB2EA43-54D5-43F8-8AC0-BC7240603570}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{118D0D46-FEE9-4F42-A9F4-7CA65B7549C4}</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>{BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>2407</NamePositionX>
-					<NamePositionY>1550</NamePositionY>
-					<Points>
-						<Point>
-							<x>2647</x>
-							<y>1915</y>
-						</Point>
-						<Point>
-							<x>2647</x>
-							<y>1884</y>
-						</Point>
-						<Point>
-							<x>1995</x>
-							<y>980</y>
-						</Point>
-						<Point>
-							<x>1964</x>
-							<y>980</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{3F70B3B5-44FA-4C8D-B707-79E3DB8CA863}</Id>
 					<Name>fk_notizzuordnung_benutzer</Name>
@@ -50832,7 +50396,7 @@
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2084</NamePositionX>
-					<NamePositionY>568</NamePositionY>
+					<NamePositionY>627</NamePositionY>
 					<Points>
 						<Point>
 							<x>2404</x>
@@ -50844,11 +50408,11 @@
 						</Point>
 						<Point>
 							<x>1995</x>
-							<y>822</y>
+							<y>940</y>
 						</Point>
 						<Point>
 							<x>1964</x>
-							<y>822</y>
+							<y>940</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -50874,15 +50438,15 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1452</NamePositionX>
+					<NamePositionX>1520</NamePositionX>
 					<NamePositionY>1136</NamePositionY>
 					<Points>
 						<Point>
-							<x>1486</x>
+							<x>1620</x>
 							<y>1254</y>
 						</Point>
 						<Point>
-							<x>1486</x>
+							<x>1620</x>
 							<y>1223</y>
 						</Point>
 						<Point>
@@ -50981,319 +50545,6 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E}</Id>
-					<Name>fk_projekttask_projekttask</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{E9F3CD10-574C-4834-B39C-CE0F2D83AE49}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{D69BE2AE-BFF7-4513-9BFD-5DFB4279856F}</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>{BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>3056</NamePositionX>
-					<NamePositionY>2516</NamePositionY>
-					<Points>
-						<Point>
-							<x>2983</x>
-							<y>2210</y>
-						</Point>
-						<Point>
-							<x>3014</x>
-							<y>2210</y>
-						</Point>
-						<Point>
-							<x>3014</x>
-							<y>2210</y>
-						</Point>
-						<Point>
-							<x>3014</x>
-							<y>2536</y>
-						</Point>
-						<Point>
-							<x>2647</x>
-							<y>2536</y>
-						</Point>
-						<Point>
-							<x>2647</x>
-							<y>2536</y>
-						</Point>
-						<Point>
-							<x>2647</x>
-							<y>2505</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{89ED4B2A-AC97-4486-BB6B-9F24AFF9628D}</Id>
-					<Name>fk_kompetenztyp_kompetenztyp_parent_id</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{B724FD90-9AF5-4180-B854-EC211D52B427}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{606C0C21-16AF-48C3-81AB-8C8D62692B1B}</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>{6EF5CE3B-BE21-4E92-BD16-8B23D555451E}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{6EF5CE3B-BE21-4E92-BD16-8B23D555451E}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>1277</NamePositionX>
-					<NamePositionY>291</NamePositionY>
-					<Points>
-						<Point>
-							<x>1361</x>
-							<y>366</y>
-						</Point>
-						<Point>
-							<x>1330</x>
-							<y>366</y>
-						</Point>
-						<Point>
-							<x>2172</x>
-							<y>316</y>
-						</Point>
-						<Point>
-							<x>2141</x>
-							<y>316</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{B72218BD-9542-41D0-8913-51CFA7510C57}</Id>
-					<Name>fk_kompetenztyp_kompetenz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{19E69004-DB97-4C8A-9C56-D0C11090D7CE}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{60EF3961-E462-4A4C-9DB5-DB06B1FC15F4}</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>{6EF5CE3B-BE21-4E92-BD16-8B23D555451E}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{1A2E8E64-6771-45B4-91C4-3B0FCC7ADE1D}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>2144</NamePositionX>
-					<NamePositionY>461</NamePositionY>
-					<Points>
-						<Point>
-							<x>2141</x>
-							<y>416</y>
-						</Point>
-						<Point>
-							<x>2172</x>
-							<y>416</y>
-						</Point>
-						<Point>
-							<x>2316</x>
-							<y>627</y>
-						</Point>
-						<Point>
-							<x>2316</x>
-							<y>658</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{524DBF9B-DF87-448B-92FF-65DAE080009F}</Id>
-					<Name>fk_kompetenzerwerbstyp_kompetenz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{E06A10B5-13B3-4D19-B394-FF1269B3FB84}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{9ECE64C1-5D5B-4D1F-B77E-016E24589CFF}</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>{41ECB5F0-6031-464D-9B1E-AE3EE92A9492}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{1A2E8E64-6771-45B4-91C4-3B0FCC7ADE1D}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>1807</NamePositionX>
-					<NamePositionY>721</NamePositionY>
-					<Points>
-						<Point>
-							<x>1959</x>
-							<y>778</y>
-						</Point>
-						<Point>
-							<x>1959</x>
-							<y>747</y>
-						</Point>
-						<Point>
-							<x>1856</x>
-							<y>816</y>
-						</Point>
-						<Point>
-							<x>1887</x>
-							<y>816</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{29BA5F2B-0D81-4FF3-9A35-D5AA42FEF8F0}</Id>
-					<Name>fk_person_kompetenz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{FBBF3969-E705-4F35-9B19-624029E7FBF9}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{53EE4EF8-4CE8-4B6B-A2F2-B9A06C743F2E}</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>{B3BD3AE7-06B6-49E4-AFB1-38823A1C018E}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{1A2E8E64-6771-45B4-91C4-3B0FCC7ADE1D}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>1705</NamePositionX>
-					<NamePositionY>1038</NamePositionY>
-					<Points>
-						<Point>
-							<x>1755</x>
-							<y>1254</y>
-						</Point>
-						<Point>
-							<x>1755</x>
-							<y>1223</y>
-						</Point>
-						<Point>
-							<x>1856</x>
-							<y>973</y>
-						</Point>
-						<Point>
-							<x>1887</x>
-							<y>973</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{14554542-92DE-4CD1-9E46-788A764B74AF}</Id>
-					<Name>fk_kompetenztyp_niveaustufe</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{9F916A80-D44A-4494-8665-A9458BDAC257}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{FAB7F614-16D6-4114-94D9-25BA6BA762AA}</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>{6EF5CE3B-BE21-4E92-BD16-8B23D555451E}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{4E0ECB53-3491-4E3D-980A-1A647A46D590}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>2520</NamePositionX>
-					<NamePositionY>338</NamePositionY>
-					<Points>
-						<Point>
-							<x>2141</x>
-							<y>366</y>
-						</Point>
-						<Point>
-							<x>2172</x>
-							<y>366</y>
-						</Point>
-						<Point>
-							<x>3068</x>
-							<y>431</y>
-						</Point>
-						<Point>
-							<x>3099</x>
-							<y>431</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
-				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
-					<Id>{A9A3F683-F7C2-42A0-AF37-5AFB8A591E8E}</Id>
-					<Name>fk_kompetenzniveaustufe_kompetenz</Name>
-					<Ordinal>0</Ordinal>
-					<HistoryID>{5B447052-CAA7-485C-9742-4629C0799CFD}</HistoryID>
-					<GlobalOrder>0</GlobalOrder>
-					<ParentBaseID>{8D94278E-72E9-4B16-97AF-3A97F79813D7}</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>{4E0ECB53-3491-4E3D-980A-1A647A46D590}</Id>
-					</WorkSpaceShape1>
-					<WorkSpaceShape2>
-						<Id>{1A2E8E64-6771-45B4-91C4-3B0FCC7ADE1D}</Id>
-					</WorkSpaceShape2>
-					<NamePositionX>2822</NamePositionX>
-					<NamePositionY>635</NamePositionY>
-					<Points>
-						<Point>
-							<x>3099</x>
-							<y>497</y>
-						</Point>
-						<Point>
-							<x>3068</x>
-							<y>497</y>
-						</Point>
-						<Point>
-							<x>2776</x>
-							<y>894</y>
-						</Point>
-						<Point>
-							<x>2745</x>
-							<y>894</y>
-						</Point>
-					</Points>
-				</WorkSpaceLinePERRelationPG83>
 			</LineList>
 			<Page>
 				<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -52524,7 +51775,7 @@
 			<Company>Technikum Wien</Company>
 			<Version>2.0</Version>
 			<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
-			<ModifiedDate>2013-06-28T09:48:45.638+02:00</ModifiedDate>
+			<ModifiedDate>2013-07-04T10:07:37.168+02:00</ModifiedDate>
 			<Project>FH-Complete 2.0</Project>
 			<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
 </Description>
@@ -76066,7 +75317,7 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 					<AfterScript></AfterScript>
 					<Notes></Notes>
 					<Comments></Comments>
-					<DataTypeParam1>255</DataTypeParam1>
+					<DataTypeParam1></DataTypeParam1>
 					<DataTypeParam2></DataTypeParam2>
 					<KeepForeignKey>0</KeepForeignKey>
 					<DefaultValue></DefaultValue>
@@ -76083,7 +75334,7 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 					<DictType/>
 					<Domain/>
 					<DataType>
-						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
+						<Id>{8D91E2A4-12F5-40E3-BAC2-BFCF7BE1C8B7}</Id>
 					</DataType>
 					<UserDataType/>
 					<IndexItems/>
@@ -151174,6 +150425,211 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{A987B00D-B8FF-4261-A19E-C7B8819F75D2}</Id>
+					<Name>bezeichnung</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{20A917CF-39B2-4F88-9028-C7AC77909FC3}</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>256</DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>bezeichnung</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{A7C29F45-30DC-4F9B-BAC7-D90380201135}</Id>
+					<Name>insertamum</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{F4D3F137-EFBA-46F5-BD4F-76ED1E100605}</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></DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>insertamum</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{342E3F36-138D-40F7-B1B2-D9489C848835}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{3A00196D-982C-4D4D-B63D-7DE1CC4FADED}</Id>
+					<Name>insertvon</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{48B3CCA0-A553-4E88-AAE9-7401793DEBDB}</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>0</Migrated>
+					<Caption>insertvon</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{1CE35305-B05F-4510-A789-60327A4DAA98}</Id>
+					<Name>updateamum</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{3BFB7809-36FF-4782-A077-9310637CC61F}</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></DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>updateamum</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{342E3F36-138D-40F7-B1B2-D9489C848835}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{FFE76FF7-1CE6-4085-AEC6-8DA53CE18ABC}</Id>
+					<Name>updatevon</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{DFB56C52-88E6-4FEB-8AE7-047FCFFF5A85}</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>0</Migrated>
+					<Caption>updatevon</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<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">