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

Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' of github.com:FH-Complete/FHC-Core into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231

Browse Source
This commit is contained in:
ma0068
2025-07-16 11:44:55 +02:00
parent 1ff3f7b66d c3d0f03704
commit c36459b508
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Student.php
-2
View File
@@ -258,11 +258,9 @@ class Student extends FHCAPI_Controller
}
$array_allowed_props_student = ['matrikelnr'];
$this->addMeta('bhtest1', $this->isLaufendesSemester($studiensemester_kurzbz));
if($this->isLaufendesSemester($studiensemester_kurzbz))
{
$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
$this->addMeta('bhtest2', $array_allowed_props_student);
}
$update_student = array();
foreach ($array_allowed_props_student as $prop) {
application/controllers/api/frontend/v1/stv/Students.php
+6 -6
View File
@@ -223,25 +223,25 @@ class Students extends FHCAPI_Controller
break;
case "bewerbungnichtabgeschickt":
$where['ps.status_kurzbz'] = 'Interessent';
$where['bewerbung_abgeschicktamum'] = null;
$where['ps.bewerbung_abgeschicktamum'] = null;
break;
case "bewerbungabgeschickt":
$where['ps.status_kurzbz'] = 'Interessent';
$where['bewerbung_abgeschicktamum IS NOT NULL'] = null;
$where['bestaetigtam'] = null;
$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
$where['ps.bestaetigtam'] = null;
break;
case "statusbestaetigt":
$where['ps.status_kurzbz'] = 'Interessent';
$where['bestaetigtam IS NOT NULL'] = null;
$where['ps.bestaetigtam IS NOT NULL'] = null;
break;
case "statusbestaetigtrtnichtangemeldet":
$where['ps.status_kurzbz'] = 'Interessent';
$where['bestaetigtam IS NOT NULL'] = null;
$where['ps.bestaetigtam IS NOT NULL'] = null;
$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
break;
case "statusbestaetigtrtangemeldet":
$where['ps.status_kurzbz'] = 'Interessent';
$where['bestaetigtam IS NOT NULL'] = null;
$where['ps.bestaetigtam IS NOT NULL'] = null;
$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
break;
case "zgv":