diff --git a/classes/studentstudyplanservice.php b/classes/studentstudyplanservice.php index aa27572..ec16473 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,true); + $list[] = $studyplan->simple_model_coach(); } } return $list; diff --git a/classes/studyplan.php b/classes/studyplan.php index 2ffe2ba..1433017 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,$coachingoverview=false) { + public function simple_model($userid=null) { global $USER; $pages = []; foreach ($this->pages() as $p) { @@ -300,24 +300,30 @@ class studyplan { 'suspended' => boolval($this->r->suspended), ]; if(isset($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); - } - + $model["userid"] = $userid; + $model["progress"] = $this->scanuserprogress($userid); + $model['amteaching'] = teachingfinder::is_teaching_studyplan($this,$userid); } return $model; } + /** + * Webservice model for basic info in coach mode + * @return array Webservice data model + */ + public function simple_model_coach() { + $model = $this->simple_model(); + $users = $this->find_linked_userids(); + $sum = 0; + foreach ( $users as $uid ) { + $sum += $this->scanuserprogress($uid); + } + + $model["progress"] = $sum / count($users); + + return $model; + } + /** * Webservice structure for editor info * @param int $value Webservice requirement constant