From df9edc36e0c8128b2e05ba5e1d4108772ed17ae9 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 20 Apr 2026 08:40:55 +0200 Subject: [PATCH 1/4] save temporary --- public/js/components/Stv/Studentenverwaltung.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 66ff7f891..8c077cba6 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -189,10 +189,19 @@ export default { + '&orgform=' + orgform, description: 'stv/grade_report_html' }); + extraItems.push({ + link: FHC_JS_DATA_STORAGE_OBJECT.app_root + + 'index.ci.php/person/gradelist/index/' + + '&student_uid=' + 'mb24b025', + description: 'Studienverlauf' + }); } return extraItems; - } + }, +/* linkGradeList(){ + return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/person/gradelist/index/mb24b025'); + }*/ }, watch: { 'url_studiensemester_kurzbz': function (newVal, oldVal) { @@ -629,6 +638,11 @@ export default { +
  • + + Studienverlauf + +
    • From 903f3b99b3993981c03b9b47eac6f593520710b3 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 20 Apr 2026 11:36:54 +0200 Subject: [PATCH 2/4] add Studienverlauf to AppMenue --- .../js/components/Stv/Studentenverwaltung.js | 25 +++++++----- system/phrasesupdate.php | 40 +++++++++++++++++++ 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 8c077cba6..b009a8bda 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -189,19 +189,16 @@ export default { + '&orgform=' + orgform, description: 'stv/grade_report_html' }); - extraItems.push({ - link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'index.ci.php/person/gradelist/index/' - + '&student_uid=' + 'mb24b025', - description: 'Studienverlauf' - }); } return extraItems; }, -/* linkGradeList(){ - return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/person/gradelist/index/mb24b025'); - }*/ + selected_uid(){ + return this.selected?.[this.selected.length - 1]?.uid ?? null; + }, + linkGradeList(){ + return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/person/gradelist/index/' + this.selected_uid + }, }, watch: { 'url_studiensemester_kurzbz': function (newVal, oldVal) { @@ -440,6 +437,9 @@ export default { }, deleteCustomFilter(){ this.$refs.stvList.resetFilter(); + }, + showAlertNoSelectedStudent(){ + this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseStudent')); } }, created() { @@ -639,8 +639,11 @@ export default {
  • - - Studienverlauf + + {{ $p.t('stv/studienverlauf') }} + + + {{ $p.t('stv/studienverlauf') }}
    • diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 0476db2c9..ba7730c29 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -58177,6 +58177,46 @@ I have been informed that I am under no obligation to consent to the transmissio ) ), // ### Phrases Dashboard Admin END + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'alert_chooseStudent', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bitte eine/n Studierende/n markieren!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Please select a student!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'stv', + 'phrase' => 'studienverlauf', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studienverlauf', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Gradelist', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), ); From 2c0badf67cdede60e73d91e8294bd2d764813aa8 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 23 Apr 2026 17:28:43 +0200 Subject: [PATCH 3/4] bugfix error undefined offset: deletion of unused variable studiengang_kz --- application/controllers/person/Gradelist.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/controllers/person/Gradelist.php b/application/controllers/person/Gradelist.php index 230c7f67f..cfcb10c70 100644 --- a/application/controllers/person/Gradelist.php +++ b/application/controllers/person/Gradelist.php @@ -198,7 +198,7 @@ class Gradelist extends Auth_Controller if (!isset($row_noten->found)) { $result_lv = $this->LehrveranstaltungModel->load($row_noten->lehrveranstaltung_id); - $result_stg = $this->StudiengangModel->load($result_lv->retval[0]->studiengang_kz); + $courses['semester'][$row_noten->studiensemester_kurzbz]['lvs_nonstpl'][] = array( 'lehrveranstaltung_id' => $row_noten->lehrveranstaltung_id, 'lehrtyp_kurzbz' => $result_lv->retval[0]->lehrtyp_kurzbz, @@ -212,8 +212,7 @@ class Gradelist extends Auth_Controller 'semester' => $result_lv->retval[0]->semester, 'note' => $row_noten->note, 'datum' => $row_noten->benotungsdatum, - 'zugeordnet' => true, - 'studiengang_kurzbz' => $result_stg->retval[0]->kurzbzlang + 'zugeordnet' => true ); if(!isset($courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl'])) $courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl'] = 0; From 21ea277aafc3179fc70ecf8ef86468657d3056f3 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 24 Apr 2026 09:20:37 +0200 Subject: [PATCH 4/4] use checks for param studiengang_kurzbz instead of deleting it --- application/controllers/person/Gradelist.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/application/controllers/person/Gradelist.php b/application/controllers/person/Gradelist.php index cfcb10c70..d6df2c43a 100644 --- a/application/controllers/person/Gradelist.php +++ b/application/controllers/person/Gradelist.php @@ -199,6 +199,18 @@ class Gradelist extends Auth_Controller { $result_lv = $this->LehrveranstaltungModel->load($row_noten->lehrveranstaltung_id); + $studiengang_kz = null; + + if (!empty($result_lv->retval) && isset($result_lv->retval[0]) && isset($result_lv->retval[0]->studiengang_kz)) + { + $result_stg = $this->StudiengangModel->load($result_lv->retval[0]->studiengang_kz); + + if (!empty($result_stg->retval) && isset($result_stg->retval[0]) && is_object($result_stg->retval[0]) && isset($result_stg->retval[0]->kurzbzlang)) + { + $studiengang_kz = $result_stg->retval[0]->kurzbzlang; + } + } + $courses['semester'][$row_noten->studiensemester_kurzbz]['lvs_nonstpl'][] = array( 'lehrveranstaltung_id' => $row_noten->lehrveranstaltung_id, 'lehrtyp_kurzbz' => $result_lv->retval[0]->lehrtyp_kurzbz, @@ -212,6 +224,7 @@ class Gradelist extends Auth_Controller 'semester' => $result_lv->retval[0]->semester, 'note' => $row_noten->note, 'datum' => $row_noten->benotungsdatum, + 'studiengang_kurzbz' => $studiengang_kz, 'zugeordnet' => true ); if(!isset($courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl']))