mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
Tidied up the feedback - offline assignments are pretty much done
This commit is contained in:
parent
37a7ad0474
commit
6d4ecaec60
2 changed files with 57 additions and 8 deletions
|
@ -126,32 +126,36 @@ class assignment_base {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Print the feedback
|
/// Print the feedback
|
||||||
|
print_heading(get_string('feedbackfromteacher', 'assignment', $this->course->teacher));
|
||||||
|
|
||||||
echo '<table cellspacing="0" class="feedback">';
|
echo '<table cellspacing="0" class="feedback">';
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
echo '<td class="left picture">';
|
echo '<td class="left picture">';
|
||||||
print_user_picture($teacher->id, $this->course->id, $teacher->picture);
|
print_user_picture($teacher->id, $this->course->id, $teacher->picture);
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
echo '<td class="feedbackheader">';
|
echo '<td class="topic">';
|
||||||
echo '<span class="author">'.fullname($teacher).'</span>';
|
echo '<div class="author">'.fullname($teacher).'</div>';
|
||||||
echo '<span class="time">'.userdate($submission->timemarked).'</span>';
|
echo '<div class="time">'.userdate($submission->timemarked).'</div>';
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
echo '<td class="left side"> </td>';
|
echo '<td class="left side"> </td>';
|
||||||
echo '<td class="feedback">';
|
echo '<td class="content">';
|
||||||
if ($this->assignment->grade) {
|
if ($this->assignment->grade) {
|
||||||
echo '<span class="grade">';
|
echo '<div class="grade">';
|
||||||
if ($submission->grade or $submission->timemarked) {
|
if ($submission->grade or $submission->timemarked) {
|
||||||
echo get_string("grade").": $submission->grade";
|
echo get_string("grade").': '.$this->display_grade($submission->grade);
|
||||||
} else {
|
} else {
|
||||||
echo get_string("nograde");
|
echo get_string("nograde");
|
||||||
}
|
}
|
||||||
echo '</span>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '<div class="comment">';
|
||||||
echo text_to_html($submission->comment);
|
echo text_to_html($submission->comment);
|
||||||
|
echo '</div>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
echo '</table>';
|
echo '</table>';
|
||||||
|
@ -305,7 +309,7 @@ class assignment_base {
|
||||||
}
|
}
|
||||||
if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['status'])) {
|
if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['status'])) {
|
||||||
echo 'opener.document.getElementById("up'.$submission->userid.'").className="s1";';
|
echo 'opener.document.getElementById("up'.$submission->userid.'").className="s1";';
|
||||||
echo 'opener.document.getElementById("button'.$submission->userid.'").value="'.get_string('update').'";';
|
echo 'opener.document.getElementById("button'.$submission->userid.'").value="'.get_string('update').' ...";';
|
||||||
}
|
}
|
||||||
echo "\n-->\n</script>";
|
echo "\n-->\n</script>";
|
||||||
fflush();
|
fflush();
|
||||||
|
|
|
@ -37,12 +37,57 @@
|
||||||
#mod-assignment-submissions .fullname {
|
#mod-assignment-submissions .fullname {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mod-assignment-submissions .timemodified,
|
#mod-assignment-submissions .timemodified,
|
||||||
#mod-assignment-submissions .timemarked
|
#mod-assignment-submissions .timemarked
|
||||||
{
|
{
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mod-assignment-submissions .status {
|
#mod-assignment-submissions .status {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback {
|
||||||
|
border-width:1px;
|
||||||
|
border-style:solid;
|
||||||
|
border-color:#DDDDDD;
|
||||||
|
margin-top: 15px;
|
||||||
|
width: 80%;
|
||||||
|
margin-left: 10%;
|
||||||
|
margin-right: 10%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback .topic {
|
||||||
|
padding: 4px;
|
||||||
|
border-style:solid;
|
||||||
|
border-width: 0px;
|
||||||
|
border-bottom-width: 1px;
|
||||||
|
border-color:#DDDDDD;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback .author {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback .date {
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback .content {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback .grade {
|
||||||
|
text-align: right;
|
||||||
|
font-weight:bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mod-assignment-view .feedback .left {
|
||||||
|
width: 35px;
|
||||||
|
padding: 4px;
|
||||||
|
text-align: center;
|
||||||
|
vertical-align: top;
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue