diff -Naur without_change_ass_lib//lib.php with_change_ass_lib//lib.php --- without_change_ass_lib//lib.php 2012-01-30 12:29:42.000000000 +0530 +++ with_change_ass_lib//lib.php 2012-01-30 14:54:57.000000000 +0530 @@ -671,8 +671,8 @@ $col = 'submissioncomment'; $commenting = true; } - if (isset($_POST['menu'])) { - $col = 'menu'; + if (isset($_POST['mytext'])) { + $col = 'mytext'; $grading = true; } if (!$col) { @@ -700,7 +700,7 @@ $updatedb = false; if ($grading) { - $grade = $_POST['menu'][$id]; + $grade = $_POST['mytext'][$id]; $updatedb = $updatedb || ($submission->grade != $grade); $submission->grade = $grade; } else { @@ -1456,10 +1456,16 @@ if ($final_grade->locked or $final_grade->overridden) { $grade = '
'.$final_grade->formatted_grade.'
'; } else if ($quickgrade) { - $attributes = array(); - $attributes['tabindex'] = $tabindex++; - $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes); - $grade = '
'. $menu .'
'; + //$attributes = array(); + //$attributes['tabindex'] = $tabindex++; + //$menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes); + //$grade = '
'. $menu .'
'; + +$grade= '
' + . '
'; + + } else { $grade = '
'.$this->display_grade($auser->grade).'
'; } @@ -1469,10 +1475,16 @@ if ($final_grade->locked or $final_grade->overridden) { $grade = '
'.$final_grade->formatted_grade.'
'; } else if ($quickgrade) { - $attributes = array(); - $attributes['tabindex'] = $tabindex++; - $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes); - $grade = '
'.$menu.'
'; + //$attributes = array(); + //$attributes['tabindex'] = $tabindex++; + //$menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes); + //$grade = '
'.$menu.'
'; + +$grade= '
' + . '
'; + + } else { $grade = '
'.$this->display_grade($auser->grade).'
'; } @@ -1497,11 +1509,19 @@ $grade = '
'.$final_grade->formatted_grade . '
'; $hassubmission = true; } else if ($quickgrade) { // allow editing - $attributes = array(); - $attributes['tabindex'] = $tabindex++; - $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes); - $grade = '
'.$menu.'
'; - $hassubmission = true; + //$attributes = array(); + //$attributes['tabindex'] = $tabindex++; + //$menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes); + //$grade = '
'.$menu.'
'; + //$hassubmission = true; + + +$grade= '
' + . '
'; + + + } else { $grade = '
-
'; } @@ -1728,7 +1748,8 @@ if (!($grading_info->items[0]->grades[$feedback->userid]->locked || $grading_info->items[0]->grades[$feedback->userid]->overridden) ) { - $submission->grade = $feedback->xgrade; + //$submission->grade = $feedback->xgrade; +$submission->grade = $feedback->ourgrade; $submission->submissioncomment = $feedback->submissioncomment_editor['text']; $submission->teacher = $USER->id; $mailinfo = get_user_preferences('assignment_mailinfo', 0); @@ -2456,9 +2477,13 @@ // use simple direct grading $grademenu['-1'] = get_string('nograde'); - $mform->addElement('select', 'xgrade', get_string('grade').':', $grademenu, $attributes); - $mform->setDefault('xgrade', $this->_customdata->submission->grade ); //@fixme some bug when element called 'grade' makes it break - $mform->setType('xgrade', PARAM_INT); +$mform->addElement('text', 'ourgrade', get_string('grade'), 'maxlength="100" size="30"');//newly added line . + $mform->setType('ourgrade', PARAM_INT); + + + //$mform->addElement('select', 'xgrade', get_string('grade').':', $grademenu, $attributes); + //$mform->setDefault('xgrade', $this->_customdata->submission->grade ); //@fixme some bug when element called 'grade' makes it break + //$mform->setType('xgrade', PARAM_INT); } if (!empty($this->_customdata->enableoutcomes)) {