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

change form parameter mobility and add param studiensemester_kurzbz to function get LVsandLesByStudent

Browse Source
This commit is contained in:
ma0068
2025-03-03 11:45:31 +01:00
parent 28f11d7550
commit b50a4a16d1
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Pruefung.php
+4 -2
View File
@@ -461,11 +461,13 @@ class Pruefung extends FHCAPI_Controller
$this->terminateWithSuccess($data);
}
public function getLvsandLesByStudent($student_uid)
public function getLvsandLesByStudent($student_uid, $semester_kurzbz=null)
{
$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
//return $this->terminateWithError($semester_kurzbz, self::ERROR_TYPE_GENERAL);
$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid, $semester_kurzbz);
$data = $this->getDataOrTerminateWithError($result);
application/models/education/Lehrveranstaltung_model.php
+14 -11
View File
@@ -522,24 +522,27 @@ class Lehrveranstaltung_model extends DB_Model
*/
public function getLvsByStudent($student_uid, $studiensemester_kurzbz = null)
{
$params = array($student_uid);
// $studiensemester_kurzbz = 'WS2024';
//$studiensemester_kurzbz = null;
$qry = "SELECT * FROM lehre.tbl_lehrveranstaltung
WHERE lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM campus.vw_student_lehrveranstaltung
WHERE uid=?";
$params = array($student_uid);
$qry = "SELECT DISTINCT * 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=?";
$params[] = $studiensemester_kurzbz;
$qry .= " AND studiensemester_kurzbz=?";
}
$qry .= ") OR lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM lehre.tbl_zeugnisnote WHERE student_uid=?";
$qry .= ")";
$qry .= " OR lehrveranstaltung_id IN(
SELECT lehrveranstaltung_id FROM lehre.tbl_zeugnisnote
WHERE student_uid=?";
$params[] = $student_uid;
/* if (isset($studiensemester_kurzbz))
{
$qry .= " AND studiensemester_kurzbz=?";
$params[] = $studiensemester_kurzbz;
}*/
$qry .= ") ORDER BY semester, bezeichnung";
return $this->execQuery($qry, $params);
public/js/api/stv/exam.js
+2 -2
View File
@@ -14,8 +14,8 @@ export default {
getLvsByStudent(uid){
return this.$fhcApi.get('api/frontend/v1/stv/pruefung/getLvsByStudent/' + uid)
},
getLvsandLesByStudent(uid){
return this.$fhcApi.get('api/frontend/v1/stv/pruefung/getLvsandLesByStudent/' + uid);
getLvsandLesByStudent(uid, semester){
return this.$fhcApi.get('api/frontend/v1/stv/pruefung/getLvsandLesByStudent/' + uid + '/' + semester);
},
getLvsAndMas(uid){
return this.$fhcApi.get('api/frontend/v1/stv/pruefung/getLvsAndMas/' + uid)
public/js/api/stv/mobility.js
+4 -4
View File
@@ -5,14 +5,14 @@ export default {
getProgramsMobility(){
return this.$fhcApi.get('api/frontend/v1/stv/mobility/getProgramsMobility/');
},
addNewMobility(data){
return this.$fhcApi.post('api/frontend/v1/stv/mobility/insertMobility/', data);
addNewMobility(form, data){
return this.$fhcApi.post(form, 'api/frontend/v1/stv/mobility/insertMobility/', data);
},
loadMobility(bisio_id){
return this.$fhcApi.get('api/frontend/v1/stv/mobility/loadMobility/' + bisio_id);
},
updateMobility(data){
return this.$fhcApi.post('api/frontend/v1/stv/mobility/updateMobility/', data);
updateMobility(form, data){
return this.$fhcApi.post(form, 'api/frontend/v1/stv/mobility/updateMobility/', data);
},
deleteMobility(bisio_id){
return this.$fhcApi.post('api/frontend/v1/stv/mobility/deleteMobility/' + bisio_id);
public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+2 -2
View File
@@ -209,7 +209,7 @@ export default {
uid: this.student.uid,
formData: this.formData
};
return this.$refs.formMobility.factory.stv.mobility.addNewMobility(dataToSend)
return this.$fhcApi.factory.stv.mobility.addNewMobility(this.$refs.formMobility, dataToSend)
.then(response => {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.resetForm();
@@ -252,7 +252,7 @@ export default {
formData: this.formData,
uid: this.student.uid,
};
this.$refs.formMobility.factory.stv.mobility.updateMobility(dataToSend)
this.$fhcApi.factory.stv.mobility.updateMobility(this.$refs.formMobility, dataToSend)
.then(response => {
this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
this.resetForm();
public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+5 -1
View File
@@ -362,7 +362,7 @@ export default{
})
.catch(this.$fhcAlert.handleSystemError);
this.$fhcApi.factory.stv.exam.getLvsandLesByStudent(this.uid)
this.$fhcApi.factory.stv.exam.getLvsandLesByStudent(this.uid, this.currentSemester)
.then(result => {
this.listLvsAndLes = result.data;
})
@@ -387,6 +387,10 @@ export default{
},
template: `
<div class="stv-details-pruefung-pruefung-list 100 pt-3">
{{currentSemester}}
{{listLvsAndLes.gruppe}}
<div>
<div class="justify-content-end pb-3">