Projekttask neue Spalte ende und ressource_id

This commit is contained in:
Andreas Österreicher
2011-10-05 13:01:37 +00:00
parent b88e0b80d8
commit cb7cf9d18d
2 changed files with 306 additions and 26 deletions
+290 -25
View File
@@ -8313,6 +8313,7 @@
<Id>{067D1B3C-84CA-40AB-9FD8-CDDD948A5D76}</Id>
<Id>{E9EFBE4D-B110-4452-A031-9506E1B7E049}</Id>
<Id>{E9EFBE4D-B110-4452-A031-9506E1B7E049}</Id>
<Id>{B66A4DCE-3BC6-4A1D-996D-62B39DEC6F57}</Id>
</LineList>
<DisplayIndexes>0</DisplayIndexes>
<AlignInColumns>0</AlignInColumns>
@@ -8517,6 +8518,7 @@
<Id>{5114F940-88C0-4A25-BD7C-F14AA700E412}</Id>
<Id>{76BF29AF-6744-4125-8337-B8A01DD6FB62}</Id>
<Id>{DAE341F3-42E8-4624-AEBC-0D42E1FB8135}</Id>
<Id>{B66A4DCE-3BC6-4A1D-996D-62B39DEC6F57}</Id>
</LineList>
<DisplayIndexes>0</DisplayIndexes>
<AlignInColumns>0</AlignInColumns>
@@ -24937,6 +24939,49 @@
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
<Id>{B66A4DCE-3BC6-4A1D-996D-62B39DEC6F57}</Id>
<Name>fk_ressource_projekttask</Name>
<Ordinal>0</Ordinal>
<HistoryID>{2EFDAEF3-E7DE-4CF3-9DE5-AE8E00E475FA}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<ParentBaseID>{87DC5C6F-1856-4854-B956-96D600545B0D}</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>{6706E0F3-A429-476A-946F-9DD718EEC4C4}</Id>
</WorkSpaceShape1>
<WorkSpaceShape2>
<Id>{45B9E3A1-20E5-4DD5-80D0-8F1C26F41760}</Id>
</WorkSpaceShape2>
<NamePositionX>1884</NamePositionX>
<NamePositionY>1284</NamePositionY>
<Points>
<Point>
<x>1790</x>
<y>860</y>
</Point>
<Point>
<x>1790</x>
<y>891</y>
</Point>
<Point>
<x>2178</x>
<y>1797</y>
</Point>
<Point>
<x>2178</x>
<y>1828</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
</LineList>
<Page>
<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -43431,7 +43476,7 @@
<Left>56</Left>
<z>0</z>
<Width>820</Width>
<Height>512</Height>
<Height>590</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43441,6 +43486,7 @@
<Id>{16C9B1E9-3528-4D19-ACC7-90FCB28CC6E1}</Id>
<Id>{2D03F79D-E261-48D8-A898-B88C993D5E50}</Id>
<Id>{2D03F79D-E261-48D8-A898-B88C993D5E50}</Id>
<Id>{E95622B1-46BA-44E3-AD8C-AE8D3B6E5540}</Id>
</LineList>
<DisplayIndexes>1</DisplayIndexes>
<AlignInColumns>1</AlignInColumns>
@@ -43657,8 +43703,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>1898</Top>
<Left>73</Left>
<Top>2031</Top>
<Left>101</Left>
<z>0</z>
<Width>837</Width>
<Height>473</Height>
@@ -43669,6 +43715,7 @@
<FullBackground>0</FullBackground>
<LineList>
<Id>{152F9C97-C7E6-4D26-82A9-9D45FFDEC2B1}</Id>
<Id>{E95622B1-46BA-44E3-AD8C-AE8D3B6E5540}</Id>
</LineList>
<DisplayIndexes>1</DisplayIndexes>
<AlignInColumns>1</AlignInColumns>
@@ -43828,7 +43875,7 @@
<Id>{6704B70E-0AB9-410E-AEDB-795DE7375F92}</Id>
</WorkSpaceShape2>
<NamePositionX>958</NamePositionX>
<NamePositionY>1414</NamePositionY>
<NamePositionY>1440</NamePositionY>
<Points>
<Point>
<x>1162</x>
@@ -43840,11 +43887,11 @@
</Point>
<Point>
<x>907</x>
<y>1570</y>
<y>1622</y>
</Point>
<Point>
<x>876</x>
<y>1570</y>
<y>1622</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -44171,36 +44218,36 @@
<WorkSpaceShape2>
<Id>{6704B70E-0AB9-410E-AEDB-795DE7375F92}</Id>
</WorkSpaceShape2>
<NamePositionX>748</NamePositionX>
<NamePositionY>1750</NamePositionY>
<NamePositionX>872</NamePositionX>
<NamePositionY>1848</NamePositionY>
<Points>
<Point>
<x>876</x>
<y>1400</y>
<y>1426</y>
</Point>
<Point>
<x>907</x>
<y>1400</y>
<y>1426</y>
</Point>
<Point>
<x>907</x>
<y>1400</y>
<y>1426</y>
</Point>
<Point>
<x>907</x>
<y>1772</y>
<y>1850</y>
</Point>
<Point>
<x>466</x>
<y>1772</y>
<x>329</x>
<y>1850</y>
</Point>
<Point>
<x>466</x>
<y>1772</y>
<x>329</x>
<y>1850</y>
</Point>
<Point>
<x>466</x>
<y>1741</y>
<x>329</x>
<y>1819</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -44312,16 +44359,16 @@
<WorkSpaceShape2>
<Id>{05D38B22-230A-490A-AE08-48BD19868B8F}</Id>
</WorkSpaceShape2>
<NamePositionX>971</NamePositionX>
<NamePositionY>2094</NamePositionY>
<NamePositionX>985</NamePositionX>
<NamePositionY>2162</NamePositionY>
<Points>
<Point>
<x>910</x>
<y>2134</y>
<x>938</x>
<y>2268</y>
</Point>
<Point>
<x>941</x>
<y>2134</y>
<x>969</x>
<y>2268</y>
</Point>
<Point>
<x>1201</x>
@@ -44333,6 +44380,49 @@
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
<Id>{E95622B1-46BA-44E3-AD8C-AE8D3B6E5540}</Id>
<Name>fk_ressource_projekttask</Name>
<Ordinal>0</Ordinal>
<HistoryID>{25CE99D1-6B21-45ED-B540-BDAD4F73DD5D}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<ParentBaseID>{87DC5C6F-1856-4854-B956-96D600545B0D}</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>{6943A876-C6D6-4608-944D-FD47D227237D}</Id>
</WorkSpaceShape1>
<WorkSpaceShape2>
<Id>{6704B70E-0AB9-410E-AEDB-795DE7375F92}</Id>
</WorkSpaceShape2>
<NamePositionX>461</NamePositionX>
<NamePositionY>1865</NamePositionY>
<Points>
<Point>
<x>520</x>
<y>2031</y>
</Point>
<Point>
<x>520</x>
<y>2000</y>
</Point>
<Point>
<x>603</x>
<y>1850</y>
</Point>
<Point>
<x>603</x>
<y>1819</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
</LineList>
<Page>
<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -44579,6 +44669,7 @@
<Id>{DDDBECD9-8C3E-4251-BC3E-6E41F0F39550}</Id>
<Id>{AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E}</Id>
<Id>{AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E}</Id>
<Id>{C0E5CDE3-DB9C-4BF3-9594-8B341CB53301}</Id>
</LineList>
<DisplayIndexes>1</DisplayIndexes>
<AlignInColumns>1</AlignInColumns>
@@ -44842,6 +44933,7 @@
<FullBackground>0</FullBackground>
<LineList>
<Id>{24E696D6-9D09-44AF-A7AA-814BAF043104}</Id>
<Id>{C0E5CDE3-DB9C-4BF3-9594-8B341CB53301}</Id>
</LineList>
<DisplayIndexes>1</DisplayIndexes>
<AlignInColumns>1</AlignInColumns>
@@ -45623,6 +45715,32 @@
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
<Id>{C0E5CDE3-DB9C-4BF3-9594-8B341CB53301}</Id>
<Name>fk_ressource_projekttask</Name>
<Ordinal>0</Ordinal>
<HistoryID>{AC020484-F145-40AB-A11F-2DF1FED9BC53}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<ParentBaseID>{87DC5C6F-1856-4854-B956-96D600545B0D}</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>{9A5405D5-63DA-4E34-9F23-1FE87E691DE3}</Id>
</WorkSpaceShape1>
<WorkSpaceShape2>
<Id>{BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7}</Id>
</WorkSpaceShape2>
<NamePositionX>0</NamePositionX>
<NamePositionY>0</NamePositionY>
<Points/>
</WorkSpaceLinePERRelationPG83>
</LineList>
<Page>
<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -45751,7 +45869,7 @@
<Company>Technikum Wien</Company>
<Version>2.0</Version>
<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
<ModifiedDate>2011-10-04T17:17:53.064+02:00</ModifiedDate>
<ModifiedDate>2011-10-05T14:54:06.714+02:00</ModifiedDate>
<Project>FH-Complete 2.0</Project>
<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
</Description>
@@ -138228,6 +138346,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<Id>{118D0D46-FEE9-4F42-A9F4-7CA65B7549C4}</Id>
<Id>{D69BE2AE-BFF7-4513-9BFD-5DFB4279856F}</Id>
<Id>{D69BE2AE-BFF7-4513-9BFD-5DFB4279856F}</Id>
<Id>{87DC5C6F-1856-4854-B956-96D600545B0D}</Id>
</Relations>
<Attributes>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -138731,6 +138850,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>{9ED207F3-4866-468F-BE2B-960E534F4A09}</Id>
<Name>ende</Name>
<Ordinal>0</Ordinal>
<HistoryID>{A6AE4BD1-DB83-4A66-AF91-3612851CE24F}</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>ende</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys/>
<DictType/>
<Domain/>
<DataType>
<Id>{5EBD99F4-5263-4410-9892-11DB7C2DF84B}</Id>
</DataType>
<UserDataType/>
<IndexItems/>
<Default/>
<CheckConstraints/>
<KeyConstraint/>
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
<Id>{D1E498ED-8B43-41EE-BA2F-B5DD9617F2E2}</Id>
<Name>ressource_id</Name>
<Ordinal>0</Ordinal>
<HistoryID>{1492DC00-3EC8-4EC4-B980-513CDD375B98}</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>1</Migrated>
<Caption>ressource_id</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys>
<Id>{19BD2299-1C2B-41FB-AF08-B151AF57842A}</Id>
</FKForeignKeys>
<DictType/>
<Domain/>
<DataType>
<Id>{361EF147-269D-4247-8F7C-5A3876A3999A}</Id>
</DataType>
<UserDataType/>
<IndexItems/>
<Default/>
<CheckConstraints/>
<KeyConstraint/>
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
</Attributes>
<Keys>
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -140413,6 +140616,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<Id>{87E8656E-107E-46C0-BE16-EB8BCBDB590E}</Id>
<Id>{928E0575-160A-40E7-8C88-69C9284BC95A}</Id>
<Id>{664F07EE-51D2-4DCB-BF2A-6DCD96E59C1F}</Id>
<Id>{87DC5C6F-1856-4854-B956-96D600545B0D}</Id>
</Relations>
<Attributes>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -140445,6 +140649,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
</KeyConstraintItems>
<PKForeignKeys>
<Id>{0E7732BD-5E5A-4D19-B8A1-AAD4138258C1}</Id>
<Id>{19BD2299-1C2B-41FB-AF08-B151AF57842A}</Id>
</PKForeignKeys>
<FKForeignKeys/>
<DictType/>
@@ -140913,11 +141118,13 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
</Attribute>
<ForeignKeys>
<Id>{0E7732BD-5E5A-4D19-B8A1-AAD4138258C1}</Id>
<Id>{19BD2299-1C2B-41FB-AF08-B151AF57842A}</Id>
</ForeignKeys>
</PERKeyConstraintItemPG83>
</KeyItems>
<Relations>
<Id>{664F07EE-51D2-4DCB-BF2A-6DCD96E59C1F}</Id>
<Id>{87DC5C6F-1856-4854-B956-96D600545B0D}</Id>
</Relations>
<Attribute/>
<Tablespace/>
@@ -163691,6 +163898,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>{87DC5C6F-1856-4854-B956-96D600545B0D}</Id>
<Name>fk_ressource_projekttask</Name>
<Ordinal>0</Ordinal>
<HistoryID>{0E960CD8-19B7-401C-91BB-DC89653BCECE}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<O1>
<Id>{7898E917-C4F6-461E-A80F-EF59AE791E77}</Id>
</O1>
<O2>
<Id>{C5F36B02-0EF1-444A-8BAE-6C67957E8673}</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_ressource_projekttask</Caption>
<InverseCaption></InverseCaption>
<RefIntegrityParentUpdate>0</RefIntegrityParentUpdate>
<RefIntegrityParentDelete>0</RefIntegrityParentDelete>
<RefIntegrityChildUpdate>0</RefIntegrityChildUpdate>
<RefIntegrityChildInsert>0</RefIntegrityChildInsert>
<Key>
<Id>{333FC79C-2B13-4444-80FB-F963D6E0B73B}</Id>
</Key>
<ForeignKeys>
<PERForeignKeyPG83 ObjectType="2014" CSAOName="PERForeignKeyPG83">
<Id>{19BD2299-1C2B-41FB-AF08-B151AF57842A}</Id>
<Name>FK ressource_id - ressource_id</Name>
<Ordinal>0</Ordinal>
<HistoryID>{90F60A82-A737-4099-9712-85A8C5837523}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<AttrParent>
<Id>{2910D23C-4B9F-48A1-8D8E-1016EAA1BBB6}</Id>
</AttrParent>
<AttrChild>
<Id>{D1E498ED-8B43-41EE-BA2F-B5DD9617F2E2}</Id>
</AttrChild>
<KeyConstraintItem>
<Id>{66938F57-6C29-4AE4-9F78-4F2146C2F70F}</Id>
</KeyConstraintItem>
</PERForeignKeyPG83>
</ForeignKeys>
<ToDoItems/>
<Deferred>0</Deferred>
<Deferrable>0</Deferrable>
<MatchType>SIMPLE</MatchType>
<CreateIndexToFK>1</CreateIndexToFK>
</PERRelationPG83>
</Relations>
<Defaults/>
<Rules/>
+16 -1
View File
@@ -2820,6 +2820,21 @@ if($result = @$db->db_query("SELECT character_maximum_length as len FROM informa
}
}
}
//fue.tbl_projekttask ende und ressource spalte
if(!$result = @$db->db_query("SELECT ende FROM fue.tbl_projekttask"))
{
$qry = "ALTER TABLE fue.tbl_projekttask ADD COLUMN ende date;
ALTER TABLE fue.tbl_projekttask ADD COLUMN ressource_id integer;
ALTER TABLE fue.tbl_projekttask ADD CONSTRAINT fk_ressource_projekttask FOREIGN KEY (ressource_id) REFERENCES fue.tbl_ressource (ressource_id) ON DELETE RESTRICT ON UPDATE CASCADE;
";
if(!$db->db_query($qry))
echo '<strong>fue.tbl_projekttask: '.$db->db_last_error().'</strong><br>';
else
echo 'fue.tbl_projekttask: Spalte ende und ressource_id hinzugefuegt!<br>';
}
echo '<br>';
$tabellen=array(
@@ -2880,7 +2895,7 @@ $tabellen=array(
"fue.tbl_aktivitaet" => array("aktivitaet_kurzbz","beschreibung"),
"fue.tbl_projekt" => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz","budget"),
"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","erledigt"),
"fue.tbl_projekttask" => array("projekttask_id","projektphase_id","bezeichnung","beschreibung","aufwand","mantis_id","insertamum","insertvon","updateamum","updatevon","projekttask_fk","erledigt","ende","ressource_id"),
"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","funktion_kurzbz","beschreibung"),
"fue.tbl_ressource" => array("ressource_id","student_uid","mitarbeiter_uid","betriebsmittel_id","firma_id","bezeichnung","beschreibung","insertamum","insertvon","updateamum","updatevon"),