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

Merge branch 'bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen' into merged_Anrechnungen_26625_27388_28278_28557

Browse Source
This commit is contained in:
Harald Bamberger
2023-04-24 12:12:05 +02:00
parent 64aa3c1250 ea79b92beb
commit 54864da770
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
+1 -1
View File
@@ -609,4 +609,4 @@ class approveAnrechnungDetail extends Auth_Controller
$this->_uid
);
}
}
}
application/libraries/AnrechnungLib.php
+17 -20
View File
@@ -37,33 +37,30 @@ class AnrechnungLib
* @param $lv_id
* @return StdClass
*/
public function getAntragData($prestudent_id, $studiensemester_kurzbz, $lv_id, $anrechnung_id)
public function getAntragData($prestudent_id, $studiensemester_kurzbz, $lv_id, $anrechnung_id = null)
{
$antrag_data = new StdClass();
// Get students UID.
$uid = $this->ci->StudentModel->getUID($prestudent_id);
// Get lehrveranstaltung data.
// If it is a first time request for Anrechnung...
if (isEmptyString($anrechnung_id))
{
//...get LV by student to check also, if student is assigned to that lv
$result = $this->ci->LehrveranstaltungModel->getLvByStudent($uid, $studiensemester_kurzbz, $lv_id);
if (!hasData($result))
{
// ...and break, if course is not assigned to student
show_error('You are not assigned to this course yet.');
}
}
//...in any other case (STGL View; Lector View; Student View when Anrechnung exist)
else
{
$result = $this->ci->LehrveranstaltungModel->load($lv_id);
}
// If Anrechnung exists
if (is_numeric($anrechnung_id))
{
// Just load LV by lv_id
$result = $this->ci->LehrveranstaltungModel->load($lv_id);
$lv = getData($result)[0];
}
// If Anrechnung not exists
else
{
// Load LV, but check if student is assigned to that LV. Break, if not.
if(!$lv = getData($this->ci->LehrveranstaltungModel->getLvByStudent($uid, $studiensemester_kurzbz, $lv_id))[0])
{
show_error('You are not assigned to this course yet.');
}
}
$lv = getData($result)[0];
// Get the students personal data
if (!$person = getData($this->ci->PersonModel->getByUid($uid))[0])
{