From bcb288bac859ed307b1266ce475b44fb7f65dff6 Mon Sep 17 00:00:00 2001 From: PMKuipers Date: Sat, 18 May 2024 16:46:27 +0200 Subject: [PATCH] Enabled coach progress bar --- classes/studentstudyplanservice.php | 2 +- classes/studyplan.php | 19 +++++++++++++++---- lang/nl/local_treestudyplan.php | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/classes/studentstudyplanservice.php b/classes/studentstudyplanservice.php index 9ad7359..aa27572 100644 --- a/classes/studentstudyplanservice.php +++ b/classes/studentstudyplanservice.php @@ -567,7 +567,7 @@ class studentstudyplanservice extends \external_api { foreach ($records as $r) { $studyplan = studyplan::find_by_id($r->studyplan_id); if (has_capability(self::CAP_COACH,$studyplan->context(),$USER)) { - $list[] = $studyplan->simple_model($userid); + $list[] = $studyplan->simple_model($userid,true); } } return $list; diff --git a/classes/studyplan.php b/classes/studyplan.php index 9f4b97a..2ffe2ba 100644 --- a/classes/studyplan.php +++ b/classes/studyplan.php @@ -277,7 +277,7 @@ class studyplan { * Webservice model for basic info * @return array Webservice data model */ - public function simple_model($userid=null) { + public function simple_model($userid=null,$coachingoverview=false) { global $USER; $pages = []; foreach ($this->pages() as $p) { @@ -300,9 +300,20 @@ class studyplan { 'suspended' => boolval($this->r->suspended), ]; if(isset($userid)) { - $model["userid"] = $userid; - $model["progress"] = $this->scanuserprogress($userid); - $model['amteaching'] = teachingfinder::is_teaching_studyplan($this,$userid); + if(!$coachingoverview) { + $model["userid"] = $userid; + $model["progress"] = $this->scanuserprogress($userid); + $model['amteaching'] = teachingfinder::is_teaching_studyplan($this,$userid); + } else { + $users = $this->find_linked_userids(); + $sum = 0; + foreach ( $users as $uid ) { + $sum += $this->scanuserprogress($uid); + } + + $model["progress"] = $sum / count($users); + } + } return $model; } diff --git a/lang/nl/local_treestudyplan.php b/lang/nl/local_treestudyplan.php index 257a598..b59024b 100644 --- a/lang/nl/local_treestudyplan.php +++ b/lang/nl/local_treestudyplan.php @@ -311,7 +311,7 @@ $string["selectstudent_details"] = "Kies een student uit de lijst om zijn/haar v $string["showoverview"] = "Docentenweergave"; $string["coacheditmode"] = "Bewerk inhoud"; $string["open"] = "Openen"; -$string["noenddate"] = "∞"; +$string["noenddate"] = "∞"; $string["back"] = "Terug"; $string["send"] = "Verzenden"; @@ -329,7 +329,7 @@ $string["bistate_aggregator_desc"] = 'Doelen zijn behaald of niet (o.a. niet ges $string["core_aggregator_title"] = 'Moodle cursusvoltooiing'; $string["core_aggregator_desc"] = 'Gebruik de ingesteld cursusvoltooiing'; -$string["competency_aggregator_title"] = 'Curuscompetenties'; +$string["competency_aggregator_title"] = 'Cursuscompetenties'; $string["competency_aggregator_desc"] = 'Gebruik de bij de cursus ingestelde competenties';