blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 22:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Andreas Österreicher
2011-09-02 10:12:32 +00:00
parent fc58322759
commit 2eb4716b03
2 changed files with 223 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/FH-Complete.txp
+209 -17
View File
@@ -3901,6 +3901,7 @@
<Id>{DE5B2948-B895-4FBC-B878-EBB0C9BEC73D}</Id>
<Id>{49027B25-09CC-4431-B85A-4CCC66BBDE26}</Id>
<Id>{58905E41-1AC0-453E-8243-935FFD3A2130}</Id>
<Id>{5DF5714C-18FE-453A-B153-8E44EADF1BEF}</Id>
</LineList>
<DisplayIndexes>0</DisplayIndexes>
<AlignInColumns>0</AlignInColumns>
@@ -8553,6 +8554,7 @@
<Id>{D83344F4-0D22-417A-85B0-97CE73CDBB0D}</Id>
<Id>{C8B4A954-7FD6-4D01-8D12-EAD41E69DA87}</Id>
<Id>{DAE341F3-42E8-4624-AEBC-0D42E1FB8135}</Id>
<Id>{5DF5714C-18FE-453A-B153-8E44EADF1BEF}</Id>
</LineList>
<DisplayIndexes>0</DisplayIndexes>
<AlignInColumns>0</AlignInColumns>
@@ -11382,15 +11384,15 @@
<Id>{50220A2A-BBD0-4DE9-8DE1-B2496ECC6CDA}</Id>
</WorkSpaceShape2>
<NamePositionX>6963</NamePositionX>
<NamePositionY>222</NamePositionY>
<NamePositionY>213</NamePositionY>
<Points>
<Point>
<x>7068</x>
<y>297</y>
<y>280</y>
</Point>
<Point>
<x>7037</x>
<y>297</y>
<y>280</y>
</Point>
<Point>
<x>6889</x>
@@ -11425,15 +11427,15 @@
<Id>{5CED5E9D-4BA0-4F43-A3AB-B7EBEE88F768}</Id>
</WorkSpaceShape2>
<NamePositionX>6900</NamePositionX>
<NamePositionY>391</NamePositionY>
<NamePositionY>374</NamePositionY>
<Points>
<Point>
<x>7068</x>
<y>363</y>
<y>330</y>
</Point>
<Point>
<x>7037</x>
<y>363</y>
<y>330</y>
</Point>
<Point>
<x>6762</x>
@@ -24741,7 +24743,7 @@
<Id>{B0476B48-78A0-4D12-893E-2791924C2BF4}</Id>
</WorkSpaceShape2>
<NamePositionX>7465</NamePositionX>
<NamePositionY>1688</NamePositionY>
<NamePositionY>1704</NamePositionY>
<Points>
<Point>
<x>11692</x>
@@ -24753,11 +24755,11 @@
</Point>
<Point>
<x>3468</x>
<y>2655</y>
<y>2688</y>
</Point>
<Point>
<x>3437</x>
<y>2655</y>
<y>2688</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -24847,6 +24849,49 @@
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
<Id>{5DF5714C-18FE-453A-B153-8E44EADF1BEF}</Id>
<Name>fk_funktion_projekt_ressource</Name>
<Ordinal>0</Ordinal>
<HistoryID>{39FA9EA3-6327-491D-9D55-E7E1D98C8B60}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<ParentBaseID>{20AC4107-11B8-494D-AF7C-5FE2394ACA61}</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>{443FF2A1-5243-4D2D-B198-C3F571BF8960}</Id>
</WorkSpaceShape1>
<WorkSpaceShape2>
<Id>{B0476B48-78A0-4D12-893E-2791924C2BF4}</Id>
</WorkSpaceShape2>
<NamePositionX>5153</NamePositionX>
<NamePositionY>1441</NamePositionY>
<Points>
<Point>
<x>7068</x>
<y>380</y>
</Point>
<Point>
<x>7037</x>
<y>380</y>
</Point>
<Point>
<x>3468</x>
<y>2622</y>
</Point>
<Point>
<x>3437</x>
<y>2622</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
</LineList>
<Page>
<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -43608,7 +43653,7 @@
<Left>1232</Left>
<z>0</z>
<Width>871</Width>
<Height>200</Height>
<Height>278</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44137,7 +44182,7 @@
<Id>{05D38B22-230A-490A-AE08-48BD19868B8F}</Id>
</WorkSpaceShape2>
<NamePositionX>940</NamePositionX>
<NamePositionY>1477</NamePositionY>
<NamePositionY>1490</NamePositionY>
<Points>
<Point>
<x>848</x>
@@ -44149,11 +44194,11 @@
</Point>
<Point>
<x>1201</x>
<y>2057</y>
<y>2083</y>
</Point>
<Point>
<x>1232</x>
<y>2057</y>
<y>2083</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -44223,7 +44268,7 @@
<Id>{05D38B22-230A-490A-AE08-48BD19868B8F}</Id>
</WorkSpaceShape2>
<NamePositionX>971</NamePositionX>
<NamePositionY>2068</NamePositionY>
<NamePositionY>2094</NamePositionY>
<Points>
<Point>
<x>910</x>
@@ -44235,11 +44280,11 @@
</Point>
<Point>
<x>1201</x>
<y>2123</y>
<y>2175</y>
</Point>
<Point>
<x>1232</x>
<y>2123</y>
<y>2175</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -45542,7 +45587,7 @@
<Company>Technikum Wien</Company>
<Version>2.0</Version>
<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
<ModifiedDate>2011-09-02T10:34:24.276+02:00</ModifiedDate>
<ModifiedDate>2011-09-02T12:06:04.131+02:00</ModifiedDate>
<Project>FH-Complete 2.0</Project>
<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
</Description>
@@ -93018,6 +93063,7 @@ art=tbl_benutzerrolle.art &amp; tbl_rolleberechtigung.art</Comments>
<Id>{BFF8DC01-7A00-4048-BCF0-B960B4F5BDE0}</Id>
<Id>{6921DD6F-8C19-470D-A999-1E187CB4A53B}</Id>
<Id>{5C7D1E4F-53CF-43F1-8617-F3D78009EF9E}</Id>
<Id>{20AC4107-11B8-494D-AF7C-5FE2394ACA61}</Id>
</Relations>
<Attributes>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -93052,6 +93098,7 @@ art=tbl_benutzerrolle.art &amp; tbl_rolleberechtigung.art</Comments>
<Id>{A3CC46AC-33AA-4963-BF7C-770401887EF3}</Id>
<Id>{0D39C3A3-7B72-4BC6-ACB3-5A49D530F6B8}</Id>
<Id>{69314C08-52BB-4C70-BEA3-7BF48D863008}</Id>
<Id>{19A0ADFE-9C6E-4F76-B0FD-9E2CB294C946}</Id>
</PKForeignKeys>
<FKForeignKeys/>
<DictType/>
@@ -93268,6 +93315,7 @@ art=tbl_benutzerrolle.art &amp; tbl_rolleberechtigung.art</Comments>
<Id>{A3CC46AC-33AA-4963-BF7C-770401887EF3}</Id>
<Id>{0D39C3A3-7B72-4BC6-ACB3-5A49D530F6B8}</Id>
<Id>{69314C08-52BB-4C70-BEA3-7BF48D863008}</Id>
<Id>{19A0ADFE-9C6E-4F76-B0FD-9E2CB294C946}</Id>
</ForeignKeys>
</PERKeyConstraintItemPG83>
</KeyItems>
@@ -93275,6 +93323,7 @@ art=tbl_benutzerrolle.art &amp; tbl_rolleberechtigung.art</Comments>
<Id>{BFF8DC01-7A00-4048-BCF0-B960B4F5BDE0}</Id>
<Id>{6921DD6F-8C19-470D-A999-1E187CB4A53B}</Id>
<Id>{5C7D1E4F-53CF-43F1-8617-F3D78009EF9E}</Id>
<Id>{20AC4107-11B8-494D-AF7C-5FE2394ACA61}</Id>
</Relations>
<Attribute/>
<Tablespace/>
@@ -140376,6 +140425,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<Id>{9029E340-B263-4F28-9BCD-EF0FB41EC18A}</Id>
<Id>{05E0FA7B-C6ED-45C4-B5F2-F83495CFD2B1}</Id>
<Id>{664F07EE-51D2-4DCB-BF2A-6DCD96E59C1F}</Id>
<Id>{20AC4107-11B8-494D-AF7C-5FE2394ACA61}</Id>
</Relations>
<Attributes>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -140550,6 +140600,90 @@ 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>{3B1FF306-F748-4D04-BC59-73285DB792DD}</Id>
<Name>funktion_kurzbz</Name>
<Ordinal>0</Ordinal>
<HistoryID>{6E6E005F-27B5-4E89-9E01-9D01740063DD}</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>16</DataTypeParam1>
<DataTypeParam2></DataTypeParam2>
<KeepForeignKey>0</KeepForeignKey>
<DefaultValue></DefaultValue>
<NotNull>0</NotNull>
<Migrated>1</Migrated>
<Caption>funktion_kurzbz</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys>
<Id>{19A0ADFE-9C6E-4F76-B0FD-9E2CB294C946}</Id>
</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>{DF5BEF43-FB70-44A8-A886-214B99AAB567}</Id>
<Name>beschreibung</Name>
<Ordinal>0</Ordinal>
<HistoryID>{7FE0B53D-FBB7-4431-B50A-1A37C4DD2953}</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>beschreibung</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys/>
<DictType/>
<Domain/>
<DataType>
<Id>{8D91E2A4-12F5-40E3-BAC2-BFCF7BE1C8B7}</Id>
</DataType>
<UserDataType/>
<IndexItems/>
<Default/>
<CheckConstraints/>
<KeyConstraint/>
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
</Attributes>
<Keys>
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -162901,6 +163035,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>{20AC4107-11B8-494D-AF7C-5FE2394ACA61}</Id>
<Name>fk_funktion_projekt_ressource</Name>
<Ordinal>0</Ordinal>
<HistoryID>{ADE1F0E4-7629-43A5-97E4-3863DEB7A4EB}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<O1>
<Id>{38CAFA7D-3BC2-4D05-8C6A-D52AA440D48E}</Id>
</O1>
<O2>
<Id>{2C676078-7D63-4EB7-B874-2205FCB25C45}</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_funktion_projekt_ressource</Caption>
<InverseCaption></InverseCaption>
<RefIntegrityParentUpdate>0</RefIntegrityParentUpdate>
<RefIntegrityParentDelete>0</RefIntegrityParentDelete>
<RefIntegrityChildUpdate>0</RefIntegrityChildUpdate>
<RefIntegrityChildInsert>0</RefIntegrityChildInsert>
<Key>
<Id>{84280A17-6126-4488-969E-5E648C566C07}</Id>
</Key>
<ForeignKeys>
<PERForeignKeyPG83 ObjectType="2014" CSAOName="PERForeignKeyPG83">
<Id>{19A0ADFE-9C6E-4F76-B0FD-9E2CB294C946}</Id>
<Name>FK funktion_kurzbz - funktion_kurzbz</Name>
<Ordinal>0</Ordinal>
<HistoryID>{62CC619C-0718-4B72-BB5C-38C3D3DD8D0F}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<AttrParent>
<Id>{9F3264AE-2924-4642-A3DB-6970780DCDAE}</Id>
</AttrParent>
<AttrChild>
<Id>{3B1FF306-F748-4D04-BC59-73285DB792DD}</Id>
</AttrChild>
<KeyConstraintItem>
<Id>{038BDEBE-F3A3-42D7-976B-0AC820BD7365}</Id>
</KeyConstraintItem>
</PERForeignKeyPG83>
</ForeignKeys>
<ToDoItems/>
<Deferred>0</Deferred>
<Deferrable>0</Deferrable>
<MatchType>SIMPLE</MatchType>
<CreateIndexToFK>1</CreateIndexToFK>
</PERRelationPG83>
</Relations>
<Defaults/>
<Rules/>
system/checksystem.php
+14 -6
View File
@@ -2669,7 +2669,9 @@ if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_dms_version LIMIT 1;"))
ALTER TABLE fue.tbl_projekttask ADD CONSTRAINT fk_projekttask_projekttask FOREIGN KEY (projekttask_fk) REFERENCES fue.tbl_projekttask (projekttask_id) ON DELETE RESTRICT ON UPDATE CASCADE;
GRANT SELECT, UPDATE, INSERT, DELETE ON fue.tbl_projekt_dokument TO vilesci;
GRANT SELECT, UPDATE, INSERT, DELETE ON fue.tbl_projekt_dokument TO web;
GRANT SELECT, UPDATE ON SEQUENCE fue.seq_projekt_dokument_projekt_dokument_id TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE fue.seq_projekt_dokument_projekt_dokument_id TO web;
";
if(!$db->db_query($qry))
@@ -2710,6 +2712,8 @@ if(!$result = @$db->db_query("SELECT 1 FROM fue.tbl_ressource LIMIT 1;"))
ALTER TABLE fue.tbl_ressource ALTER COLUMN ressource_id SET DEFAULT nextval('fue.seq_ressource_ressource_id');
GRANT SELECT, UPDATE, INSERT, DELETE ON fue.tbl_ressource TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE fue.seq_ressource_ressource_id TO web;
GRANT SELECT, UPDATE ON SEQUENCE fue.seq_ressource_ressource_id TO vilesci;
CREATE SEQUENCE fue.seq_projekt_ressource_projekt_ressource_id
INCREMENT BY 1
@@ -2722,9 +2726,12 @@ if(!$result = @$db->db_query("SELECT 1 FROM fue.tbl_ressource LIMIT 1;"))
projekt_ressource_id bigint NOT NULL,
projektphase_id bigint,
projekt_kurzbz varchar(16),
ressource_id bigint
ressource_id bigint,
funktion_kurzbz character varying(16),
beschreibung text
);
ALTER TABLE fue.tbl_projekt_ressource ADD CONSTRAINT fk_projekt_ressource_funktion FOREIGN KEY (funktion_kurzbz) REFERENCES public.tbl_funktion (funktion_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE fue.tbl_projekt_ressource ADD CONSTRAINT fk_projekt_ressource_ressource FOREIGN KEY (ressource_id) REFERENCES fue.tbl_ressource (ressource_id) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE fue.tbl_projekt_ressource ADD CONSTRAINT fk_projekt_ressource_projekt FOREIGN KEY (projekt_kurzbz) REFERENCES fue.tbl_projekt (projekt_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE fue.tbl_projekt_ressource ADD CONSTRAINT fk_projekt_ressource_projektphase FOREIGN KEY (projektphase_id) REFERENCES fue.tbl_projektphase (projektphase_id) ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -2732,10 +2739,11 @@ if(!$result = @$db->db_query("SELECT 1 FROM fue.tbl_ressource LIMIT 1;"))
ALTER TABLE fue.tbl_projekt_ressource ALTER COLUMN projekt_ressource_id SET DEFAULT nextval('fue.seq_projekt_ressource_projekt_ressource_id');
GRANT SELECT, UPDATE, INSERT, DELETE ON fue.tbl_projekt_dokument TO vilesci;
GRANT SELECT, UPDATE ON SEQUENCE fue.seq_projekt_ressource_projekt_ressource_id TO web;
GRANT SELECT, UPDATE ON SEQUENCE fue.seq_projekt_ressource_projekt_ressource_id TO vilesci;
INSERT INTO fue.tbl_ressource(student_uid, mitarbeiter_uid, betriebsmittel_id, firma_id, bezeichnung, beschreibung, insertamum, insertvon, updateamum, updatevon) SELECT distinct on(uid) null, uid, null, null, null, null, now(), null, now(), null FROM fue.tbl_projektbenutzer;
INSERT INTO fue.tbl_projekt_ressource (projekt_kurzbz, projektphase_id, ressource_id) SELECT projekt_kurzbz, null, (SELECT ressource_id FROM fue.tbl_ressource WHERE mitarbeiter_uid=uid) FROM fue.tbl_projektbenutzer;
INSERT INTO fue.tbl_projekt_ressource (projekt_kurzbz, projektphase_id, ressource_id, funktion_kurzbz, beschreibung) SELECT projekt_kurzbz, null, (SELECT ressource_id FROM fue.tbl_ressource WHERE mitarbeiter_uid=uid), funktion_kurzbz, null FROM fue.tbl_projektbenutzer;
DROP TABLE fue.tbl_projektbenutzer;
";
@@ -2807,7 +2815,7 @@ $tabellen=array(
"fue.tbl_projektphase" => array("projektphase_id","projekt_kurzbz","projektphase_fk","bezeichnung","beschreibung","start","ende","budget","insertamum","insertvon","updateamum","updatevon","personentage"),
"fue.tbl_projekttask" => array("projekttask_id","projektphase_id","bezeichnung","beschreibung","aufwand","mantis_id","insertamum","insertvon","updateamum","updatevon","projekttask_fk"),
"fue.tbl_projekt_dokument" => array("projekt_dokument_id","projektphase_id","projekt_kurzbz","dms_id"),
"fue.tbl_projekt_ressource" => array("projekt_ressource_id","projekt_kurzbz","projektphase_id","ressource_id"),
"fue.tbl_projekt_ressource" => array("projekt_ressource_id","projekt_kurzbz","projektphase_id","ressource_id","funktion_kurzbz","beschreibung"),
"fue.tbl_ressource" => array("ressource_id","student_uid","mitarbeiter_uid","betriebsmittel_id","firma_id","bezeichnung","beschreibung","insertamum","insertvon","updateamum","updatevon"),
"kommune.tbl_match" => array("match_id","team_sieger","wettbewerb_kurzbz","team_gefordert","team_forderer","gefordertvon","gefordertamum","matchdatumzeit","matchort","matchbestaetigtvon","matchbestaetigtamum","ergebniss","bestaetigtvon","bestaetigtamum"),
"kommune.tbl_team" => array("team_kurzbz","bezeichnung","beschreibung","logo"),