diff --git a/content/akteupload.php b/content/akteupload.php index 5e41c1cb2..dc5d21522 100644 --- a/content/akteupload.php +++ b/content/akteupload.php @@ -180,15 +180,26 @@ if(isset($_POST['submitbild'])) if(isset($_GET['person_id'])) { $dokument = new dokument(); - $dokument->getAllDokumente(); - echo "
"; } else { diff --git a/include/akadgrad.class.php b/include/akadgrad.class.php index ddfd3cfdd..596628da0 100644 --- a/include/akadgrad.class.php +++ b/include/akadgrad.class.php @@ -115,5 +115,53 @@ class akadgrad extends basis_db return false; } } + + /** + * Liefert den Akademischen Grad eines Studenten gemaess Studienordnung + * @param student_uid + */ + public function getAkadgradStudent($student_uid) + { + //laden des Datensatzes + $qry = "SELECT * + FROM + lehre.tbl_akadgrad WHERE akadgrad_id = + ( + SELECT akadgrad_id + FROM lehre.tbl_studienplan + JOIN lehre.tbl_studienordnung USING (studienordnung_id) + WHERE studienplan_id = + ( + SELECT studienplan_id + FROM public.tbl_student + JOIN public.tbl_prestudentstatus USING (prestudent_id) + WHERE student_uid='ew13b001' + ORDER BY tbl_prestudentstatus.datum DESC, tbl_prestudentstatus.insertamum DESC LIMIT 1 + ) + )"; + + if($this->db_query($qry)) + { + if($row = $this->db_fetch_object()) + { + $this->akadgrad_id = $row->akadgrad_id; + $this->akadgrad_kurzbz = $row->akadgrad_kurzbz; + $this->studiengang_kz = $row->studiengang_kz; + $this->titel = $row->titel; + $this->geschlecht = $row->geschlecht; + return true; + } + else + { + $this->errormsg = 'Fehler bei der Datenbankabfrage'; + return false; + } + } + else + { + $this->errormsg = 'Fehler bei der Datenbankabfrage'; + return false; + } + } } ?> diff --git a/include/dokument.class.php b/include/dokument.class.php index 1741b313b..5d577d180 100644 --- a/include/dokument.class.php +++ b/include/dokument.class.php @@ -334,7 +334,7 @@ class dokument extends basis_db */ public function getAllDokumente() { - $qry = "SELECT * FROM public.tbl_dokument;"; + $qry = "SELECT * FROM public.tbl_dokument ORDER BY bezeichnung;"; if($this->db_query($qry)) { diff --git a/locale/de-AT/profil.php b/locale/de-AT/profil.php index 23f53c9c8..13f668f61 100644 --- a/locale/de-AT/profil.php +++ b/locale/de-AT/profil.php @@ -12,8 +12,8 @@ $this->phrasen['profil/student']='StudentIn'; $this->phrasen['profil/martrikelnummer']='Personenkennzeichen'; $this->phrasen['profil/leistungsbeurteilung']='Leistungsbeurteilung'; $this->phrasen['profil/kurzzeichen']='Kurzzeichen'; -$this->phrasen['profil/telefonTw']='Telefon TW'; -$this->phrasen['profil/faxTw']='Fax TW'; +$this->phrasen['profil/telefonTw']='Telefon'; +$this->phrasen['profil/faxTw']='Fax'; $this->phrasen['profil/zeitwuensche']='Zeitwünsche'; $this->phrasen['profil/funktionen']='Funktionen'; $this->phrasen['profil/entlehnteBetriebsmittel']='Entlehnte Betriebsmittel'; diff --git a/locale/en-US/profil.php b/locale/en-US/profil.php index a67dc1dcc..9a524e338 100644 --- a/locale/en-US/profil.php +++ b/locale/en-US/profil.php @@ -12,8 +12,8 @@ $this->phrasen['profil/student']='Student'; $this->phrasen['profil/martrikelnummer']='matriculation number'; $this->phrasen['profil/leistungsbeurteilung']='Performance assessment'; $this->phrasen['profil/kurzzeichen']='Abbreviation'; -$this->phrasen['profil/telefonTw']='Telephone TW'; -$this->phrasen['profil/faxTw']='Fax TW'; +$this->phrasen['profil/telefonTw']='Telephone'; +$this->phrasen['profil/faxTw']='Fax'; $this->phrasen['profil/zeitwuensche']='Preferred teaching times'; $this->phrasen['profil/funktionen']='Functions'; $this->phrasen['profil/entlehnteBetriebsmittel']='Borrowed equipment'; diff --git a/rdf/ausbildungsvertrag.xml.php b/rdf/ausbildungsvertrag.xml.php index cc8d9e58f..40cfadb16 100755 --- a/rdf/ausbildungsvertrag.xml.php +++ b/rdf/ausbildungsvertrag.xml.php @@ -26,6 +26,9 @@ require_once('../include/student.class.php'); require_once('../include/prestudent.class.php'); require_once('../include/adresse.class.php'); require_once('../include/lehrveranstaltung.class.php'); +require_once('../include/akadgrad.class.php'); +require_once('../include/studiensemester.class.php'); +require_once('../include/nation.class.php'); $uid_arr = (isset($_REQUEST['uid'])?$_REQUEST['uid']:null); @@ -77,6 +80,8 @@ foreach($uid_arr as $uid) $gebdatum = date('d.m.Y',strtotime($student->gebdatum)); $studiengang = new studiengang(); $studiengang->load($student->studiengang_kz); + $staatsbuergerschaft = new nation(); + $staatsbuergerschaft->load($student->staatsbuergerschaft); $svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr; @@ -88,6 +93,8 @@ foreach($uid_arr as $uid) echo "\t\t| + |
|