Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung

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);
+	}
 }
 

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;
 		}

application/controllers/api/frontend/v1/stv/Students.php

@@ -45,6 +45,13 @@ class Students extends FHCAPI_Controller
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PhrasesLib');
+		$this->loadPhrases(
+			array(
+				'lehre'
+			)
+		);
+
 	}
 
 	/**