diff --git a/application/controllers/api/frontend/v1/AuthInfo.php b/application/controllers/api/frontend/v1/AuthInfo.php index 1362aee18..72f396b4f 100644 --- a/application/controllers/api/frontend/v1/AuthInfo.php +++ b/application/controllers/api/frontend/v1/AuthInfo.php @@ -20,6 +20,10 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); class AuthInfo extends FHCAPI_Controller { + protected $uid; + protected $pid; + protected $isMitarbeiter; + protected $isStudent; /** * Object initialization @@ -28,10 +32,16 @@ class AuthInfo extends FHCAPI_Controller { parent::__construct([ 'getAuthUID' => self::PERM_LOGGED, + 'getAuthInfo' => self::PERM_LOGGED, ]); + $this->load->model('crm/Student_model', 'StudentModel'); + $this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel'); + $this->uid = getAuthUID(); $this->pid = getAuthPersonID(); + $this->isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($this->uid)) ?? false; + $this->isStudent = getData($this->StudentModel->isStudent($this->uid)) ?? false; } //------------------------------------------------------------------------------------------------------------------ @@ -47,6 +57,14 @@ class AuthInfo extends FHCAPI_Controller $this->terminateWithSuccess(['uid'=>$this->uid]); } - + public function getAuthInfo() + { + $data = (object) array( + 'uid' => $this->uid, + 'isMitarbeiter' => $this->isMitarbeiter, + 'isStudent' => $this->isStudent + ); + $this->terminateWithSuccess($data); + } } diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php index fb4d3ce3c..d17f0c1a1 100644 --- a/application/controllers/api/frontend/v1/Studium.php +++ b/application/controllers/api/frontend/v1/Studium.php @@ -58,8 +58,8 @@ class Studium extends FHCAPI_Controller $parameter_semester = $this->input->get('semester',true); $parameter_studienplan = $this->input->get('studienplan',true); - $aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt())); - + $aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAktOrNextSemester())); + if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){ $studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]); $studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband)); diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 2518e9af9..ac09f39bb 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -159,7 +159,7 @@ class Student extends FHCAPI_Controller { $laufendesStudiensemester = ''; $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - $result = $this->StudiensemesterModel->getNearest(); + $result = $this->StudiensemesterModel->getAktOrNextSemester(); if(hasData($result)) { $laufendesStudiensemester = (getData($result))[0]->studiensemester_kurzbz; } diff --git a/public/css/Cis4/Studium.css b/public/css/Cis4/Studium.css index c0c58e1d0..cb249b5a4 100644 --- a/public/css/Cis4/Studium.css +++ b/public/css/Cis4/Studium.css @@ -3,13 +3,13 @@ gap: 1rem; } -@media (min-width: 992px) { +@media (min-width: 1440px) { .lvUebersicht { grid-template-columns: 1fr 1fr 1fr; } } -@media (max-width: 992px){ +@media (max-width: 1439px){ .lvUebersicht{ grid-template-columns: 1fr 1fr; } @@ -38,13 +38,13 @@ } -@media (min-width: 1200px) { +@media (min-width: 1440px) { .lvOptions { grid-template-columns: 1fr 1fr 1fr 1fr; } } -@media (max-width: 1200px) { +@media (max-width: 1439px) { .lvOptions { grid-template-columns: 1fr 1fr; } diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css index 6b42f6160..4c4616aa5 100644 --- a/public/css/components/dashboard/news.css +++ b/public/css/components/dashboard/news.css @@ -103,7 +103,8 @@ .widgets-news img { - max-width: 100%; + max-width: 100%; + height: auto; } .fhc-news-menu-item { diff --git a/public/js/api/authinfo.js b/public/js/api/authinfo.js index 618cf2e26..cb79ac144 100644 --- a/public/js/api/authinfo.js +++ b/public/js/api/authinfo.js @@ -6,5 +6,10 @@ export default { { } ); }, - + getAuthInfo() { + return this.$fhcApi.get( + '/api/frontend/v1/AuthInfo/getAuthInfo', + {} + ); + }, }; \ No newline at end of file diff --git a/public/js/api/factory/authinfo.js b/public/js/api/factory/authinfo.js index 5cf88604f..80cec2649 100644 --- a/public/js/api/factory/authinfo.js +++ b/public/js/api/factory/authinfo.js @@ -21,5 +21,11 @@ export default { method: 'get', url: '/api/frontend/v1/AuthInfo/getAuthUID' }; + }, + getAuthInfo() { + return { + method: 'get', + url: '/api/frontend/v1/AuthInfo/getAuthInfo' + }; } }; \ No newline at end of file diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js index 5c4be5c23..f6fd462da 100644 --- a/public/js/components/Cis/LvPlan/Personal.js +++ b/public/js/components/Cis/LvPlan/Personal.js @@ -19,7 +19,9 @@ export default { studiensemester_kurzbz: null, studiensemester_start: null, studiensemester_ende: null, - uid: null + uid: null, + isMitarbeiter: false, + isStudent: false }; }, computed:{ @@ -36,7 +38,15 @@ export default { downloadLinks() { if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid) return false; - + + let type = false; + type = this.isStudent ? 'student' : type; + type = this.isMitarbeiter ? 'lektor' : type; + if (false === type) + { + return; + } + const opts = { zone: this.viewData.timezone }; const start = luxon.DateTime .fromISO(this.studiensemester_start, opts) @@ -47,7 +57,7 @@ export default { const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lvplan/stpl_kalender.php' - + '?type=student' + + '?type=' + type + '&pers_uid=' + this.uid + '&begin=' + start + '&ende=' + ende; @@ -96,9 +106,11 @@ export default { }, created() { this.$api - .call(ApiAuthinfo.getAuthUID()) + .call(ApiAuthinfo.getAuthInfo()) .then(res => { this.uid = res.data.uid; + this.isMitarbeiter = res.data.isMitarbeiter; + this.isStudent = res.data.isStudent; }); }, template: /*html*/` diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js index ee1b671e6..f073d5a38 100644 --- a/public/js/components/Cis/Menu.js +++ b/public/js/components/Cis/Menu.js @@ -117,7 +117,7 @@ export default {