L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uses workshop renderer to display assessment page

Browse Source 
Some small refactoring like using single function to group users done.
This commit is contained in:
David Mudrak
2010-01-04 17:48:33 +00:00
parent 0dc47fb913
commit b8ead2e6a4
12 changed files with 386 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/workshop/allocation/manual/renderer.php
+16 -8
View File
@@ -131,10 +131,7 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
if (is_null($user->submissionid)) {
$o .= $this->output->output_tag('span', array('class' => 'info'), get_string('nothingtoreview', 'workshop'));
} else {
$options = array();
foreach ($workshop->get_peer_reviewers(!$workshop->assesswosubmission) as $reviewer) {
$options[$reviewer->id] = fullname($reviewer);
}
$options = $this->users_to_menu_options($workshop->get_peer_reviewers(!$workshop->assesswosubmission));
if (!$workshop->useselfassessment) {
// students can not review their own submissions in this workshop
if (isset($options[$user->id])) {
@@ -173,10 +170,7 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
if (is_null($user->submissionid)) {
$o .= $this->output->container(get_string('withoutsubmission', 'workshop'), 'info');
}
$options = array();
foreach ($workshop->get_peer_authors() as $author) {
$options[$author->id] = fullname($author);
}
$options = $this->users_to_menu_options($workshop->get_peer_authors());
if (!$workshop->useselfassessment) {
// students can not be reviewed by themselves in this workshop
if (isset($options[$user->id])) {
@@ -202,4 +196,18 @@ class moodle_mod_workshop_allocation_manual_renderer extends moodle_renderer_bas
return $o;
}
/**
* Given a list of users, returns an array suitable to render the HTML select field
*
* @param array $users array of users or array of groups of users
* @return array of options to be passed to {@see popup_form()}
*/
protected function users_to_menu_options(&$users) {
$options = array();
foreach ($users as $user) {
$options[$user->id] = fullname($user);
}
return $options;
}
}
mod/workshop/allocation/random/allocator.php
+4 -2
View File
@@ -84,8 +84,10 @@ class workshop_random_allocator implements workshop_allocator {
$musthavesubmission = empty($assesswosubmission);
$addselfassessment = required_param('addselfassessment', PARAM_INT);
$authors = $this->workshop->get_peer_authors_by_group();
$reviewers = $this->workshop->get_peer_reviewers_by_group($musthavesubmission);
$authors = $this->workshop->get_peer_authors();
$authors = $this->workshop->get_grouped($authors);
$reviewers = $this->workshop->get_peer_reviewers($musthavesubmission);
$reviewers = $this->workshop->get_grouped($reviewers);
$assessments = $this->workshop->get_assessments();
$newallocations = array(); // array of (reviewer,reviewee) tuples