Miqra-Engineering/moodle_local_treestudyplan
2
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases 4 Wiki Activity

Made some code less confusing

Browse Source
This commit is contained in:
PMKuipers 2024-05-18 16:48:35 +02:00
parent bcb288bac8
commit 9caf652ff5
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/studentstudyplanservice.php
View File

@ -567,7 +567,7 @@ class studentstudyplanservice extends \external_api {
foreach ($records as $r) { foreach ($records as $r) {
$studyplan = studyplan::find_by_id($r->studyplan_id); $studyplan = studyplan::find_by_id($r->studyplan_id);
if (has_capability(self::CAP_COACH,$studyplan->context(),$USER)) { if (has_capability(self::CAP_COACH,$studyplan->context(),$USER)) {
$list[] = $studyplan->simple_model($userid,true); $list[] = $studyplan->simple_model_coach();
} }
} }
return $list; return $list;

36
classes/studyplan.php
View File

@ -277,7 +277,7 @@ class studyplan {
* Webservice model for basic info * Webservice model for basic info
* @return array Webservice data model * @return array Webservice data model
*/ */
public function simple_model($userid=null,$coachingoverview=false) { public function simple_model($userid=null) {
global $USER; global $USER;
$pages = []; $pages = [];
foreach ($this->pages() as $p) { foreach ($this->pages() as $p) {
@ -300,24 +300,30 @@ class studyplan {
'suspended' => boolval($this->r->suspended), 'suspended' => boolval($this->r->suspended),
]; ];
if(isset($userid)) { if(isset($userid)) {
if(!$coachingoverview) { $model["userid"] = $userid;
$model["userid"] = $userid; $model["progress"] = $this->scanuserprogress($userid);
$model["progress"] = $this->scanuserprogress($userid); $model['amteaching'] = teachingfinder::is_teaching_studyplan($this,$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; 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 * Webservice structure for editor info
* @param int $value Webservice requirement constant * @param int $value Webservice requirement constant