From 8d57ce649d873050ed3aeea3e17b81c1b1549141 Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Mon, 4 Jan 2010 18:22:37 +0000 Subject: [PATCH] Do not display given grade before the workshop is closed --- mod/workshop/lang/en_utf8/workshop.php | 2 +- mod/workshop/view.php | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/mod/workshop/lang/en_utf8/workshop.php b/mod/workshop/lang/en_utf8/workshop.php index 9f71411f9d..44c733cdd2 100644 --- a/mod/workshop/lang/en_utf8/workshop.php +++ b/mod/workshop/lang/en_utf8/workshop.php @@ -87,7 +87,7 @@ $string['formataggregatedgrade'] = '$a->grade'; $string['formataggregatedgradeover'] = '$a->grade
$a->over'; $string['formatpeergrade'] = '$a->grade ($a->gradinggrade)'; $string['formatpeergradeover'] = '$a->grade ($a->gradinggrade / $a->gradinggradeover)'; -$string['givengrade'] = 'Given grade: $a'; +$string['givengradestatus'] = 'Status: $a'; $string['givengrades'] = 'Given grades'; $string['gradedecimals'] = 'Decimal places in grades'; $string['gradegivento'] = ' > '; diff --git a/mod/workshop/view.php b/mod/workshop/view.php index 94b9646270..ab4cb05fda 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -128,24 +128,29 @@ case workshop::PHASE_ASSESSMENT: echo $OUTPUT->heading(get_string('assignedassessments', 'workshop'), 3); $shownames = has_capability('mod/workshop:viewauthornames', $PAGE->context); foreach ($assessments as $assessment) { - $submission = clone($assessment); - $submission->id = $submission->submissionid; - $submission->title = $submission->submissiontitle; - $submission->timecreated = $submission->submissioncreated; - $submission->timemodified = $submission->submissionmodified; + $submission = new stdClass(); + $submission->id = $assessment->submissionid; + $submission->title = $assessment->submissiontitle; + $submission->timecreated = $assessment->submissioncreated; + $submission->timemodified = $assessment->submissionmodified; + $submission->authorid = $assessment->authorid; + $submission->authorfirstname = $assessment->authorfirstname; + $submission->authorlastname = $assessment->authorlastname; + $submission->authorpicture = $assessment->authorpicture; + $submission->authorimagealt = $assessment->authorimagealt; + if (is_null($assessment->grade)) { $class = ' notgraded'; - $givengrade = get_string('nogradeyet', 'workshop'); + $status = get_string('nogradeyet', 'workshop'); $buttontext = get_string('assess', 'workshop'); } else { $class = ' graded'; - // todo format grade - $givengrade = $assessment->grade; + $status = get_string('alreadygraded', 'workshop'); $buttontext = get_string('reassess', 'workshop'); } echo $OUTPUT->box_start('generalbox assessment-summary' . $class); echo $wsoutput->submission_summary($submission, $shownames); - echo get_string('givengrade', 'workshop', $givengrade); + echo get_string('givengradestatus', 'workshop', $status); $button = new html_form(); $button->method = 'get'; $button->button->text = $buttontext; -- 2.39.5