diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp index 0913511ba..1bef14058 100644 --- a/system/FH-Complete.txp +++ b/system/FH-Complete.txp @@ -8313,6 +8313,7 @@ {067D1B3C-84CA-40AB-9FD8-CDDD948A5D76} {E9EFBE4D-B110-4452-A031-9506E1B7E049} {E9EFBE4D-B110-4452-A031-9506E1B7E049} + {B66A4DCE-3BC6-4A1D-996D-62B39DEC6F57} 0 0 @@ -8517,6 +8518,7 @@ {5114F940-88C0-4A25-BD7C-F14AA700E412} {76BF29AF-6744-4125-8337-B8A01DD6FB62} {DAE341F3-42E8-4624-AEBC-0D42E1FB8135} + {B66A4DCE-3BC6-4A1D-996D-62B39DEC6F57} 0 0 @@ -24937,6 +24939,49 @@ + + {B66A4DCE-3BC6-4A1D-996D-62B39DEC6F57} + fk_ressource_projekttask + 0 + {2EFDAEF3-E7DE-4CF3-9DE5-AE8E00E475FA} + 0 + {87DC5C6F-1856-4854-B956-96D600545B0D} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {6706E0F3-A429-476A-946F-9DD718EEC4C4} + + + {45B9E3A1-20E5-4DD5-80D0-8F1C26F41760} + + 1884 + 1284 + + + 1790 + 860 + + + 1790 + 891 + + + 2178 + 1797 + + + 2178 + 1828 + + + @@ -43431,7 +43476,7 @@ 56 0 820 - 512 + 590 0 1 1 @@ -43441,6 +43486,7 @@ {16C9B1E9-3528-4D19-ACC7-90FCB28CC6E1} {2D03F79D-E261-48D8-A898-B88C993D5E50} {2D03F79D-E261-48D8-A898-B88C993D5E50} + {E95622B1-46BA-44E3-AD8C-AE8D3B6E5540} 1 1 @@ -43657,8 +43703,8 @@ 0 0 -28 - 1898 - 73 + 2031 + 101 0 837 473 @@ -43669,6 +43715,7 @@ 0 {152F9C97-C7E6-4D26-82A9-9D45FFDEC2B1} + {E95622B1-46BA-44E3-AD8C-AE8D3B6E5540} 1 1 @@ -43828,7 +43875,7 @@ {6704B70E-0AB9-410E-AEDB-795DE7375F92} 958 - 1414 + 1440 1162 @@ -43840,11 +43887,11 @@ 907 - 1570 + 1622 876 - 1570 + 1622 @@ -44171,36 +44218,36 @@ {6704B70E-0AB9-410E-AEDB-795DE7375F92} - 748 - 1750 + 872 + 1848 876 - 1400 + 1426 907 - 1400 + 1426 907 - 1400 + 1426 907 - 1772 + 1850 - 466 - 1772 + 329 + 1850 - 466 - 1772 + 329 + 1850 - 466 - 1741 + 329 + 1819 @@ -44312,16 +44359,16 @@ {05D38B22-230A-490A-AE08-48BD19868B8F} - 971 - 2094 + 985 + 2162 - 910 - 2134 + 938 + 2268 - 941 - 2134 + 969 + 2268 1201 @@ -44333,6 +44380,49 @@ + + {E95622B1-46BA-44E3-AD8C-AE8D3B6E5540} + fk_ressource_projekttask + 0 + {25CE99D1-6B21-45ED-B540-BDAD4F73DD5D} + 0 + {87DC5C6F-1856-4854-B956-96D600545B0D} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {6943A876-C6D6-4608-944D-FD47D227237D} + + + {6704B70E-0AB9-410E-AEDB-795DE7375F92} + + 461 + 1865 + + + 520 + 2031 + + + 520 + 2000 + + + 603 + 1850 + + + 603 + 1819 + + + @@ -44579,6 +44669,7 @@ {DDDBECD9-8C3E-4251-BC3E-6E41F0F39550} {AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E} {AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E} + {C0E5CDE3-DB9C-4BF3-9594-8B341CB53301} 1 1 @@ -44842,6 +44933,7 @@ 0 {24E696D6-9D09-44AF-A7AA-814BAF043104} + {C0E5CDE3-DB9C-4BF3-9594-8B341CB53301} 1 1 @@ -45623,6 +45715,32 @@ + + {C0E5CDE3-DB9C-4BF3-9594-8B341CB53301} + fk_ressource_projekttask + 0 + {AC020484-F145-40AB-A11F-2DF1FED9BC53} + 0 + {87DC5C6F-1856-4854-B956-96D600545B0D} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {9A5405D5-63DA-4E34-9F23-1FE87E691DE3} + + + {BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7} + + 0 + 0 + + @@ -45751,7 +45869,7 @@ Technikum Wien 2.0 2009-04-17T11:15:21.000+02:00 - 2011-10-04T17:17:53.064+02:00 + 2011-10-05T14:54:06.714+02:00 FH-Complete 2.0 <?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?> @@ -138228,6 +138346,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {118D0D46-FEE9-4F42-A9F4-7CA65B7549C4} {D69BE2AE-BFF7-4513-9BFD-5DFB4279856F} {D69BE2AE-BFF7-4513-9BFD-5DFB4279856F} + {87DC5C6F-1856-4854-B956-96D600545B0D} @@ -138731,6 +138850,90 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a 0 + + {9ED207F3-4866-468F-BE2B-960E534F4A09} + ende + 0 + {A6AE4BD1-DB83-4A66-AF91-3612851CE24F} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + ende + 0 + + + + + + + + + + {5EBD99F4-5263-4410-9892-11DB7C2DF84B} + + + + + + + + 0 + + + {D1E498ED-8B43-41EE-BA2F-B5DD9617F2E2} + ressource_id + 0 + {1492DC00-3EC8-4EC4-B980-513CDD375B98} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 1 + ressource_id + 0 + + + + + + + {19BD2299-1C2B-41FB-AF08-B151AF57842A} + + + + + {361EF147-269D-4247-8F7C-5A3876A3999A} + + + + + + + + 0 + @@ -140413,6 +140616,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {87E8656E-107E-46C0-BE16-EB8BCBDB590E} {928E0575-160A-40E7-8C88-69C9284BC95A} {664F07EE-51D2-4DCB-BF2A-6DCD96E59C1F} + {87DC5C6F-1856-4854-B956-96D600545B0D} @@ -140445,6 +140649,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {0E7732BD-5E5A-4D19-B8A1-AAD4138258C1} + {19BD2299-1C2B-41FB-AF08-B151AF57842A} @@ -140913,11 +141118,13 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {0E7732BD-5E5A-4D19-B8A1-AAD4138258C1} + {19BD2299-1C2B-41FB-AF08-B151AF57842A} {664F07EE-51D2-4DCB-BF2A-6DCD96E59C1F} + {87DC5C6F-1856-4854-B956-96D600545B0D} @@ -163691,6 +163898,64 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a SIMPLE 1 + + {87DC5C6F-1856-4854-B956-96D600545B0D} + fk_ressource_projekttask + 0 + {0E960CD8-19B7-401C-91BB-DC89653BCECE} + 0 + + {7898E917-C4F6-461E-A80F-EF59AE791E77} + + + {C5F36B02-0EF1-444A-8BAE-6C67957E8673} + + 1 + + + 0 + 0 + 0 + -1 + + fk_ressource_projekttask + + 0 + 0 + 0 + 0 + + {333FC79C-2B13-4444-80FB-F963D6E0B73B} + + + + {19BD2299-1C2B-41FB-AF08-B151AF57842A} + FK ressource_id - ressource_id + 0 + {90F60A82-A737-4099-9712-85A8C5837523} + 0 + 1 + + + + + + {2910D23C-4B9F-48A1-8D8E-1016EAA1BBB6} + + + {D1E498ED-8B43-41EE-BA2F-B5DD9617F2E2} + + + {66938F57-6C29-4AE4-9F78-4F2146C2F70F} + + + + + 0 + 0 + SIMPLE + 1 + diff --git a/system/checksystem.php b/system/checksystem.php index 9045227ac..168188bc9 100644 --- a/system/checksystem.php +++ b/system/checksystem.php @@ -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 'fue.tbl_projekttask: '.$db->db_last_error().'
'; + else + echo 'fue.tbl_projekttask: Spalte ende und ressource_id hinzugefuegt!
'; +} echo '
'; $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"),