feature(News-StudiengangsInformationen): adds the Studiengangsinformationen next to the news view

This commit is contained in:
SimonGschnell
2024-12-04 15:04:05 +01:00
parent f7bc01e63f
commit ecbb65c2a4
6 changed files with 44 additions and 8 deletions
@@ -181,7 +181,6 @@ class Cms extends FHCAPI_Controller
$page_size = $page_size ?? 10;
$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
$news = $this->getDataOrTerminateWithError($news);
$this->addMeta('test', $this->p->t('global', 'studiengangsleitung'));
+3 -3
View File
@@ -236,7 +236,7 @@ class CmsLib
return $news;
$news = getData($news);
//var_dump($news->maxPageCount);
foreach ($news as $newsobj) {
if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
continue;
@@ -247,7 +247,7 @@ class CmsLib
$xml .= "<newswrapper>" . $newsobj->content . $datum . $id . "</newswrapper>";
}
if ($studiengang_kz != 0) {
/* if ($studiengang_kz != 0) {
$stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
if (isError($stg_obj))
return $stg_obj;
@@ -262,7 +262,7 @@ class CmsLib
}
$xml .= '<studiengang_bezeichnung><![CDATA[' . $stg_obj->bezeichnung . ']]></studiengang_bezeichnung>';
}
}
} */
if ($titel != '') {
$xml .= '<news_titel>' . $titel . '</news_titel>';
@@ -687,11 +687,15 @@ class Studiengang_model extends DB_Model
$this->load->model('crm/Student_model', 'StudentModel');
//TODO: this does not work for Mitarbeiter
$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
if (isError($student))
return error($student);
if (getData($student)) {
//TODO: if a mitarbeiter requests this site, empty data should be returned
if(count($student) == 0)
{
return new stdClass();
}
$student = current(getData($student));
$studiengang_kz = $student->studiengang_kz;
$semester = $student->semester;