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

MDL-18229 gradereport: Labels for table items added.

Browse Source
This commit is contained in:
Zachary Durber
2014-10-14 10:26:46 +08:00
parent 65c134f98a
commit 7bd3932e76
5 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/singleview/classes/lib.php
+2 -3
View File
@@ -345,7 +345,6 @@ abstract class singleview_tablelike extends singleview_screen implements tabbabl
foreach ($this->definition() as $i => $field) {
// Table tab index.
$tab = ($i * $this->total) + $this->index;
$html = $this->factory()->create($field)->format($grade, $tab);
if ($field == 'finalgrade' and !empty($this->structure)) {
@@ -354,7 +353,7 @@ abstract class singleview_tablelike extends singleview_screen implements tabbabl
$line[] = $html;
}
return $line;
}
@@ -401,7 +400,7 @@ abstract class singleview_tablelike extends singleview_screen implements tabbabl
$save = html_writer::empty_tag('input', array(
'type' => 'submit',
'value' => get_string('update'),
'tabindex' => $this->get_tabindex()
'tabindex' => $this->get_tabindex(),
));
return array($save);
grade/report/singleview/classes/uilib.php
+67 -14
View File
@@ -51,12 +51,13 @@ class singleview_factory_class_wrap {
}
abstract class singleview_ui_element {
var $name;
var $value;
public $name;
public $value;
public function __construct($name, $value) {
public function __construct($name, $value, $label) {
$this->name = $name;
$this->value = $value;
$this->label = $label;
}
public function is_checkbox() {
@@ -92,10 +93,10 @@ class singleview_text_attribute extends singleview_ui_element {
private $isdisabled;
private $tabindex;
public function __construct($name, $value, $isdisabled = false, $tabindex = null) {
public function __construct($name, $value, $label, $isdisabled = false, $tabindex = null) {
$this->isdisabled = $isdisabled;
$this->tabindex = $tabindex;
parent::__construct($name, $value);
parent::__construct($name, $value, $label);
}
public function is_textbox() {
@@ -106,7 +107,8 @@ class singleview_text_attribute extends singleview_ui_element {
$attributes = array(
'type' => 'text',
'name' => $this->name,
'value' => $this->value
'value' => $this->value,
'id' => $this->name
);
if (!empty($this->tabindex)) {
@@ -122,7 +124,17 @@ class singleview_text_attribute extends singleview_ui_element {
'value' => $this->value
);
$label = '';
if (preg_match("/^feedback/", $this->name)) {
$labeltitle = get_string('feedbackfor', 'gradereport_singleview', $this->label);
$label = html_writer::tag('label', $labeltitle, array('for' => $this->name, 'class' => 'accesshide'));
} else if (preg_match("/^finalgrade/", $this->name)) {
$labeltitle = get_string('gradefor', 'gradereport_singleview', $this->label);
$label = html_writer::tag('label', $labeltitle, array('for' => $this->name, 'class' => 'accesshide'));
}
return (
$label .
html_writer::empty_tag('input', $attributes) .
html_writer::empty_tag('input', $hidden)
);
@@ -133,11 +145,11 @@ class singleview_checkbox_attribute extends singleview_ui_element {
private $ischecked;
private $tabindex;
public function __construct($name, $ischecked = false, $tabindex = null, $locked=0) {
public function __construct($name, $label, $ischecked = false, $tabindex = null, $locked=0) {
$this->ischecked = $ischecked;
$this->tabindex = $tabindex;
$this->locked = $locked;
parent::__construct($name, 1);
parent::__construct($name, 1, $label);
}
public function is_checkbox() {
@@ -149,7 +161,8 @@ class singleview_checkbox_attribute extends singleview_ui_element {
$attributes = array(
'type' => 'checkbox',
'name' => $this->name,
'value' => 1
'value' => 1,
'id' => $this->name
);
// UCSB fixed user should not be able to override locked grade.
@@ -177,8 +190,14 @@ class singleview_checkbox_attribute extends singleview_ui_element {
$hidden['value'] = 1;
}
$type = "override";
if (preg_match("/^exclude/", $this->name)) {
$type = "exclude";
}
return (
html_writer::empty_tag('input', $alt) .
html_writer::tag('label', get_string($type . 'for', 'gradereport_singleview', $this->label), array('for' => $this->name, 'class' => 'accesshide')) .
html_writer::empty_tag('input', $attributes) .
html_writer::empty_tag('input', $hidden)
);
@@ -190,12 +209,12 @@ class singleview_dropdown_attribute extends singleview_ui_element {
private $options;
private $isdisabled;
public function __construct($name, $options, $selected = '', $isdisabled = false, $tabindex = null) {
public function __construct($name, $options, $label, $selected = '', $isdisabled = false, $tabindex = null) {
$this->selected = $selected;
$this->options = $options;
$this->tabindex = $tabindex;
$this->isdisabled = $isdisabled;
parent::__construct($name, $selected);
parent::__construct($name, $selected, $label);
}
public function is_dropdown() {
@@ -228,6 +247,7 @@ class singleview_dropdown_attribute extends singleview_ui_element {
abstract class singleview_grade_attribute_format extends singleview_attribute_format implements unique_name, tabbable {
public $name;
public $label;
public function __construct() {
$args = func_get_args();
@@ -308,9 +328,9 @@ class singleview_bulk_insert_ui extends singleview_ui_element {
$select = html_writer::select(
$insertoptions, $this->selectname, 'blanks', false
);
$label = html_writer::tag('label', $s('for'));
$text = new singleview_text_attribute($this->insertname, "0");
$text = new singleview_text_attribute($this->insertname, "0", 'bulk');
return implode(' ', array($apply, $text->html(), $label, $select));
}
@@ -332,6 +352,7 @@ class singleview_finalgrade_ui extends singleview_grade_attribute_format impleme
public $name = 'finalgrade';
public function get_value() {
$this->label = $this->grade->grade_item->itemname;
// Manual item raw grade support.
$val = $this->grade->grade_item->is_manual_item() && (!is_null($this->grade->rawgrade)) ?
$this->grade->rawgrade : $this->grade->finalgrade;
@@ -343,6 +364,13 @@ class singleview_finalgrade_ui extends singleview_grade_attribute_format impleme
}
}
public function get_label() {
if (!isset($this->grade->label)) {
$this->grade->label = '';
}
return $this->grade->label;
}
public function is_disabled() {
$locked = 0;
$gradeitemlocked = 0;
@@ -378,6 +406,7 @@ class singleview_finalgrade_ui extends singleview_grade_attribute_format impleme
$this->get_name(),
$options,
$this->get_value(),
$this->get_label(),
$this->is_disabled(),
$this->get_tabindex()
);
@@ -385,6 +414,7 @@ class singleview_finalgrade_ui extends singleview_grade_attribute_format impleme
return new singleview_text_attribute(
$this->get_name(),
$this->get_value(),
$this->get_label(),
$this->is_disabled(),
$this->get_tabindex()
);
@@ -428,7 +458,6 @@ class singleview_finalgrade_ui extends singleview_grade_attribute_format impleme
$gradestr->username = $user->firstname . ' ' . $user->lastname;
}
$gradestr->itemname = $this->grade->grade_item->get_name();
$errorstr = get_string($errorstr, 'grades', $gradestr);
}
@@ -445,6 +474,13 @@ class singleview_feedback_ui extends singleview_grade_attribute_format implement
return $this->grade->feedback ? $this->grade->feedback : '';
}
public function get_label() {
if (!isset($this->grade->label)) {
$this->grade->label = '';
}
return $this->grade->label;
}
public function is_disabled() {
$locked = 0;
$gradeitemlocked = 0;
@@ -470,6 +506,7 @@ class singleview_feedback_ui extends singleview_grade_attribute_format implement
return new singleview_text_attribute(
$this->get_name(),
$this->get_value(),
$this->get_label(),
$this->is_disabled(),
$this->get_tabindex()
);
@@ -510,12 +547,20 @@ class singleview_override_ui extends singleview_grade_attribute_format implement
return ($lockedgrade || $lockedgradeitem);
}
public function get_label() {
if (!isset($this->grade->label)) {
$this->grade->label = '';
}
return $this->grade->label;
}
function determine_format() {
if (!$this->grade->grade_item->is_overridable_item()) {
return new singleview_empty_element();
}
return new singleview_checkbox_attribute(
$this->get_name(),
$this->get_label(),
$this->ischecked(),
null,
$this->is_disabled()
@@ -545,10 +590,18 @@ class singleview_exclude_ui extends singleview_grade_attribute_format implements
function determine_format() {
return new singleview_checkbox_attribute(
$this->get_name(),
$this->get_label(),
$this->ischecked()
);
}
public function get_label() {
if (!isset($this->grade->label)) {
$this->grade->label = '';
}
return $this->grade->label;
}
function set($value) {
if (empty($this->grade->id)) {
if (empty($value)) {
grade/report/singleview/lang/en/gradereport_singleview.php
+9
View File
@@ -28,10 +28,19 @@ $string['all_grades'] = 'All grades';
$string['assessmentname'] = 'Assessment Name';
$string['blanks'] = 'Empty grades';
$string['bulk'] = 'Insert';
$string['bulkfor'] = 'Grades for {$a}';
$string['exclude'] = 'Exclude';
$string['excludeall'] = 'Exclude all grades';
$string['excludefor'] = 'Exclude for {$a}';
$string['excludenone'] = 'Exclude no grades';
$string['feedbackfor'] = 'Feedback for {$a}';
$string['filtergrades'] = 'Show grades for {$a}.';
$string['for'] = 'for';
$string['gradefor'] = 'Grade for {$a}';
$string['override'] = 'Override';
$string['overrideall'] = 'Override all grades';
$string['overridefor'] = 'Override for {$a}';
$string['overridenone'] = 'Override no grades';
$string['pluginname'] = 'Single view';
$string['singleview:view'] = 'View the '.$string['pluginname'].' report';
$string['noscreens'] = 'Could not find a suitable Single view screen.';
grade/report/singleview/screens/grade/lib.php
+2
View File
@@ -171,6 +171,7 @@ class singleview_grade extends singleview_tablelike
$item->imagealt = $fullname;
$url = new moodle_url("/user/view.php", array('id' => $item->id, 'course' => $this->courseid));
$iconstring = get_string('filtergrades', 'gradereport_singleview', $fullname);
$grade->label = $fullname;
$line = array(
$OUTPUT->action_icon($this->format_link('user', $item->id), new pix_icon('t/editstring', $iconstring)),
@@ -178,6 +179,7 @@ class singleview_grade extends singleview_tablelike
html_writer::link($url, $fullname),
$this->item_range()
);
return $this->format_definition($line, $grade);
}
grade/report/singleview/screens/user/lib.php
+1
View File
@@ -110,6 +110,7 @@ class singleview_user extends singleview_tablelike implements selectable_items {
$url = new moodle_url("/mod/$item->itemmodule/view.php", array('id' => $item->cmid));
$iconstring = get_string('filtergrades', 'gradereport_singleview', $item->get_name());
$grade->label = $item->get_name();
$line = array(
$OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', $iconstring)),