mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47746-master' of git://github.com/zbdd/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-10-30 15:39:46 +00:00
commit ebbf039d07
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grade/report/singleview/classes/local/screen/user.php
View File

@ -194,6 +194,12 @@ class user extends tablelike implements selectable_items {
$itemlabel = $this->structure->get_element_header($gradetreeitem, true, false, false, false, true);
$grade->label = $item->get_name();
$itemlabel = $item->get_name();
if (!empty($realmodid)) {
$url = new moodle_url('/mod/' . $item->itemmodule . '/view.php', array('id' => $realmodid));
$itemlabel = html_writer::link($url, $item->get_name());
}
$line = array(
$OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', $iconstring)),
$this->format_icon($item) . $lockicon . $itemlabel,

2
grade/report/singleview/classes/local/ui/finalgrade.php
View File

@ -118,8 +118,8 @@ class finalgrade extends grade_attribute_format implements unique_value, be_disa
return new dropdown_attribute(
$this->get_name(),
$options,
$this->get_value(),
$this->get_label(),
$this->get_value(),
$this->is_disabled(),
$this->get_tabindex()
);

19
grade/report/singleview/tests/behat/singleview.feature
View File

@ -15,9 +15,15 @@ Feature: We can use Single view
| student2 | Student | 2 | student1@asd.com | s2 | holly |
| student3 | Student | 3 | student1@asd.com | s3 | anna |
| student4 | Student | 4 | student1@asd.com | s4 | zac |
And the following "scales" exist:
| name | scale |
| Test Scale | Disappointing, Good, Very good, Excellent |
And the following "grade items" exist:
| itemname | course |
| new grade item 1 | C1 |
| itemname | course | gradetype | scale |
| new grade item 1 | C1 | Scale | Test Scale |
And the following "scales" exist:
| name | scale |
| Test Scale | Disappointing, Good, Very good, Excellent |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
@ -35,6 +41,9 @@ Feature: We can use Single view
| assign | C1 | a2 | Test assignment two | Submit something! | 100 |
| assign | C1 | a3 | Test assignment three | Submit something! | 150 |
| assign | C1 | a4 | Test assignment four | Submit nothing! | 150 |
And the following "grade items" exist:
| itemname | course | gradetype |
| Test grade item | C1 | Scale |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
@ -66,6 +75,12 @@ Feature: We can use Single view
| Test assignment three |
| 12.05 |
| Excluded |
And I click on "Single view" "link"
And I click on "new grade item 1" "option"
And I click on "Very good" "option"
And I press "Update"
And the following should exist in the "generaltable" table:
| Grade for james (Student) 1 | "Very good" |
Scenario: Single view links work on grade report.
Given I follow "Single view for Test assignment one"