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

Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp

Browse Source
This commit is contained in:
ma0068
2024-01-18 09:46:39 +01:00
parent b9329aa417 0c0d529478
commit 0512295b8b
10 changed files with 517 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/stv/Noten.php
+2 -2
View File
@@ -30,7 +30,7 @@ class Noten extends Auth_Controller
return $this->outputJson($result);
}
public function getZeugnis($prestudent_id)
public function getZeugnis($prestudent_id, $all = null)
{
$this->load->model('crm/Student_model', 'StudentModel');
$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
@@ -47,7 +47,7 @@ class Noten extends Auth_Controller
$student_uid = current(getData($result))->student_uid;
$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
$result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
if (isError($result)) {
application/controllers/components/stv/Student.php
+6 -1
View File
@@ -77,6 +77,7 @@ class Student extends FHC_Controller
$this->form_validation->set_rules('semester', 'Semester', 'integer');
if ($this->form_validation->run() == false) {
$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
return $this->outputJsonError($this->form_validation->error_array());
}
@@ -202,7 +203,11 @@ class Student extends FHC_Controller
}
}
$this->outputJsonSuccess(true);
$this->outputJson(success(array_fill_keys(array_merge(
array_keys($update_lehrverband),
array_keys($update_person),
array_keys($update_student)
), ''), 1));
}
public function check()