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

Merge branch 'feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden'

Browse Source
This commit is contained in:
Harald Bamberger
2024-02-08 08:48:26 +01:00
parent f67a106357 7dfb0429ae
commit 5279a7d45a
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/jobs/AntragJob.php
+17 -4
View File
@@ -306,11 +306,24 @@ class AntragJob extends JOB_Controller
foreach ($prestudents as $prestudent)
{
$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, '', $insertvon);
if (isError($result))
$result = $this->StudierendenantragstatusModel->insert([
'studierendenantrag_id' => $prestudent->studierendenantrag_id,
'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
'insertvon' => 'AntragJob'
]);
if (isError($result)) {
$this->logError(getError($result));
else
$count++;
} else {
$deregisterStatus = getData($result);
$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, '', $insertvon);
if (isError($result)) {
$this->StudierendenantragstatusModel->delete($deregisterStatus);
$this->logError(getError($result));
} else {
$count++;
}
}
}
$this->logInfo($count . " Students set to Abbrecher");
}
application/models/education/Pruefung_model.php
+1
View File
@@ -164,6 +164,7 @@ class Pruefung_model extends DB_Model
$this->addSelect('ps.prestudent_id');
$this->addSelect('lv.bezeichnung as lvbezeichnung');
$this->addSelect('le.studiensemester_kurzbz');
$this->addSelect('a.studierendenantrag_id');
$this->addSelect('a.typ');
$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+2 -1
View File
@@ -29,7 +29,8 @@ export default {
switch (this.data?.status)
{
case 'Erstellt': return 'info';
case 'Genehmigt': return 'success';
case 'Genehmigt':
case 'Abgemeldet': return 'success';
default: return 'info';
}
},
public/js/components/Studierendenantrag/Form/Wiederholung.js
+2 -1
View File
@@ -37,7 +37,8 @@ export default {
{
case 'Erstellt': return 'info';
case 'Genehmigt': return 'success';
case 'Verzichtet': return 'danger';
case 'Verzichtet':
case 'Abgemeldet': return 'danger';
default: return 'info';
}
},