From e24ef40259c7dabcc506b165c3599701aef1cd45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 14 Apr 2011 08:29:43 +0000
Subject: [PATCH] =?UTF-8?q?Baumstruktur=20f=C3=BCr=20Dokumentenkategorien?=
 =?UTF-8?q?=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/FH-Complete.txp | 226 +++++++++++++++++++++++++++++++++++++++--
 system/checksystem.php |  15 ++-
 2 files changed, 231 insertions(+), 10 deletions(-)

diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index b2e3726b8..642a56455 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -8159,6 +8159,8 @@
 					<FullBackground>0</FullBackground>
 					<LineList>
 						<Id>{DF006C80-3200-4DFD-BA17-9A7CB8950FB9}</Id>
+						<Id>{72386A74-ABC9-4DFA-863B-A347AEBBE80B}</Id>
+						<Id>{72386A74-ABC9-4DFA-863B-A347AEBBE80B}</Id>
 					</LineList>
 					<DisplayIndexes>0</DisplayIndexes>
 					<AlignInColumns>0</AlignInColumns>
@@ -22892,15 +22894,15 @@
 						<Id>{BFDDE1D9-E065-41BE-B0CE-1F1BE440A785}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>7745</NamePositionX>
-					<NamePositionY>345</NamePositionY>
+					<NamePositionY>362</NamePositionY>
 					<Points>
 						<Point>
 							<x>7912</x>
-							<y>315</y>
+							<y>348</y>
 						</Point>
 						<Point>
 							<x>7881</x>
-							<y>315</y>
+							<y>348</y>
 						</Point>
 						<Point>
 							<x>7809</x>
@@ -22912,6 +22914,49 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
+				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
+					<Id>{72386A74-ABC9-4DFA-863B-A347AEBBE80B}</Id>
+					<Name>fk_dms_kategorie_dms_kategorie</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{FF1EE218-805C-42F2-A66C-6E819539AF13}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<ParentBaseID>{731A95F5-891C-428D-AB70-04D0424B3CAC}</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>{577ADD03-4F7D-4E06-93CF-EA771FA5F21B}</Id>
+					</WorkSpaceShape1>
+					<WorkSpaceShape2>
+						<Id>{577ADD03-4F7D-4E06-93CF-EA771FA5F21B}</Id>
+					</WorkSpaceShape2>
+					<NamePositionX>7812</NamePositionX>
+					<NamePositionY>232</NamePositionY>
+					<Points>
+						<Point>
+							<x>8307</x>
+							<y>315</y>
+						</Point>
+						<Point>
+							<x>8338</x>
+							<y>315</y>
+						</Point>
+						<Point>
+							<x>7881</x>
+							<y>282</y>
+						</Point>
+						<Point>
+							<x>7912</x>
+							<y>282</y>
+						</Point>
+					</Points>
+				</WorkSpaceLinePERRelationPG83>
 			</LineList>
 			<Page>
 				<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -33389,7 +33434,7 @@
 					<Top>185</Top>
 					<Left>7234</Left>
 					<z>0</z>
-					<Width>791</Width>
+					<Width>897</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -33398,6 +33443,8 @@
 					<FullBackground>1</FullBackground>
 					<LineList>
 						<Id>{780C12DE-5D77-4B7D-AB71-C372292BBC4B}</Id>
+						<Id>{1237216E-1E61-4C81-A8C6-ACD59A780B4A}</Id>
+						<Id>{1237216E-1E61-4C81-A8C6-ACD59A780B4A}</Id>
 					</LineList>
 					<DisplayIndexes>1</DisplayIndexes>
 					<AlignInColumns>1</AlignInColumns>
@@ -34518,15 +34565,15 @@
 					<WorkSpaceShape2>
 						<Id>{439F10E7-105D-47FC-AC0C-FC2E1B001559}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7529</NamePositionX>
+					<NamePositionX>7630</NamePositionX>
 					<NamePositionY>491</NamePositionY>
 					<Points>
 						<Point>
-							<x>7630</x>
+							<x>7832</x>
 							<y>385</y>
 						</Point>
 						<Point>
-							<x>7630</x>
+							<x>7832</x>
 							<y>416</y>
 						</Point>
 						<Point>
@@ -34539,6 +34586,61 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
+				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
+					<Id>{1237216E-1E61-4C81-A8C6-ACD59A780B4A}</Id>
+					<Name>fk_dms_kategorie_dms_kategorie</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{671F551B-C3BD-40AD-9868-A2A813AEBB95}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<ParentBaseID>{731A95F5-891C-428D-AB70-04D0424B3CAC}</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>{D199CFAB-9E94-4CC6-B40B-690A229BC9F4}</Id>
+					</WorkSpaceShape1>
+					<WorkSpaceShape2>
+						<Id>{D199CFAB-9E94-4CC6-B40B-690A229BC9F4}</Id>
+					</WorkSpaceShape2>
+					<NamePositionX>8275</NamePositionX>
+					<NamePositionY>376</NamePositionY>
+					<Points>
+						<Point>
+							<x>8131</x>
+							<y>285</y>
+						</Point>
+						<Point>
+							<x>8162</x>
+							<y>285</y>
+						</Point>
+						<Point>
+							<x>8162</x>
+							<y>285</y>
+						</Point>
+						<Point>
+							<x>8162</x>
+							<y>416</y>
+						</Point>
+						<Point>
+							<x>7533</x>
+							<y>416</y>
+						</Point>
+						<Point>
+							<x>7533</x>
+							<y>416</y>
+						</Point>
+						<Point>
+							<x>7533</x>
+							<y>385</y>
+						</Point>
+					</Points>
+				</WorkSpaceLinePERRelationPG83>
 			</LineList>
 			<Page>
 				<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -40989,8 +41091,8 @@
 			<Author>Systementwicklung</Author>
 			<Company>Technikum Wien</Company>
 			<Version>2.0</Version>
-			<CreatedDate>2009-04-17T10:15:21.000+01:00</CreatedDate>
-			<ModifiedDate>2011-03-24T16:06:30.630+01:00</ModifiedDate>
+			<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
+			<ModifiedDate>2011-04-12T13:52:57.450+02:00</ModifiedDate>
 			<Project>FH-Complete 2.0</Project>
 			<Description></Description>
 		</ModelTitlePG83>
@@ -130527,6 +130629,8 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 			<Size>0</Size>
 			<Relations>
 				<Id>{9A664AD5-0ED4-4C12-9942-706B3FF47906}</Id>
+				<Id>{731A95F5-891C-428D-AB70-04D0424B3CAC}</Id>
+				<Id>{731A95F5-891C-428D-AB70-04D0424B3CAC}</Id>
 			</Relations>
 			<Attributes>
 				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -130559,6 +130663,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					</KeyConstraintItems>
 					<PKForeignKeys>
 						<Id>{45D6608F-1D4C-4EF7-B119-AC58B4A4BE26}</Id>
+						<Id>{E709B261-A797-4EC0-92EB-AD51D4E89F28}</Id>
 					</PKForeignKeys>
 					<FKForeignKeys/>
 					<DictType/>
@@ -130656,6 +130761,49 @@ 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>{FB6A4A6C-1630-468A-84EA-8B42F519C408}</Id>
+					<Name>parent_kategorie_kurzbz</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{697E7778-C785-4332-9A7F-6770D3A6258B}</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>parent_kategorie_kurzbz</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys>
+						<Id>{E709B261-A797-4EC0-92EB-AD51D4E89F28}</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">
@@ -130691,11 +130839,13 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 							</Attribute>
 							<ForeignKeys>
 								<Id>{45D6608F-1D4C-4EF7-B119-AC58B4A4BE26}</Id>
+								<Id>{E709B261-A797-4EC0-92EB-AD51D4E89F28}</Id>
 							</ForeignKeys>
 						</PERKeyConstraintItemPG83>
 					</KeyItems>
 					<Relations>
 						<Id>{9A664AD5-0ED4-4C12-9942-706B3FF47906}</Id>
+						<Id>{731A95F5-891C-428D-AB70-04D0424B3CAC}</Id>
 					</Relations>
 					<Attribute/>
 					<Tablespace/>
@@ -150931,6 +151081,64 @@ 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>{731A95F5-891C-428D-AB70-04D0424B3CAC}</Id>
+			<Name>fk_dms_kategorie_dms_kategorie</Name>
+			<Ordinal>0</Ordinal>
+			<HistoryID>{5FFA653B-BFDA-4DBA-851E-DB18DA4DE6DC}</HistoryID>
+			<GlobalOrder>0</GlobalOrder>
+			<O1>
+				<Id>{A2D07E22-6009-40D8-9292-E22C5FF15CCA}</Id>
+			</O1>
+			<O2>
+				<Id>{A2D07E22-6009-40D8-9292-E22C5FF15CCA}</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_dms_kategorie_dms_kategorie</Caption>
+			<InverseCaption></InverseCaption>
+			<RefIntegrityParentUpdate>2</RefIntegrityParentUpdate>
+			<RefIntegrityParentDelete>1</RefIntegrityParentDelete>
+			<RefIntegrityChildUpdate>0</RefIntegrityChildUpdate>
+			<RefIntegrityChildInsert>0</RefIntegrityChildInsert>
+			<Key>
+				<Id>{A79F3C1F-29C9-41CF-9BF2-21D3D3714CE1}</Id>
+			</Key>
+			<ForeignKeys>
+				<PERForeignKeyPG83 ObjectType="2014" CSAOName="PERForeignKeyPG83">
+					<Id>{E709B261-A797-4EC0-92EB-AD51D4E89F28}</Id>
+					<Name>FK kategorie_kurzbz - parent_kategorie_kurzbz</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{CF866429-E4C3-4F0D-B5C0-3F3C8D26E820}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<AttrParent>
+						<Id>{4F47288B-1992-4E37-A8EB-BBCA1C7474FA}</Id>
+					</AttrParent>
+					<AttrChild>
+						<Id>{FB6A4A6C-1630-468A-84EA-8B42F519C408}</Id>
+					</AttrChild>
+					<KeyConstraintItem>
+						<Id>{9A1BC723-FACA-4DE6-9F7B-CAA974627DDB}</Id>
+					</KeyConstraintItem>
+				</PERForeignKeyPG83>
+			</ForeignKeys>
+			<ToDoItems/>
+			<Deferred>0</Deferred>
+			<Deferrable>0</Deferrable>
+			<MatchType>SIMPLE</MatchType>
+			<CreateIndexToFK>1</CreateIndexToFK>
+		</PERRelationPG83>
 	</Relations>
 	<Defaults/>
 	<Rules/>
diff --git a/system/checksystem.php b/system/checksystem.php
index 05cda4e65..b54e76a6e 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -2163,6 +2163,19 @@ if(!@$db->db_query("SELECT 1 FROM campus.tbl_dms LIMIT 1"))
 	else 
 		echo 'Tabelle campus.tbl_dms und campus.tbl_dms_kategorie hinzugefuegt!<br>';
 }
+// projektarbeit_note_anzeige zu tbl_studiengang hinzufuegen
+if(!@$db->db_query("SELECT parent_kategorie_kurzbz FROM campus.tbl_dms_kategorie LIMIT 1"))
+{
+	$qry = "
+	ALTER TABLE campus.tbl_dms_kategorie ADD COLUMN parent_kategorie_kurzbz varchar(32);
+	ALTER TABLE campus.tbl_dms_kategorie ADD CONSTRAINT fk_dms_kategorie_dms_kategorie FOREIGN KEY(parent_kategorie_kurzbz) REFERENCES campus.tbl_dms_kategorie (kategorie_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;	
+	";
+	
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_dms_kategorie: '.$db->db_last_error().'</strong><br>';
+	else 
+		echo 'Tabelle campus.tbl_dms_kategorie Spalte parent_kategorie_kurzbz hinzugefuegt!<br>';
+}
 echo '<br>';
 
 $tabellen=array(
@@ -2195,7 +2208,7 @@ $tabellen=array(
 	"campus.tbl_contentgruppe"  => array("content_id","gruppe_kurzbz","insertamum","insertvon"),
 	"campus.tbl_contentsprache"  => array("contentsprache_id","content_id","sprache","version","sichtbar","content","reviewvon","reviewamum","updateamum","updatevon","insertamum","insertvon"),
 	"campus.tbl_dms"  => array("dms_id","version","oe_kurzbz","dokument_kurzbz","kategorie_kurzbz","filename","mimetype","name","beschreibung","letzterzugriff","updateamum","updatevon","insertamum","insertvon"),
-	"campus.tbl_dms_kategorie"  => array("kategorie_kurzbz","bezeichnung","beschreibung"),
+	"campus.tbl_dms_kategorie"  => array("kategorie_kurzbz","bezeichnung","beschreibung","parent_kategorie_kurzbz"),
 	"campus.tbl_erreichbarkeit"  => array("erreichbarkeit_kurzbz","beschreibung","farbe"),
 	"campus.tbl_feedback"  => array("feedback_id","betreff","text","datum","uid","lehrveranstaltung_id","updateamum","updatevon","insertamum","insertvon"),
 	"campus.tbl_legesamtnote"  => array("student_uid","lehreinheit_id","note","benotungsdatum","updateamum","updatevon","insertamum","insertvon"),