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

Merge branch 'feature-33459/Studierendenstatusverwaltung_Unterbrechung_Studiensemester'

Browse Source
This commit is contained in:
Harald Bamberger
2023-10-02 16:45:44 +02:00
parent c828fe2ee4 ad191f3f90
commit b618ad247a
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/Antrag/Unterbrechung.php
+1 -1
View File
@@ -86,7 +86,7 @@ class Unterbrechung extends FHC_Controller
$data = getData($result);
$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiengang_kz, $data->studiensemester_kurzbz, $data->semester);
$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiensemester_kurzbz);
$this->outputJsonSuccess($data);
}
application/libraries/AntragLib.php
+1 -10
View File
@@ -1421,17 +1421,12 @@ class AntragLib
return success($resultDetails);
}
public function getSemesterForUnterbrechung($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester)
public function getSemesterForUnterbrechung($studiensemester_kurzbz)
{
$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$semester = [];
$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester);
if (!hasData($result))
return $semester;
$result = $this->_ci->StudiensemesterModel->getNextFrom($studiensemester_kurzbz);
if (!hasData($result))
return $semester;
@@ -1442,10 +1437,6 @@ class AntragLib
'wiedereinstieg' => [$nextSem]
];
$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $nextSem->studiensemester_kurzbz, $ausbildungssemester+1);
if (!hasData($result))
return $semester;
$result = $this->_ci->StudiensemesterModel->getNextFrom($nextSem->studiensemester_kurzbz);
if (!hasData($result))
return $semester;
public/js/components/Studierendenantrag/Form/Unterbrechung.js
+5 -3
View File
@@ -277,11 +277,13 @@ export default {
<div v-if="data.studierendenantrag_id">
{{datumWsFormatted}}
</div>
<div v-else-if="stsem === null" class="form-control">
{{p.t('ui/select_studiensemester')}}
<div v-else-if="stsem === null">
<select class="form-select" disabled>
<option selected>{{p.t('ui/select_studiensemester')}}</option>
</select>
</div>
<div v-else>
<select v-model="currentWiedereinstieg" class="form-control">
<select v-model="currentWiedereinstieg" class="form-select">
<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start">
{{sem.studiensemester_kurzbz}}
</option>