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

adapt addNewPruefung, pruefungModal, function getLvsByStudent

Browse Source
This commit is contained in:
ma0068
2024-09-17 15:28:18 +02:00
parent de0fbdb72c
commit 4d5ea1f519
3 changed files with 125 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Pruefung.php
+13 -4
View File
@@ -101,7 +101,7 @@ class Pruefung extends FHCAPI_Controller
}
public function insertPruefung(){
//TODO(Manu) validations
//TODO(Manu) Berechtigungen
$authUID = getAuthUID();
$lehreinheit_id = $this->input->post('lehreinheit_id');
@@ -112,6 +112,11 @@ class Pruefung extends FHCAPI_Controller
$pruefungstyp_kurzbz = $this->input->post('pruefungstyp_kurzbz');
$anmerkung = $this->input->post('anmerkung');
$this->load->library('form_validation');
$this->form_validation->set_rules(
'datum', $this->p->t('global', 'datum'), ['is_valid_date']
);
$result = $this->PruefungModel->insert([
'lehreinheit_id' => $lehreinheit_id,
@@ -132,7 +137,7 @@ class Pruefung extends FHCAPI_Controller
}
public function updatePruefung($pruefung_id){
//TODO(Manu) validations
//TODO(Manu) validations and Berechtigungen
$result = $this->PruefungModel->load($pruefung_id);
$oldpruefung = $this->getDataOrTerminateWithError($result);
@@ -280,11 +285,15 @@ class Pruefung extends FHCAPI_Controller
return $this->terminateWithSuccess($allDataMa);
}
public function getLvsByStudent($student_uid)
public function getLvsByStudent($student_uid, $studiensemester_kurzbz=null )
{
//bei post request
/* $student_uid = $this->input->post('student_uid');
$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');*/
$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid, $studiensemester_kurzbz);
$data = $this->getDataOrTerminateWithError($result);
application/models/education/Lehrveranstaltung_model.php
+4 -3
View File
@@ -226,7 +226,7 @@ class Lehrveranstaltung_model extends DB_Model
/**
* Gets Lehrveranstaltungen of a student
* @param $student_uid
* @param null $studiensemester_kurzbz
* @param $studiensemester_kurzbz
* @return array|null
*/
public function getLvsByStudent($student_uid, $studiensemester_kurzbz = null)
@@ -236,6 +236,7 @@ class Lehrveranstaltung_model extends DB_Model
$qry = "SELECT * FROM lehre.tbl_lehrveranstaltung
WHERE lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM campus.vw_student_lehrveranstaltung
WHERE uid=?";
if (isset($studiensemester_kurzbz))
{
$qry .= " AND studiensemester_kurzbz=?";
@@ -243,11 +244,11 @@ class Lehrveranstaltung_model extends DB_Model
}
$qry .= ") OR lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM lehre.tbl_zeugnisnote WHERE student_uid=?";
$params[] = $student_uid;
if (isset($studiensemester_kurzbz))
/* if (isset($studiensemester_kurzbz))
{
$qry .= " AND studiensemester_kurzbz=?";
$params[] = $studiensemester_kurzbz;
}
}*/
$qry .= ") ORDER BY semester, bezeichnung";
return $this->execQuery($qry, $params);