From 42d2f455613c1501364fa3457bf43f70ff2ac3eb Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 6 Apr 2021 13:51:27 +0200
Subject: [PATCH] bei den anmerkungen studiengang hinzugefuegt

---
 application/models/person/Notiz_model.php                   | 6 ++++--
 .../views/system/infocenter/anmerkungenZurBewerbung.php     | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 2e09875d8..fd08cc384 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -154,9 +154,11 @@ 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');
+		$this->addJoin('public.tbl_prestudent', 'prestudent_id', 'LEFT');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+		$this->addOrder('public.tbl_notiz.insertamum', 'DESC');
 
-		return $this->loadWhere(array('person_id' => $person_id, 'titel LIKE' => $titel));
+		return $this->loadWhere(array('public.tbl_notizzuordnung.person_id' => $person_id, 'titel LIKE' => $titel));
 	}
 	
 	/**
diff --git a/application/views/system/infocenter/anmerkungenZurBewerbung.php b/application/views/system/infocenter/anmerkungenZurBewerbung.php
index 85682d2a4..508f041de 100644
--- a/application/views/system/infocenter/anmerkungenZurBewerbung.php
+++ b/application/views/system/infocenter/anmerkungenZurBewerbung.php
@@ -15,6 +15,7 @@
 							<?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?>
 						</td>
 						<td>
+							<?php (!isset($notiz->kurzbzlang)) ?: print_r('(' . nl2br($notiz->kurzbzlang) . ') - ') ?>
 							<?php echo nl2br($notiz->text) ?>
 						</td>
 					</tr>