--- loncom/homework/grades.pm 2010/01/15 16:41:43 1.588 +++ loncom/homework/grades.pm 2010/01/27 06:26:55 1.591 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.588 2010/01/15 16:41:43 bisitz Exp $ +# $Id: grades.pm,v 1.591 2010/01/27 06:26:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -993,8 +993,8 @@ LISTJAVASCRIPT # checkall buttons $gradeTable.=&check_script('gradesub', 'stuinfo'); $gradeTable.='
'."\n"; + 'onclick="javascript:checkSelect(this.form.stuinfo);" '."\n". + 'value="'.&mt('Next').' →" />
'."\n"; $gradeTable.=&check_buttons(); my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); $gradeTable.= &Apache::loncommon::start_data_table(). @@ -1111,9 +1111,9 @@ LISTJAVASCRIPT } $gradeTable.=&Apache::loncommon::end_data_table()."\n". - ''."\n"; + ''."\n"; if ($ctr == 0) { my $num_students=(scalar(keys(%$fullname))); if ($num_students eq 0) { @@ -1617,8 +1617,8 @@ INNERJS pDoc = pWin.document; pDoc.write("<\\/table>"); pDoc.write("<\\/td><\\/tr><\\/table> "); - pDoc.write("  "); - pDoc.write("

"); + pDoc.write("  "); + pDoc.write("

"); pDoc.write("<\\/form>"); pDoc.write('$end_page_msg_central'); pDoc.close(); @@ -1691,8 +1691,8 @@ INNERJS var hDoc = hwdWin.document; hDoc.write("<\\/table>"); hDoc.write("<\\/td><\\/tr><\\/table> "); - hDoc.write("  "); - hDoc.write("

"); + hDoc.write("  "); + hDoc.write("

"); hDoc.write("<\\/form>"); hDoc.write('$end_page_highlight_central'); hDoc.close(); @@ -1757,7 +1757,7 @@ sub gradeBox { my $radio.=''."\n"; # display radio buttons in a nice table 10 across while ($thisweight<=$wgt) { $radio.= '\n"; $radio.=(($ctr+1)%10 == 0 ? '' : ''); @@ -1768,13 +1768,13 @@ sub gradeBox { my $line.=''."\n"; $line.=''."\n"; $line.=''."\n"; $line.= ''."\n"; } elsif ($type eq 'solved') { my ($status,$foo)=split(/_/,$score,2); @@ -3500,7 +3499,7 @@ sub viewstudentgrade { $part.'_solved_s" value="'.$status.'" />'."\n"; $result.='  + @@ -3915,7 +3914,7 @@ sub csvuploadmap_footer {
/'.$wgt.' '.$wgtmsg. ($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). ' '."\n"; if ($env{'form.handgrade'} eq 'no') { @@ -2251,7 +2250,7 @@ KEYWORDS # return if view submission with no grading option if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) { my $toGrade.='  '."\n" if (&canmodify($usec)); $toGrade.=''."\n"; if (($env{'form.command'} eq 'submission') || @@ -2349,7 +2348,7 @@ KEYWORDS if ($counter == $total) { my $endform='
'."\n"; $endform.='  '."\n"; my $ntstu ='  '; + 'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" />  '; $endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ; $endform.=""; @@ -3350,11 +3349,11 @@ sub viewgrades { } $radio.='
'; my $line = ' /'. $weight{$partid}.' '.&mt('(problem weight)').'
'.&mt('Grade Status').':'; $result.=''; + 'onclick="javascript:resetEntry('.$ctsparts.');" />'; #table listing all the students in a section/class #header of table @@ -3439,7 +3438,7 @@ sub viewgrades { $result.=&Apache::loncommon::end_data_table(); $result.=''."\n"; $result.=''."\n"; + 'onclick="javascript:submit();" target="_self" />'."\n"; if (scalar(%$fullname) eq 0) { my $colspan=3+scalar(@parts); my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); @@ -3491,7 +3490,7 @@ sub viewstudentgrade { 'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n"; $result.='
-
+
ENDPICK } @@ -3960,7 +3959,7 @@ sub upcsvScores_form { $upfile_select -
+
ENDUPFORM @@ -4283,7 +4282,7 @@ LISTJAVASCRIPT $result.=' '.&mt('Use CODE').':
'."\n"; $result.=' 
'."\n"; + 'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" />
'."\n"; $request->print($result); @@ -4322,7 +4321,7 @@ LISTJAVASCRIPT } $studentTable.=&Apache::loncommon::end_data_table()."\n"; $studentTable.=''."\n"; + 'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" />'."\n"; $studentTable.=&show_grading_menu_form($symb); $request->print($studentTable); @@ -4515,10 +4514,11 @@ sub displayPage { $curRes = $iterator->next(); } - $studentTable.=''."\n". - ''. - ''."\n"; + $studentTable.= + ''."\n". + ''. + ''."\n"; $studentTable.=&show_grading_menu_form($symb); $request->print($studentTable); @@ -5264,7 +5264,7 @@ sub scantron_selectphase { '.&mt('File to upload: [_1]','').'
- + '); @@ -7451,6 +7451,7 @@ sub scantron_get_maxbubble { if (ref($nav_error)) { $$nav_error = 1; } + return; } my $map=$navmap->getResourceByUrl($sequence); my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); @@ -7956,7 +7957,7 @@ sub scantron_upload_scantron_data { &Apache::lonhtmlcommon::end_pick_box().'
- + '); return ''; @@ -8542,10 +8543,10 @@ sub grading_menu { $Str .= Apache::lonhtmlcommon::generate_menu(@menu); #$menudata->{'jscript'} $Str .='
'. &Apache::lonnet::recprefix($env{'request.course.id'}). - '-'; + '-'; $Str .="\n"; my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); @@ -8728,7 +8729,7 @@ GRADINGMENUJS
- +
@@ -8745,7 +8746,7 @@ GRADINGMENUJS
- +
'; @@ -8925,17 +8926,17 @@ function sanitycheck() {
-
-
-
+
+
+
-
+

    -
-
-
+
+
+
ENDUPFORM $result.=''."\n".