Skip to content

Commit

Permalink
MDL-19803 Upgraded calls to choose_from_menu
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasconnault committed Aug 17, 2009
1 parent 698c31e commit 782c84e
Showing 1 changed file with 25 additions and 14 deletions.
39 changes: 25 additions & 14 deletions mod/assignment/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,10 @@ function display_submission($extra_javascript = '') {
echo '</div>';
}
echo '<div class="grade"><label for="menugrade">'.get_string('grade').'</label> ';
choose_from_menu(make_grades_menu($this->assignment->grade), 'grade', $submission->grade, get_string('nograde'), '', -1, false, $disabled);
$select = html_select::make(make_grades_menu($this->assignment->grade), 'grade', $submission->grade, get_string('nograde'));
$select->nothingvalue = '-1';
$select->disabled = $disabled;
echo $OUTPUT->select($select);
echo '</div>';

echo '<div class="clearer"></div>';
Expand All @@ -971,7 +974,9 @@ function display_submission($extra_javascript = '') {
$options[0] = get_string('nooutcome', 'grades');
echo $options[$outcome->grades[$submission->userid]->grade];
} else {
choose_from_menu($options, 'outcome_'.$n.'['.$userid.']', $outcome->grades[$submission->userid]->grade, get_string('nooutcome', 'grades'), '', 0, false, false, 0, 'menuoutcome_'.$n);
$select = html_select::make($options, 'outcome_'.$n.'['.$userid.']', $outcome->grades[$submission->userid]->grade, get_string('nooutcome', 'grades'));
$select->id = 'menuoutcome_'.$n;
echo $OUTPUT->select($select);
}
echo '</div>';
echo '<div class="clearer"></div>';
Expand All @@ -990,7 +995,7 @@ function display_submission($extra_javascript = '') {
echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
} else {
echo '<div class="format">';
choose_from_menu(format_text_menu(), "format", $submission->format, "");
echo $OUTPUT->select(html_select::make(format_text_menu(), "format", $submission->format, false));
helpbutton("textformat", get_string("helpformatting"));
echo '</div>';
}
Expand Down Expand Up @@ -1264,9 +1269,10 @@ function display_submissions($message='') {
if ($final_grade->locked or $final_grade->overridden) {
$grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
} else if ($quickgrade) {
$menu = choose_from_menu(make_grades_menu($this->assignment->grade),
'menu['.$auser->id.']', $auser->grade,
get_string('nograde'),'',-1,true,false,$tabindex++);
$select = html_select::make(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, get_string('nograde'));
$select->nothingvalue = '-1';
$select->tabindex = $tabindex++;
$menu = $OUTPUT->select($select);
$grade = '<div id="g'.$auser->id.'">'. $menu .'</div>';
} else {
$grade = '<div id="g'.$auser->id.'">'.$this->display_grade($auser->grade).'</div>';
Expand All @@ -1277,9 +1283,10 @@ function display_submissions($message='') {
if ($final_grade->locked or $final_grade->overridden) {
$grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
} else if ($quickgrade) {
$menu = choose_from_menu(make_grades_menu($this->assignment->grade),
'menu['.$auser->id.']', $auser->grade,
get_string('nograde'),'',-1,true,false,$tabindex++);
$select = html_select::make(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, get_string('nograde'));
$select->nothingvalue = '-1';
$select->tabindex = $tabindex++;
$menu = $OUTPUT->select($select);
$grade = '<div id="g'.$auser->id.'">'.$menu.'</div>';
} else {
$grade = '<div id="g'.$auser->id.'">'.$this->display_grade($auser->grade).'</div>';
Expand All @@ -1304,9 +1311,10 @@ function display_submissions($message='') {
if ($final_grade->locked or $final_grade->overridden) {
$grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade . '</div>';
} else if ($quickgrade) { // allow editing
$menu = choose_from_menu(make_grades_menu($this->assignment->grade),
'menu['.$auser->id.']', $auser->grade,
get_string('nograde'),'',-1,true,false,$tabindex++);
$select = html_select::make(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, get_string('nograde'));
$select->nothingvalue = '-1';
$select->tabindex = $tabindex++;
$menu = $OUTPUT->select($select);
$grade = '<div id="g'.$auser->id.'">'.$menu.'</div>';
} else {
$grade = '<div id="g'.$auser->id.'">-</div>';
Expand Down Expand Up @@ -1354,8 +1362,11 @@ function display_submissions($message='') {
$outcomes .= ': <span id="outcome_'.$n.'_'.$auser->id.'">'.$options[$outcome->grades[$auser->id]->grade].'</span>';
} else {
$outcomes .= ' ';
$outcomes .= choose_from_menu($options, 'outcome_'.$n.'['.$auser->id.']',
$outcome->grades[$auser->id]->grade, get_string('nooutcome', 'grades'), '', 0, true, false, 0, 'outcome_'.$n.'_'.$auser->id);
$select = html_select::make($options, 'outcome_'.$n.'['.$auser->id.']', $outcome->grades[$auser->id]->grade, get_string('nooutcome', 'grades'));
$select->nothingvalue = '0';
$select->tabindex = $tabindex++;
$select->id = 'outcome_'.$n.'_'.$auser->id;
$outcomes .= $OUTPUT->select($select);
}
$outcomes .= '</div>';
}
Expand Down

0 comments on commit 782c84e

Please sign in to comment.