blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adaptierung Buttons: Zurückziehen Stgl und Ausblenden Anträge STGL nicht genehmigt Studentview

Browse Source
This commit is contained in:
ma0068
2023-08-17 11:10:09 +02:00
parent 672ee59ba5
commit c7d2608cce
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/Studierendenantrag.php
+3
View File
@@ -67,6 +67,9 @@ class Studierendenantrag extends FHC_Controller
}
if ($antrag->studierendenantrag_id == null)
continue;
if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL && (!$antrag->isapproved))
continue;
$prestudentenArr[$antrag->prestudent_id]['antraege'][] = $antrag;
}
application/models/education/Studierendenantrag_model.php
+1
View File
@@ -188,6 +188,7 @@ class Studierendenantrag_model extends DB_Model
$this->addSelect($this->dbTable . '.datum_wiedereinstieg');
$this->addSelect($this->dbTable . '.grund');
$this->addSelect($this->dbTable . '.dms_id');
$this->addSelect("(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " . $this->dbTable . ".studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Genehmigt') AS isapproved", false);
$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
public/js/components/Studierendenantrag/Leitung/Table.js
+1 -1
View File
@@ -274,7 +274,7 @@ export default {
container.append(button);
}
// NOTE(chris): Cancel
if (data.typ == 'AbmeldungStgl' && data.status == 'Erstellt') {
if (data.typ == 'AbmeldungStgl' && (data.status == 'Erstellt' || data.status == 'Genehmigt' )) {
let button = document.createElement('button');
button.innerHTML = this.p.t('studierendenantrag', 'btn_cancel');
button.className = "btn btn-outline-secondary";