mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 23:42:11 +02:00
Code Issues Projects Releases Wiki Activity

workshop displays assessment weight in the grading evaluation report

Browse Source
This commit is contained in:
David Mudrak 2010-01-04 18:29:06 +00:00
parent 090a7907da
commit 581878b8fa
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/workshop/lang/en_utf8/workshop.php
View File

@ -96,8 +96,8 @@ $string['feedbackauthor'] = 'Feedback for the author';
$string['feedbackreviewer'] = 'Feedback for the reviewer';
$string['formataggregatedgrade'] = '$a->grade';
$string['formataggregatedgradeover'] = '<del>$a->grade</del><br /><ins>$a->over</ins>';
$string['formatpeergrade'] = '$a->grade ($a->gradinggrade)';
$string['formatpeergradeover'] = '$a->grade (<del>$a->gradinggrade</del> / <ins>$a->gradinggradeover</ins>)';
$string['formatpeergrade'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">({$a->gradinggrade})</span> @ <span class=\"weight\">{$a->weight}</span>';
$string['formatpeergradeover'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">(<del>$a->gradinggrade</del> / <ins>$a->gradinggradeover</ins>)</span> @ <span class=\"weight\">{$a->weight}</span>';
$string['givengrades'] = 'Given grades';
$string['gradecalculated'] = 'Calculated grade for submission';
$string['gradedecimals'] = 'Decimal places in grades';

6
mod/workshop/locallib.php
View File

@ -1330,7 +1330,7 @@ class workshop {
$reviewers = array();
if ($submissions) {
list($submissionids, $params) = $DB->get_in_or_equal(array_keys($submissions), SQL_PARAMS_NAMED);
$sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover,
$sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.weight,
r.id AS reviewerid, r.lastname, r.firstname, r.picture, r.imagealt,
s.id AS submissionid, s.authorid
FROM {workshop_assessments} a
@ -1355,7 +1355,7 @@ class workshop {
if ($participants) {
list($participantids, $params) = $DB->get_in_or_equal(array_keys($participants), SQL_PARAMS_NAMED);
$params['workshopid'] = $this->id;
$sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.reviewerid,
$sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.reviewerid, a.weight,
s.id AS submissionid,
e.id AS authorid, e.lastname, e.firstname, e.picture, e.imagealt
FROM {user} u
@ -1410,6 +1410,7 @@ class workshop {
$info->grade = $this->real_grade($reviewer->grade);
$info->gradinggrade = $this->real_grading_grade($reviewer->gradinggrade);
$info->gradinggradeover = $this->real_grading_grade($reviewer->gradinggradeover);
$info->weight = $reviewer->weight;
$grades[$reviewer->authorid]->reviewedby[$reviewer->reviewerid] = $info;
}
unset($reviewers);
@ -1423,6 +1424,7 @@ class workshop {
$info->grade = $this->real_grade($reviewee->grade);
$info->gradinggrade = $this->real_grading_grade($reviewee->gradinggrade);
$info->gradinggradeover = $this->real_grading_grade($reviewee->gradinggradeover);
$info->weight = $reviewee->weight;
$grades[$reviewee->reviewerid]->reviewerof[$reviewee->authorid] = $info;
}
unset($reviewees);

1
mod/workshop/renderer.php
View File

@ -709,6 +709,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
$a = new stdClass();
$a->grade = is_null($assessment->grade) ? get_string('nullgrade', 'workshop') : $assessment->grade;
$a->gradinggrade = is_null($assessment->gradinggrade) ? get_string('nullgrade', 'workshop') : $assessment->gradinggrade;
$a->weight = $assessment->weight;
if (is_null($assessment->gradinggradeover)) {
$grade = get_string('formatpeergrade', 'workshop', $a);
} else {

9
mod/workshop/styles.css
View File

@ -464,8 +464,13 @@
white-space: nowrap;
}
.mod-workshop .grading-report .submissiongrade,
.mod-workshop .grading-report .gradinggrade {
.mod-workshop .grading-report .receivedgrade span.grade,
.mod-workshop .grading-report .givengrade span.gradinggrade {
font-weight: bold;
}
.mod-workshop .grading-report .submissiongrade.cell,
.mod-workshop .grading-report .gradinggrade.cell {
text-align: center;
font-size: 200%;
white-space: nowrap;

1
mod/workshop/view.php
View File

@ -261,7 +261,6 @@ case workshop::PHASE_ASSESSMENT:
}
echo $OUTPUT->box_start('generalbox assessment-summary' . $class);
echo $wsoutput->submission_summary($submission, $shownames);
echo get_string('givengradestatus', 'workshop', $status);
$button = new html_form();
$button->method = 'get';
$button->button->text = $buttontext;