--- loncom/homework/grades.pm 2010/04/20 20:23:55 1.626 +++ loncom/homework/grades.pm 2010/04/20 23:29:22 1.628 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.626 2010/04/20 20:23:55 www Exp $ +# $Id: grades.pm,v 1.628 2010/04/20 23:29:22 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -891,7 +891,7 @@ LISTJAVASCRIPT ' '. &mt('last submission & parts info').' '."\n". ''. - ' '. + ' '. &mt('by dates and submissions').''."\n". ''. ' '. @@ -3371,6 +3371,9 @@ sub viewgrades { if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } my ($partid) = &split_part_type($part); push(@partids,$partid); +# +# FIXME: Looks like $display looks at English text +# my $display_part=&get_display_part($partid,$symb); if ($display =~ /^Partial Credit Factor/) { $result.=''. @@ -4115,14 +4118,20 @@ sub csvuploadassign { $env{'request.course.id'}, $domain,$username); if ($result eq 'ok') { +# Successfully stored $request->print('.'); - } else { +# Remove from grading queue + &Apache::bridgetask::remove_from_queue('gradingqueue',$symb, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, + $domain,$username); + $countdone++; + } else { $request->print("". &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]", "$username:$domain",$result).""); } $request->rflush(); - $countdone++; } } $request->print(''.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); @@ -9277,17 +9286,17 @@ sub handler { {href=>'', text=>'Store grades'}]); $request->print(&assign_clicker_grades($request,$symb)); } elsif ($command eq 'csvform' && $perm{'mgr'}) { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&upcsvScores_form($request,$symb)); } elsif ($command eq 'csvupload' && $perm{'mgr'}) { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&csvupload($request,$symb)); } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&csvuploadmap($request,$symb)); } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) { if ($env{'form.associate'} ne 'Reverse Association') { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&csvuploadoptions($request,$symb)); } else { if ( $env{'form.upfile_associate'} ne 'reverse' ) { @@ -9295,11 +9304,11 @@ sub handler { } else { $env{'form.upfile_associate'} = 'forward'; } - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&csvuploadmap($request,$symb)); } } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) { - &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); $request->print(&csvuploadassign($request,$symb)); } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
". &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]", "$username:$domain",$result)."