diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index de02a3a11..97da8ff2e 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -1371,11 +1371,16 @@ class InfoCenter extends Auth_Controller
$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
$sprache = $prestudentstatus->sprachedetails->bezeichnung[0];
$orgform = $prestudentstatus->orgform != '' ? ' ('.$prestudentstatus->orgform.')' : '';
- $geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich';
- $geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
- $zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
+ $statusgrund = isset($prestudentstatus->statusgrund_id) ?
+ '
+ | Statusgrund |
+ '.$prestudentstatus->bezeichnung_statusgrund[0].' |
+
' : '';
+ //$geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich';
+ //$geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
+ /*$zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
$zgvnation = !isEmptyString($prestudent->zgvnation_bez) ? ', '.$prestudent->zgvnation_bez : '';
- $zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';
+ $zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';*/
$dokumenteNachzureichenMail = $dokumenteMail = array();
//convert documents to array so they can be parsed, and keeping only needed fields
@@ -1406,16 +1411,6 @@ class InfoCenter extends Auth_Controller
}
$notizentext .= '';
- $mailadresse = '';
- foreach ($person->kontakte as $kontakt)
- {
- if ($kontakt->kontakttyp === 'email')
- {
- $mailadresse = $kontakt->kontakt;
- break;
- }
- }
-
$data = array
(
'interessentbez' => $interessentbez,
@@ -1423,20 +1418,21 @@ class InfoCenter extends Auth_Controller
'studiengangtypbez' => $prestudent->studiengangtyp_bez,
'orgform' => $orgform,
'studiensemester' => $prestudentstatus->studiensemester_kurzbz,
+ 'ausbildungssemester' => $prestudentstatus->ausbildungssemester,
'sprache' => $sprache,
- 'geschlecht' => $geschlecht,
'vorname' => $person->vorname,
'nachname' => $person->nachname,
- 'gebdatum' => $geburtsdatum,
- 'mailadresse' => $mailadresse,
'prestudentid' => $prestudent_id,
- 'zgvbez' => $prestudent->zgv_bez,
+ 'statusgrund' => $statusgrund,
+ /*'zgvbez' => $prestudent->zgv_bez,
'zgvort' => $zgvort,
'zgvdatum' => $zgvdatum,
'zgvnation' => $zgvnation,
+ */
'notizentext' => $notizentext,
'dokumente' => $dokumenteMail,
- 'dokumente_nachgereicht' => $dokumenteNachzureichenMail
+ 'dokumente_nachgereicht' => $dokumenteNachzureichenMail,
+ 'persondetailslink' => APP_ROOT.'vilesci/personen/personendetails.php?id='.$person_id
);
$this->load->library('LogLib');
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index ccc1e2719..8df400933 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -154,6 +154,7 @@ class Notiz_model extends DB_Model
{
// Join with the table public.tbl_notizzuordnung using notiz_id
$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+ $this->addOrder('insertamum', 'DESC');
return $this->loadWhere(array('person_id' => $person_id, 'titel' => $titel));
}
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 4c2958d62..a26c94177 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -97,7 +97,10 @@