diff --git a/include/akte.class.php b/include/akte.class.php index 655c353e9..e4bd4215d 100644 --- a/include/akte.class.php +++ b/include/akte.class.php @@ -42,6 +42,7 @@ class akte extends basis_db public $insertvon; public $uid; public $ext_id; + public $dms_id; /** * Konstruktor @@ -89,6 +90,7 @@ class akte extends basis_db $this->insertamum = $row->insertamum; $this->insertvon = $row->insertvon; $this->uid = $row->uid; + $this->dms_id = $row->dms_id; return true; } else @@ -171,7 +173,7 @@ class akte extends basis_db { //Neuen Datensatz anlegen $qry = "BEGIN;INSERT INTO public.tbl_akte (person_id, dokument_kurzbz, inhalt, mimetype, erstelltam, gedruckt, titel, - bezeichnung, updateamum, updatevon, insertamum, insertvon, ext_id, uid) VALUES (". + bezeichnung, updateamum, updatevon, insertamum, insertvon, ext_id, uid, dms_id) VALUES (". $this->db_add_param($this->person_id, FHC_INTEGER).', '. $this->db_add_param($this->dokument_kurzbz).', '. $this->db_add_param($this->inhalt).', '. @@ -185,7 +187,8 @@ class akte extends basis_db $this->db_add_param($this->insertamum).', '. $this->db_add_param($this->insertvon).', '. $this->db_add_param($this->ext_id).', '. - $this->db_add_param($this->uid).');'; + $this->db_add_param($this->uid).','. + $this->db_add_param($this->dms_id).');'; } else @@ -203,7 +206,8 @@ class akte extends basis_db " updateamum=".$this->db_add_param($this->updateamum).",". " updatevon=".$this->db_add_param($this->updatevon).",". " ext_id=".$this->db_add_param($this->ext_id).",". - " uid=".$this->db_add_param($this->uid). + " uid=".$this->db_add_param($this->uid).",". + " dms_id=".$this->db_add_param($this->dms_id, FHC_INTEGER). " WHERE akte_id=".$this->db_add_param($this->akte_id, FHC_INTEGER); } @@ -281,6 +285,7 @@ class akte extends basis_db $akten->insertamum = $row->insertamum; $akten->insertvon = $row->insertvon; $akten->uid = $row->uid; + $akten->dms_id = $row->dms_id; $this->result[] = $akten; } @@ -330,6 +335,7 @@ class akte extends basis_db $akten->insertamum = $row->insertamum; $akten->insertvon = $row->insertvon; $akten->uid = $row->uid; + $akten->dms_id = $row->dms_id; $this->result[] = $akten; } diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp index 702f1308a..d529f744b 100644 --- a/system/FH-Complete.txp +++ b/system/FH-Complete.txp @@ -3097,6 +3097,7 @@ {489D9277-9F99-4F89-8BA5-2186753FDC9B} {A66047D6-A4F9-4333-8606-4A9464DFD341} {A646A939-209A-45DA-BC13-167E67157AF0} + {40A0CB66-9490-4E7A-91B8-50F6CD56FFA9} 0 0 @@ -8433,6 +8434,7 @@ {42B58888-23CC-44F5-BFC6-8C5F372DC222} {A75EFF1B-E3E3-4BC1-808B-941AD98C1525} {E5484442-DF3D-450C-A148-90B394E35642} + {40A0CB66-9490-4E7A-91B8-50F6CD56FFA9} 0 0 @@ -9757,7 +9759,7 @@ {AE958387-4CAC-43B9-8DB6-46E368970923} 3046 - 2014 + 2023 1979 @@ -9769,11 +9771,11 @@ 4082 - 2123 + 2140 4113 - 2123 + 2140 @@ -11520,7 +11522,7 @@ {AE958387-4CAC-43B9-8DB6-46E368970923} 4081 - 2029 + 2020 4081 @@ -11532,11 +11534,11 @@ 4082 - 2057 + 2040 4113 - 2057 + 2040 @@ -25340,7 +25342,7 @@ {26B30845-6120-43AB-9113-A0A99C8AD6E8} 6837 - 430 + 425 11440 @@ -25352,11 +25354,11 @@ 2464 - 272 + 262 2433 - 272 + 262 @@ -25383,7 +25385,7 @@ {26B30845-6120-43AB-9113-A0A99C8AD6E8} 3100 - 1061 + 1049 3967 @@ -25395,11 +25397,11 @@ 2464 - 372 + 348 2433 - 372 + 348 @@ -25426,7 +25428,7 @@ {26B30845-6120-43AB-9113-A0A99C8AD6E8} 5073 - 217 + 215 7912 @@ -25438,11 +25440,11 @@ 2464 - 238 + 234 2433 - 238 + 234 @@ -25469,15 +25471,15 @@ {BFDDE1D9-E065-41BE-B0CE-1F1BE440A785} 4957 - 405 + 398 2433 - 305 + 291 2464 - 305 + 291 7650 @@ -25512,15 +25514,15 @@ {924E1504-2B78-4B00-9DFD-BE416D61DE42} 2468 - 298 + 289 2433 - 338 + 319 2464 - 338 + 319 2672 @@ -28136,6 +28138,49 @@ + + {40A0CB66-9490-4E7A-91B8-50F6CD56FFA9} + fk_dms_akte + 0 + {27732132-B164-4452-B5BE-C52EBEAD0881} + 0 + {3D14682E-D3C6-495B-BCCC-B0D5E266ABD2} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {26B30845-6120-43AB-9113-A0A99C8AD6E8} + + + {AE958387-4CAC-43B9-8DB6-46E368970923} + + 3173 + 1173 + + + 2433 + 376 + + + 2464 + 376 + + + 4082 + 2090 + + + 4113 + 2090 + + + @@ -28448,7 +28493,7 @@ 0 0 -28 - 1527 + 1605 8582 0 732 @@ -28529,8 +28574,8 @@ 0 0 -28 - 2400 - 8701 + 2445 + 8662 0 734 278 @@ -28604,8 +28649,8 @@ 0 0 -28 - 2142 - 8790 + 2193 + 8756 0 639 200 @@ -29049,8 +29094,8 @@ 0 0 -28 - 682 - 8411 + 753 + 8522 0 641 278 @@ -29742,8 +29787,8 @@ 0 0 -28 - 1015 - 8435 + 1092 + 8451 0 738 473 @@ -29899,11 +29944,11 @@ 0 0 -28 - 15 - 8471 + 57 + 8477 0 694 - 629 + 668 0 1 1 @@ -31269,16 +31314,16 @@ {4B8FF0F0-CE9E-4D02-B29F-73FEB38DB1AC} - 8983 - 2563 + 8966 + 2588 - 9110 - 2342 + 9076 + 2393 - 9110 - 2373 + 9076 + 2424 8968 @@ -31582,16 +31627,16 @@ {4C98A428-14DD-4587-B44B-5A31CAA42B19} - 4795 - 1988 + 4776 + 2010 - 8701 - 2493 + 8662 + 2538 - 8670 - 2493 + 8631 + 2538 2302 @@ -31840,16 +31885,16 @@ {C2303976-8004-4530-A9DC-543D000F94C9} - 7898 - 2709 + 7879 + 2732 - 8701 - 2585 + 8662 + 2630 - 8670 - 2585 + 8631 + 2630 7286 @@ -32055,8 +32100,8 @@ {CA4F7EAC-55C4-480E-B7C9-180DB66AC5B0} - 7602 - 1426 + 7610 + 1465 6772 @@ -32067,12 +32112,12 @@ 2229 - 8404 - 1218 + 8420 + 1295 - 8435 - 1218 + 8451 + 1295 @@ -32098,16 +32143,16 @@ {0C663600-4D6D-4A2E-800A-153F59399066} - 8286 - 1386 + 8295 + 1357 - 8435 - 1420 + 8451 + 1362 - 8404 - 1420 + 8420 + 1362 8233 @@ -32270,8 +32315,8 @@ {C9AFAFC7-19FB-4784-A406-4B4CDEABCD21} - 7569 - 1272 + 7573 + 1305 6611 @@ -32282,12 +32327,12 @@ 2229 - 8440 - 434 + 8446 + 502 - 8471 - 434 + 8477 + 502 @@ -32485,8 +32530,8 @@ {6AEE904A-17EB-47A0-B5FD-DEAC6C762AEA} - 8248 - 981 + 8304 + 1016 8202 @@ -32497,12 +32542,12 @@ 1262 - 8380 - 821 + 8491 + 892 - 8411 - 821 + 8522 + 892 @@ -33099,8 +33144,8 @@ {C9AFAFC7-19FB-4784-A406-4B4CDEABCD21} - 8326 - 121 + 8329 + 149 8194 @@ -33111,12 +33156,12 @@ 140 - 8440 - 225 + 8446 + 280 - 8471 - 225 + 8477 + 280 @@ -33185,16 +33230,16 @@ {3C978BA4-E261-44AB-A8AC-850BFC5A3C3B} - 8215 - 922 + 8223 + 960 - 8435 - 1083 + 8451 + 1160 - 8404 - 1083 + 8420 + 1160 8102 @@ -33228,24 +33273,24 @@ {CF52EB80-BE30-40A3-980C-8F262A0A0484} - 8831 - 1446 + 8839 + 1524 - 8804 - 1488 + 8820 + 1565 - 8804 - 1519 + 8820 + 1596 8948 - 1496 + 1574 8948 - 1527 + 1605 @@ -33271,16 +33316,16 @@ {2E5D944C-5C5D-4F01-9057-73779D9CDCAA} - 7224 - 664 + 7232 + 703 - 8435 - 1150 + 8451 + 1227 - 8404 - 1150 + 8420 + 1227 3709 @@ -33486,24 +33531,24 @@ {C9AFAFC7-19FB-4784-A406-4B4CDEABCD21} - 8884 - 770 + 8895 + 849 - 8804 - 1015 + 8820 + 1092 - 8804 - 984 + 8820 + 1061 - 8818 - 675 + 8824 + 756 - 8818 - 644 + 8824 + 725 @@ -34089,7 +34134,7 @@ {CF52EB80-BE30-40A3-980C-8F262A0A0484} 9408 - 1473 + 1512 9672 @@ -34101,11 +34146,11 @@ 9345 - 1802 + 1880 9314 - 1802 + 1880 @@ -34475,16 +34520,16 @@ {0CD0899C-7A52-4F35-AC37-1239971710E8} - 9344 - 1438 + 9352 + 1476 - 9173 - 1252 + 9189 + 1328 - 9204 - 1252 + 9220 + 1328 9684 @@ -34518,16 +34563,16 @@ {9B19A53E-485A-4399-92C2-C17EF567675B} - 5340 - 3848 + 5348 + 3920 - 8435 - 1353 + 8451 + 1497 - 8404 - 1353 + 8420 + 1497 2250 @@ -34561,16 +34606,16 @@ {9B19A53E-485A-4399-92C2-C17EF567675B} - 5339 - 3670 + 5347 + 3743 - 8435 - 1285 + 8451 + 1430 - 8404 - 1285 + 8420 + 1430 2250 @@ -52479,7 +52524,7 @@ Technikum Wien 2.0 2009-04-17T11:15:21.000+02:00 - 2013-06-25T14:09:23.135+02:00 + 2013-06-26T14:10:40.179+02:00 FH-Complete 2.0 <?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?> @@ -90819,6 +90864,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {BA643C8B-FFD0-4F07-9B78-00886B65836F} {D6FF9871-DDCC-4165-B6A5-15C78E12EAC6} {5F7706D0-170C-47AE-8288-CEDB45777051} + {3D14682E-D3C6-495B-BCCC-B0D5E266ABD2} @@ -91444,6 +91490,49 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie 0 + + {B085D356-4779-48FA-87EB-FD24F4BFCC1E} + dms_id + 0 + {2FEB471C-039B-40B1-BEBA-70BED0E9DC25} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 1 + dms_id + 0 + + + + + + + {C68C237E-5E1A-4541-B3B4-46297839DB84} + + + + + {361EF147-269D-4247-8F7C-5A3876A3999A} + + + + + + + + 0 + @@ -147246,6 +147335,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {C7885A2C-9943-42ED-AFCA-65F18082CA42} {836D060F-680D-4093-AC25-9A874A605B12} {BE5C4301-8C12-40B1-A74F-F5300B620651} + {3D14682E-D3C6-495B-BCCC-B0D5E266ABD2} @@ -147281,6 +147371,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {F94FB911-9417-45ED-A497-0CA15EFA3DA3} {2435B048-7140-46A9-AB63-4AF6A743471A} {3B4B89AD-1596-468A-A3EF-3312E8E2E078} + {C68C237E-5E1A-4541-B3B4-46297839DB84} @@ -147463,6 +147554,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {F94FB911-9417-45ED-A497-0CA15EFA3DA3} {2435B048-7140-46A9-AB63-4AF6A743471A} {3B4B89AD-1596-468A-A3EF-3312E8E2E078} + {C68C237E-5E1A-4541-B3B4-46297839DB84} @@ -147471,6 +147563,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a {C7885A2C-9943-42ED-AFCA-65F18082CA42} {836D060F-680D-4093-AC25-9A874A605B12} {BE5C4301-8C12-40B1-A74F-F5300B620651} + {3D14682E-D3C6-495B-BCCC-B0D5E266ABD2} @@ -184575,6 +184668,64 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a SIMPLE 1 + + {3D14682E-D3C6-495B-BCCC-B0D5E266ABD2} + fk_dms_akte + 0 + {6AA3C182-04E3-4532-A211-E4B836A25068} + 0 + + {250AC43A-829A-467D-887D-9DEA18DD2960} + + + {256C2DDD-B460-4624-BCCA-B9A89DBFD531} + + 1 + + + 0 + 0 + 0 + -1 + + fk_dms_akte + + 0 + 0 + 0 + 0 + + {F2B35BF3-5556-4999-AA4E-8FBA8961C021} + + + + {C68C237E-5E1A-4541-B3B4-46297839DB84} + FK dms_id - dms_id + 0 + {E0E52263-AB10-4B31-AEF6-42BEC337F307} + 0 + 1 + + + + + + {98D4F71D-128C-4393-9D5C-BC4F84860421} + + + {B085D356-4779-48FA-87EB-FD24F4BFCC1E} + + + {FA430C4E-06A0-4163-84A3-9B89B9CBE627} + + + + + 0 + 0 + SIMPLE + 1 + diff --git a/system/checksystem.php b/system/checksystem.php index b221befc6..561ea2ffb 100644 --- a/system/checksystem.php +++ b/system/checksystem.php @@ -4045,6 +4045,19 @@ if(!@$db->db_query("SELECT content_id FROM public.tbl_ort LIMIT 1")) echo 'Spalte ContentID zu public.tbl_ort hinzugefuegt
'; } +// Akte FK zum DMS +if(!@$db->db_query("SELECT dms_id FROM public.tbl_akte LIMIT 1")) +{ + $qry =" + ALTER TABLE public.tbl_akte ADD COLUMN dms_id integer; + ALTER TABLE public.tbl_akte ADD CONSTRAINT fk_dms_akte FOREIGN KEY(dms_id) REFERENCES campus.tbl_dms(dms_id) ON DELETE RESTRICT ON UPDATE CASCADE; + "; + + if(!$db->db_query($qry)) + echo 'public.tbl_akte: '.$db->db_last_error().'
'; + else + echo 'Spalte dms_id zu public.tbl_akte hinzugefuegt
'; +} echo '
'; @@ -4155,7 +4168,7 @@ $tabellen=array( "lehre.tbl_zeugnis" => array("zeugnis_id","student_uid","zeugnis","erstelltam","gedruckt","titel","bezeichnung","updateamum","updatevon","insertamum","insertvon","ext_id"), "lehre.tbl_zeugnisnote" => array("lehrveranstaltung_id","student_uid","studiensemester_kurzbz","note","uebernahmedatum","benotungsdatum","bemerkung","updateamum","updatevon","insertamum","insertvon","ext_id"), "public.tbl_adresse" => array("adresse_id","person_id","name","strasse","plz","ort","gemeinde","nation","typ","heimatadresse","zustelladresse","firma_id","updateamum","updatevon","insertamum","insertvon","ext_id"), - "public.tbl_akte" => array("akte_id","person_id","dokument_kurzbz","uid","inhalt","mimetype","erstelltam","gedruckt","titel","bezeichnung","updateamum","updatevon","insertamum","insertvon","ext_id"), + "public.tbl_akte" => array("akte_id","person_id","dokument_kurzbz","uid","inhalt","mimetype","erstelltam","gedruckt","titel","bezeichnung","updateamum","updatevon","insertamum","insertvon","ext_id","dms_id"), "public.tbl_ampel" => array("ampel_id","kurzbz","beschreibung","benutzer_select","deadline","vorlaufzeit","verfallszeit","insertamum","insertvon","updateamum","updatevon"), "public.tbl_ampel_benutzer_bestaetigt" => array("ampel_benutzer_bestaetigt_id","ampel_id","uid","insertamum","insertvon"), "public.tbl_aufmerksamdurch" => array("aufmerksamdurch_kurzbz","beschreibung","ext_id"),