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

load Teilnoten via moodle Event trigger; WIP further noten/punkte logic;

Browse Source
This commit is contained in:
Johann Hoffmann
2025-05-12 16:45:33 +02:00
parent 5bbf05ac8a
commit 658fe79ad7
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Noten.php
+25 -5
View File
@@ -18,8 +18,8 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
require_once(__DIR__.'/../../../../../include/lehreinheit.class.php');
require_once(__DIR__.'/../../../../../include/legesamtnote.class.php');
use CI3_Events as Events;
class Noten extends FHCAPI_Controller
{
@@ -46,7 +46,6 @@ class Noten extends FHCAPI_Controller
public function getStudentenNoten() {
$lv_id = $this->input->get("lv_id",TRUE);
$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
$active = true; // todo: check this param
if (!isset($lv_id) || isEmptyString($lv_id)
|| !isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
@@ -58,16 +57,37 @@ class Noten extends FHCAPI_Controller
$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
// get studenten for lva & sem with zeugnisnote if available
$studenten = $this->LehrveranstaltungModel->getStudentsByLv($sem_kurzbz, $lv_id, $active);
$studenten = $this->LehrveranstaltungModel->getStudentsByLv($sem_kurzbz, $lv_id);
$studentenData = $this->getDataOrTerminateWithError($studenten);
$func = function ($value) {
return $value->uid;
};
$grades = array();
$student_uids = array_map($func, $studentenData);
foreach($student_uids as $uid) {
$grades[$uid]['grades'] = [];
}
// send $grades reference to moodle addon
Events::trigger(
'moodleGrades',
function & () use (&$grades)
{
return $grades;
},
[
'lvid' => $lv_id,
'stsem' => $sem_kurzbz
]
);
// get all prüfungen with noten held in that semester in that lva
$pruefungen = $this->PruefungModel->getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz);
$pruefungenData = $this->getDataOrTerminateWithError($pruefungen);
$this->terminateWithSuccess(array($studentenData, $pruefungenData, DOMAIN));
$this->terminateWithSuccess(array($studentenData, $pruefungenData, DOMAIN, $grades));
}
public function getNoten() {
public/js/components/Cis/Benotungstool/Benotungstool.js
+15 -10
View File
@@ -48,14 +48,14 @@ export const Benotungstool = {
notenTableOptions: {
height: 700,
index: 'student_uid',
layout: 'fitColumns',
layout: 'fitDataStretch',
placeholder: this.$p.t('global/noDataAvailable'),
columns: [
{title: Vue.computed(() => this.$p.t('benotungstool/c4mail')), field: 'email', formatter: this.mailFormatter, tooltip: false, widthGrow: 1},
{title: 'UID', field: 'uid', tooltip: false, widthGrow: 1},
{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: 'teilnoten', widthGrow: 1},
{title: Vue.computed(() => this.$p.t('benotungstool/c4teilnoten')), field: 'teilnote', widthGrow: 1},
{title: Vue.computed(() => this.$p.t('benotungstool/c4note')), field: 'note_vorschlag',
editor: 'list',
editorParams: {
@@ -74,14 +74,10 @@ export const Benotungstool = {
widthGrow: 1},
{title: '', width: 50, hozAlign: 'center', formatter: this.arrowFormatter, cellClick: this.saveNote},
{title: Vue.computed(() => this.$p.t('benotungstool/c4lvnote')), field: 'lv_note',
formatter: (cell) => {
const value = cell.getValue()
const match = this.notenOptions.find(opt => opt.note === value)
return match ? match.bezeichnung : value
},
formatter: this.notenFormatter,
widthGrow: 1},
{title: Vue.computed(() => this.$p.t('benotungstool/c4freigabe')), field: 'freigegeben', widthGrow: 1},
{title: Vue.computed(() => this.$p.t('benotungstool/c4zeugnisnote')), field: 'note', widthGrow: 1}
{title: Vue.computed(() => this.$p.t('benotungstool/c4zeugnisnote')), field: 'note', formatter: this.notenFormatter, widthGrow: 1}
// {title: Vue.computed(() => this.$p.t('benotungstool/c4termin1')), field: 'termin1', widthGrow: 1},
// {title: Vue.computed(() => this.$p.t('benotungstool/c4termin2')), field: 'termin2', widthGrow: 1},
// {title: Vue.computed(() => this.$p.t('benotungstool/c4termin3')), field: 'termin3', widthGrow: 1}
@@ -105,6 +101,11 @@ export const Benotungstool = {
]};
},
methods: {
notenFormatter(cell) {
const value = cell.getValue()
const match = this.notenOptions.find(opt => opt.note === value)
return match ? match.bezeichnung : value
},
handlePasswordChanged(pw) {
console.log('pw:', pw)
},
@@ -133,6 +134,7 @@ export const Benotungstool = {
this.studenten = data[0]
this.pruefungen = data[1]
this.domain = data[2]
this.teilnoten = data[3]
this.pruefungen.forEach(p => {
const student = this.studenten.find(s => s.uid === p.student_uid)
@@ -149,12 +151,15 @@ export const Benotungstool = {
// }
// TODO: LE TEILNOTEN IN BACKEND LADEN, BERECHNEN UND VORSCHLAG PASTEN
// if(p.negativ)
student.teilnoten = ''
// if(p.negativ)
})
this.studenten.forEach(s => {
s.email = this.buildMailToLink(s)
const grades = this.teilnoten[s.uid].grades
s.teilnote = ''
grades.forEach(g => s.teilnote += g.text + ' ')
})
this.$refs.notenTable.tabulator.clearSort()