From ee4b61f549717e3c5a83e317f6c8a310bd710c44 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 18 Aug 2025 09:13:14 +0200 Subject: [PATCH] recommit branch; event naming changes; --- application/controllers/api/frontend/v1/Noten.php | 2 +- public/js/components/Cis/Benotungstool/Benotungstool.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/api/frontend/v1/Noten.php b/application/controllers/api/frontend/v1/Noten.php index dcf57f9f1..b10713e99 100644 --- a/application/controllers/api/frontend/v1/Noten.php +++ b/application/controllers/api/frontend/v1/Noten.php @@ -128,7 +128,7 @@ class Noten extends FHCAPI_Controller // TODO: event getExterneNoten Events::trigger( - 'moodleGrades', + 'getExternalGrades', function & () use (&$grades) { return $grades; diff --git a/public/js/components/Cis/Benotungstool/Benotungstool.js b/public/js/components/Cis/Benotungstool/Benotungstool.js index b7ba5a6ae..4e1555b4d 100644 --- a/public/js/components/Cis/Benotungstool/Benotungstool.js +++ b/public/js/components/Cis/Benotungstool/Benotungstool.js @@ -28,9 +28,9 @@ export const Benotungstool = { viewData: { type: Object, required: true, - default: () => ({name: '', uid: ''}), + default: () => ({uid: ''}), validator(value) { - return value && value.name && value.uid + return value && value.uid } } }, @@ -443,7 +443,7 @@ export const Benotungstool = { }, {title: Vue.computed(() => this.$p.t('benotungstool/c4mail')), field: 'email', formatter: this.mailFormatter, tooltip: false, widthGrow: 1}, {title: Vue.computed(() => this.$p.t('benotungstool/c4antrittCount')), field: 'hoechsterAntritt', tooltip: false, widthGrow: 1}, - {title: 'UID', field: 'uid', tooltip: false, widthGrow: 1}, + {title: 'UID', field: 'uid', tooltip: false, widthGrow: 1, topCalc:"sum"}, {title: Vue.computed(() => this.$p.t('benotungstool/c4vorname')), field: 'vorname', tooltip: false, widthGrow: 1}, {title: Vue.computed(() => this.$p.t('benotungstool/c4nachname')), field: 'nachname', widthGrow: 1}, {title: Vue.computed(() => this.$p.t('benotungstool/c4teilnoten')), field: 'teilnote', widthGrow: 1, formatter: this.teilnotenFormatter},