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

Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen

Browse Source
This commit is contained in:
KarpAlex
2022-09-30 18:16:46 +02:00
parent c00b9006b5 f7b3a3ccaf
commit 854e0a422f
59 changed files with 924 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/codex/Zgv.php
-8
View File
@@ -45,14 +45,6 @@ class Zgv extends API_Controller
}
}
/**
* @return zgv
*/
public function getAllZgv()
{
$this->response($this->Zgv_model->getAllZgv(), REST_Controller::HTTP_OK);
}
/**
* @return void
*/
application/controllers/api/v1/codex/Zgvmaster.php
-8
View File
@@ -45,14 +45,6 @@ class Zgvmaster extends API_Controller
}
}
/**
* @return zgvmaster
*/
public function getAllZgvmaster()
{
$this->response($this->Zgvmaster_model->getAllZgvmaster(), REST_Controller::HTTP_OK);
}
/**
* @return void
*/
application/controllers/organisation/Studiensemester.php
+1 -1
View File
@@ -138,7 +138,7 @@ class Studiensemester extends Auth_Controller
$start = $this->input->post("semstart");
$ende = $this->input->post("semende");
$studienjahr_kurzbz = $this->input->post("studienjahrkurzbz");
$beschreibung = $this->input->post("beschreibung");
$beschreibung = isEmptyString($this->input->post("beschreibung")) ? null : $this->input->post("beschreibung");
$onlinebewerbung = $this->input->post("onlinebewerbung");
$onlinebewerbung = isset($onlinebewerbung);
application/controllers/system/infocenter/InfoCenter.php
+14 -2
View File
@@ -423,7 +423,7 @@ class InfoCenter extends Auth_Controller
if (hasData($akte))
{
$akte = getData($akte);
if ($akte->person_id === $person_id)
if ($akte->person_id === (int)$person_id)
{
$result = $this->aktelib->remove($akte_id);
@@ -1987,11 +1987,23 @@ class InfoCenter extends Auth_Controller
$studienArtBerechtigung = array_column($this->getStudienArtBerechtigung(), 'typ');
$this->ZgvModel->addOrder('zgv_bez');
$allZGVs = getData($this->ZgvModel->load());
$this->ZgvModel->addOrder('zgvmas_bez');
$allZGVsMaster = getData($this->ZgvmasterModel->load());
$this->NationModel->addOrder('langtext');
$allNations = getData($this->NationModel->load());
$data = array (
'zgvpruefungen' => $zgvpruefungen,
'abwstatusgruende' => $abwstatusgruende,
'intstatusgruende' => $intstatusgruende,
'studienArtBerechtigung' => $studienArtBerechtigung
'studienArtBerechtigung' => $studienArtBerechtigung,
'all_zgvs' => $allZGVs,
'all_zgvs_master' => $allZGVsMaster,
'all_nations' => $allNations,
);
return $data;