blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4

Browse Source
This commit is contained in:
Harald Bamberger
2025-02-12 17:58:37 +01:00
parent 09aae4c82b 9bcd566bee
commit 2f47cc7966
14 changed files with 248 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Profil.php
+1 -1
View File
@@ -567,7 +567,7 @@ class Profil extends FHCAPI_Controller
*/
private function getStudentInfo($uid)
{
$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
$student_res = $this->StudentModel->load([$uid]);
application/controllers/api/frontend/v1/Studgang.php
+7 -1
View File
@@ -31,6 +31,7 @@ class Studgang extends FHCAPI_Controller
]);
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
// Loads phrases system
$this->loadPhrases([
@@ -43,7 +44,12 @@ class Studgang extends FHCAPI_Controller
// Public methods
public function getStudiengangInfo(){
// fetches the Studiengang Information which is used next the the news
$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
if($isMitarbeiter) {
$this->terminateWithSuccess();
}
// fetches the Studiengang Information which is used next to the news
$studiengangInfo = $this->StudiengangModel->getStudiengangInfoForNews();
$studiengangInfo= $this->getDataOrTerminateWithError($studiengangInfo);
$this->terminateWithSuccess($studiengangInfo);
application/models/organisation/Studiengang_model.php
+1 -5
View File
@@ -656,6 +656,7 @@ class Studiengang_model extends DB_Model
$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
$this->load->model('person/Person_model', 'PersonModel');
$this->load->model('crm/Student_model', 'StudentModel');
$addEmailProperty= function(&$benutzerfunktionen){
if(count($benutzerfunktionen) && defined('DOMAIN'))
@@ -691,11 +692,6 @@ class Studiengang_model extends DB_Model
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;
application/views/CisRouterView/CisRouterView.php
+2 -2
View File
@@ -10,7 +10,7 @@ $includesArray = array(
'primevue3' => true,
'customCSSs' => array(
'public/css/components/verticalsplit.css',
'public/css/components/searchbar.css',
'public/css/components/searchbar/searchbar.css',
'public/css/Fhc.css',
'public/css/components/dashboard.css',
'public/css/components/calendar.css',
@@ -38,4 +38,4 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
:view-data='<?php echo json_encode($viewData) ?>'
></router-view>
</div>
<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>