--- loncom/homework/grades.pm	2010/05/22 01:01:03	1.574.2.12
+++ loncom/homework/grades.pm	2009/05/23 19:01:13	1.575
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.574.2.12 2010/05/22 01:01:03 raeburn Exp $
+# $Id: grades.pm,v 1.575 2009/05/23 19:01:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -97,15 +97,9 @@ sub ssi_print_error {
 #
 # --- Retrieve the parts from the metadata file.---
 sub getpartlist {
-    my ($symb,$errorref) = @_;
+    my ($symb) = @_;
 
     my $navmap   = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        if (ref($errorref)) { 
-            $$errorref = 'navmap';
-            return;
-        }
-    }
     my $res      = $navmap->getBySymb($symb);
     my $partlist = $res->parts();
     my $url      = $res->src();
@@ -150,15 +144,9 @@ sub nameUserString {
 #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---
 sub response_type {
-    my ($symb,$response_error) = @_;
+    my ($symb) = shift;
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        if (ref($response_error)) {
-            $$response_error = 1;
-        }
-        return;
-    }
     my $res = $navmap->getBySymb($symb);
     my $partlist = $res->parts();
     my %vPart = 
@@ -205,17 +193,12 @@ sub get_display_part {
 #--- Show resource title
 #--- and parts and response type
 sub showResourceInfo {
-    my ($symb,$probTitle,$checkboxes,$res_error) = @_;
+    my ($symb,$probTitle,$checkboxes) = @_;
     my $col=3;
     if ($checkboxes) { $col=4; }
     my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
-    if (ref($res_error)) {
-        if ($$res_error) {
-            return;
-        }
-    }
     $result .='<table border="0">';
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my %resptype = ();
     my $hdgrade='no';
     my %partsseen;
@@ -771,7 +754,7 @@ sub verifyreceipt {
 
     my $title.=
 	'<h3><span class="LC_info">'.
-	&mt('Verifying Receipt No. [_1]',$receipt).
+	&mt('Verifying  Receipt No. [_1]',$receipt).
 	'</span></h3>'."\n".
 	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
 	'</h4>'."\n";
@@ -783,13 +766,7 @@ sub verifyreceipt {
     if ($env{"course.$courseid.receiptalg"} eq 'receipt2' ||
 	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
-    if ($receiptparts) {
-        my $res_error; 
-        ($parts)=&response_type($symb,\$res_error);
-        if ($res_error) {
-            return &navmap_errormsg();
-        } 
-    }
+    if ($receiptparts) { ($parts)=&response_type($symb); }
     
     my $header = 
 	&Apache::loncommon::start_data_table().
@@ -831,11 +808,11 @@ sub verifyreceipt {
 	}
     }
     if ($matches == 0) {
-	$string = $title.&mt('No match found for the above receipt number.');
+	$string = $title.&mt('No match found for the above receipt.');
     } else {
 	$string = &jscriptNform($symb).$title.
 	    '<p>'.
-	    &mt('The above receipt number matches the following [numerate,_1,student].',$matches).
+	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
 	    '</p>'.
 	    $header.
 	    $contents.
@@ -1754,8 +1731,11 @@ sub gradeBox {
     }
     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
 
+
+	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $result .= 
-	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
+	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
+    
     $result.='</tr></table>'."\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
 	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
@@ -1765,19 +1745,15 @@ sub gradeBox {
         $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
         '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
         $aggtries.'" />'."\n";
-    my $res_error;
-    $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);
-    if ($res_error) {
-        return &navmap_errormsg();
-    }
+    $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
     return $result;
 }
 
 sub handback_box {
-    my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
+    my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my (@respids);
-    my @part_response_id = &flatten_responseType($responseType);
+     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
     	my ($part,$resp) = @{ $part_response_id };
         if ($part eq $partid) {
@@ -2070,12 +2046,7 @@ KEYWORDS
     }
 
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
-    my $res_error;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&navmap_errormsg());
-        return;
-    }
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
 
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
@@ -2325,7 +2296,7 @@ KEYWORDS
 	    '<option>7</option><option>10</option></select>'."\n";
 	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
 	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
-        $endform.=&mt('[_1]student(s)',$ntstu);
+	$endform.=&mt('[quant,_1,student]',$ntstu);
 	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
 	    '<input type="button" value="'.&mt('Next').'" '.
@@ -2622,12 +2593,7 @@ sub processHandGrade {
     }
     $ctr = 0;
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
-    my $res_error;
-    my ($partlist) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&navmap_errormsg());
-        return;
-    }
+    my ($partlist) = &response_type($symb);
     foreach my $student (@parsedlist) {
 	my $submitonly=$env{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
@@ -2825,12 +2791,8 @@ sub check_and_remove_from_queue {
 sub handback_files {
     my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
     my $portfolio_root = '/userfiles/portfolio';
-    my $res_error;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print('<br />'.&navmap_errormsg().'<br />');
-        return;
-    }
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
+
     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
     	my ($part_id,$resp_id) = @{ $part_response_id };
@@ -3288,11 +3250,7 @@ sub viewgrades {
     $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
-    my $res_error;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        return &navmap_errormsg();
-    }
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my %weight = ();
     my $ctsparts = 0;
     my %seen = ();
@@ -3352,11 +3310,7 @@ sub viewgrades {
 	      &Apache::loncommon::start_data_table_header_row().
 	      '<th>'.&mt('No.').'</th>'.
 	      '<th>'.&nameUserString('header')."</th>\n";
-    my $partserror;
-    my (@parts) = sort(&getpartlist($symb,\$partserror));
-    if ($partserror) {
-        return &navmap_errormsg();
-    }
+    my (@parts) = sort(&getpartlist($symb));
     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
     my @partids = ();
     foreach my $part (@parts) {
@@ -3515,11 +3469,7 @@ sub editgrades {
     my %columns = ();
     my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
 
-    my $partserror;
-    my (@parts) = sort(&getpartlist($symb,\$partserror));
-    if ($partserror) {
-        return &navmap_errormsg();
-    }
+    my (@parts) = sort(&getpartlist($symb));
     my $header;
     while ($ctr < $env{'form.totalparts'}) {
 	my $partid = $env{'form.partid_'.$ctr};
@@ -3851,14 +3801,8 @@ ENDPICK
 }
 
 sub csvupload_fields {
-    my ($symb,$errorref) = @_;
-    my (@parts) = &getpartlist($symb,$errorref);
-    if (ref($errorref)) {
-        if ($$errorref) {
-            return;
-        }
-    }
-
+    my ($symb) = @_;
+    my (@parts) = &getpartlist($symb);
     my @fields=(['ID','Student/Employee ID'],
 		['username','Student Username'],
 		['domain','Student Domain']);
@@ -3958,12 +3902,8 @@ sub csvuploadmap {
     &csvuploadmap_header($request,$symb,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
-        my $fieldserror;
-        my @fields=&csvupload_fields($symb,\$fieldserror);
-        if ($fieldserror) {
-            $request->print(&navmap_errormsg());
-            return;
-        }
+	my @fields=&csvupload_fields($symb);
+
 	if ($env{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($request,\@records);
 	    $i=&Apache::loncommon::csv_print_select_table($request,\@records,
@@ -4199,12 +4139,7 @@ LISTJAVASCRIPT
 	&mt('Manual Grading by Page or Sequence').'</span></h3>';
 
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
-    my $map_error;
-    my ($titles,$symbx) = &getSymbMap($map_error);
-    if ($map_error) {
-        $request->print(&navmap_errormsg());
-        return;
-    }
+    my ($titles,$symbx) = &getSymbMap();
     my ($curpage) =&Apache::lonnet::decode_symb($symb); 
 #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
 #    my $type=($curpage =~ /\.(page|sequence)/);
@@ -4299,14 +4234,8 @@ LISTJAVASCRIPT
 }
 
 sub getSymbMap {
-    my ($map_error) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        if (ref($map_error)) {
-            $$map_error = 'navmap';
-        }
-        return;
-    }
+
     my %symbx = ();
     my @titles = ();
     my $minder = 0;
@@ -4365,11 +4294,6 @@ sub displayPage {
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $request->print(&navmap_errormsg());
-        $request->print(&show_grading_menu_form($symb));
-        return;
-    }
     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
@@ -4621,10 +4545,6 @@ sub updateGradeByPage {
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $request->print(&navmap_errormsg());
-        return;
-    }
     my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
@@ -4769,7 +4689,7 @@ sub updateGradeByPage {
 #
 #-------------------------------------------------------------------
 
-#--------------------Bubblesheet (Scantron) Grading-----------------------------------
+#--------------------Scantron Grading-----------------------------------
 #
 #------ start of section for handling grading by page/sequence ---------
 
@@ -4828,9 +4748,7 @@ the homework problem.
   Returns html hidden inputs used to hold context/default values.
 
  Arguments:
-   $symb - $symb of the current resource
-   $map_error - ref to scalar which will container error if
-                $navmap object is unavailable in &getSymbMap().
+  $symb - $symb of the current resource 
 
 =cut
 
@@ -4854,12 +4772,9 @@ sub defaultFormData {
 =cut
 
 sub getSequenceDropDown {
-    my ($symb,$map_error)=@_;
+    my ($symb)=@_;
     my $result='<select name="selectpage">'."\n";
-    my ($titles,$symbx) = &getSymbMap($map_error);
-    if (ref($map_error)) {
-        return if ($$map_error);
-    }
+    my ($titles,$symbx) = &getSymbMap();
     my ($curpage)=&Apache::lonnet::decode_symb($symb); 
     my $ctr=0;
     foreach (@$titles) {
@@ -5125,12 +5040,7 @@ sub scantron_selectphase {
     my ($r,$file2grade) = @_;
     my ($symb)=&get_symb($r);
     if (!$symb) {return '';}
-    my $map_error;
-    my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
-    if ($map_error) {
-        $r->print('<br />'.&navmap_errormsg().'<br />');
-        return;
-    }
+    my $sequence_selector=&getSequenceDropDown($symb);
     my $default_form_data=&defaultFormData($symb);
     my $grading_menu_button=&show_grading_menu_form($symb);
     my $file_selector=&scantron_uploads($file2grade);
@@ -6304,12 +6214,7 @@ sub scantron_validate_file {
     $r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();
     #get the student pick code ready
     $r->print(&Apache::loncommon::studentbrowser_javascript());
-    my $nav_error;
-    my $max_bubble=&scantron_get_maxbubble(\$nav_error);
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }
+    my $max_bubble=&scantron_get_maxbubble();
     my $result=&scantron_form_start($max_bubble).$default_form_data;
     $r->print($result);
     
@@ -6721,10 +6626,6 @@ sub scantron_validate_sequence {
     my ($r,$currentphase) = @_;
 
     my $navmap=Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $r->print(&navmap_errormsg());
-        return (1,$currentphase);
-    }
     my (undef,undef,$sequence)=
 	&Apache::lonnet::decode_symb($env{'form.selectpage'});
 
@@ -6757,12 +6658,7 @@ sub scantron_validate_ID {
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
     
-    my $nav_error;
-    &scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
+    &scantron_get_maxbubble();	# parse needs the bubble_lines.. array.
 
     my %found=('ids'=>{},'usernames'=>{});
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
@@ -7315,12 +7211,7 @@ sub scantron_validate_CODE {
 
     my %allcodes=&get_codes();
 
-    my $nav_error;
-    &scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
+    &scantron_get_maxbubble();	# parse needs the lines per response array.
 
     my ($scanlines,$scan_data)=&scantron_getfile();
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
@@ -7374,12 +7265,7 @@ sub scantron_validate_doublebubble {
     #get scantron line setup
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
-    my $nav_error;
-    &scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
+    &scantron_get_maxbubble();	# parse needs the bubble line array.
 
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
@@ -7397,8 +7283,6 @@ sub scantron_validate_doublebubble {
 
 
 sub scantron_get_maxbubble {
-    my ($nav_error) = @_;
-
     if (defined($env{'form.scantron_maxbubble'}) &&
 	$env{'form.scantron_maxbubble'}) {
 	&restore_bubble_lines();
@@ -7409,12 +7293,6 @@ sub scantron_get_maxbubble {
 	&Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     my $navmap=Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        if (ref($nav_error)) {
-            $$nav_error = 1;
-        }
-        return;
-    }
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
 
@@ -7504,11 +7382,7 @@ sub scantron_validate_missingbubbles {
     #get scantron line setup
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
-    my $nav_error;
-    my $max_bubble=&scantron_get_maxbubble(\$nav_error);
-    if ($nav_error) {
-        return(1,$currentphase);
-    }
+    my $max_bubble=&scantron_get_maxbubble();
     if (!$max_bubble) { $max_bubble=2**31; }
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
@@ -7568,24 +7442,13 @@ sub scantron_process_students {
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
     my $navmap=Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }  
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my (%grader_partids_by_symb,%grader_randomlists_by_symb);
     &graders_resources_pass(\@resources,\%grader_partids_by_symb,
                             \%grader_randomlists_by_symb);
-    my $resource_error;
     foreach my $resource (@resources) {
-        my $ressymb;
-        if (ref($resource)) {
-            $ressymb = $resource->symb();
-        } else {
-            $resource_error = 1;
-            last;
-        }
+        my $ressymb = $resource->symb();
         my ($analysis,$parts) =
             &scantron_partids_tograde($resource,$env{'request.course.id'},
                                       $env{'user.name'},$env{'user.domain'},1);
@@ -7597,10 +7460,6 @@ sub scantron_process_students {
             }
         }
     }
-    if ($resource_error) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }
 
     my ($uname,$udom);
     my $result= <<SCANTRONFORM;
@@ -7625,12 +7484,7 @@ SCANTRONFORM
     my $i=-1;
     my $started;
 
-    my $nav_error;
-    &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }
+    &scantron_get_maxbubble();	# Need the bubble lines array to parse.
 
     # If an ssi failed in scantron_get_maxbubble, put an error message out to
     # the user and return.
@@ -7671,15 +7525,9 @@ SCANTRONFORM
  	}
   	($uname,$udom)=split(/:/,$uname);
 
-        my (%partids_by_symb,$res_error);
+        my %partids_by_symb;
         foreach my $resource (@resources) {
-            my $ressymb;
-            if (ref($resource)) {
-                $ressymb = $resource->symb();
-            } else {
-                $res_error = 1;
-                last;
-            }
+            my $ressymb = $resource->symb();
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
                 my ($analysis,$parts) =
@@ -7690,12 +7538,6 @@ SCANTRONFORM
             }
         }
 
-        if ($res_error) {
-            &scantron_add_delay(\@delayqueue,$line,
-                                'An error occurred while grading student '.$uname,2);
-            next;
-        }
-
 	&Apache::lonxml::clear_problem_counter();
   	&Apache::lonnet::appenv($scan_record);
 
@@ -7867,17 +7709,15 @@ sub scantron_upload_scantron_data {
     my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
                        ('&nbsp'x2).&mt('(shows course personnel)'); 
     my $default_form_data=&defaultFormData(&get_symb($r,1));
-    my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
-    my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
     $r->print('
 <script type="text/javascript" language="javascript">
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
-	    alert("'.$nofile_alert.'");
+	    alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
 	    return false;
 	}
         if (formname.courseid.value == "") {
-            alert("'.$nocourseid_alert.'");
+            alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'");
             return false;
         }
 	formname.submit();
@@ -8126,10 +7966,6 @@ sub checkscantron_results {
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&Apache::grades::username_to_idmap($classlist);
     my $navmap=Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my (%grader_partids_by_symb,%grader_randomlists_by_symb);
@@ -8144,16 +7980,12 @@ sub checkscantron_results {
     my %completedstudents;
 
     my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
-                                    'Progress of Bubblesheet Data/Submission Records Comparison',$count,
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status',
+                                    'Progress of Scantron Data/Submission Records Comparison',$count,
                                     'inline',undef,'checkscantron');
     my ($username,$domain,$started);
-    my $nav_error;
-    &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }
+
+    &scantron_get_maxbubble();  # Need the bubble lines array to parse.
 
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
@@ -8226,14 +8058,14 @@ sub checkscantron_results {
                 if ($scandata{$pid} eq $record{$pid}) {
                     my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';
                     $okstudents .= '<tr class="'.$css_class.'">'.
-'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
+'<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
 '</tr>'."\n".
 '<tr class="'.$css_class.'">'."\n".
 '<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
                     $passed ++;
                 } else {
                     my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
-                    $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
+                    $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
 '</tr>'."\n".
 '<tr class="'.$css_class.'">'."\n".
 '<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
@@ -8446,36 +8278,50 @@ sub grading_menu {
                   'saveState'=>"",
                   'gradingMenu'=>1,
                   'showgrading'=>"yes");
-    my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    my @menu = ({ url => $url,
-                     name => &mt('Manual Grading/View Submissions'),
-                     short_description =>
-    &mt('Start the process of hand grading submissions.'),
-                 });
+    
+    my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
     $fields{'command'} = 'csvform';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push(@menu, { url => $url,
-                   name => &mt('Upload Scores'),
-                   short_description =>
-            &mt('Specify a file containing the class scores for current resource.')});
+    my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
     $fields{'command'} = 'processclicker';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push(@menu, { url => $url,
-                   name => &mt('Process Clicker'),
-                   short_description =>
-            &mt('Specify a file containing the clicker information for this resource.')});
+    my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
     $fields{'command'} = 'scantron_selectphase';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push(@menu, { url => $url,
-                   name => &mt('Grade/Manage/Review Bubblesheets'),
-                   short_description =>
-            &mt('Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.')});
-    $fields{'command'} = 'verify';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push(@menu, { url => "",
-                   name => &mt('Verify Receipt No.'),
-                   short_description =>
-            &mt('')});
+    my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
+    my @menu = ({	categorytitle=>'Course Grading',
+            items =>[
+                        {	linktext => 'Manual Grading/View Submissions',
+                    		url => $url1,
+                    		permission => 'F',
+                    		icon => 'edit-find-replace.png',
+                    		linktitle => 'Start the process of hand grading submissions.'
+                        },
+                	    {	linktext => 'Upload Scores',
+                    		url => $url2,
+                    		permission => 'F',
+                    		icon => 'uploadscores.png',
+                    		linktitle => 'Specify a file containing the class scores for current resource.'
+                	    },
+                	    {	linktext => 'Process Clicker',
+                    		url => $url3,
+                    		permission => 'F',
+                    		icon => 'addClickerInfoFile.png',
+                    		linktitle => 'Specify a file containing the clicker information for this resource.'
+                	    },
+                	    {	linktext => 'Grade/Manage/Review Scantron Forms',
+                    		url => $url4,
+                    		permission => 'F',
+                    		icon => 'stat.png',
+                    		linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
+                	    }
+                    ]
+            });
+
+    #$fields{'command'} = 'verify';
+    #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    #
     # Create the menu
     my $Str;
     # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
@@ -8487,24 +8333,15 @@ sub grading_menu {
 	'<input type="hidden" name="saveState"   value="" />'."\n".
 	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
-    foreach my $menudata (@menu) {
-        if ($menudata->{'name'} ne &mt('Verify Receipt No.')) {
-            $Str .='    <h3><a '.
-                $menudata->{'jscript'}.
-                ' href="'.
-                $menudata->{'url'}.'" >'.
-                $menudata->{'name'}."</a></h3>\n";
-        } else {
-            $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
-                $menudata->{'jscript'}.
-                ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-                ' /> '.
-                &Apache::lonnet::recprefix($env{'request.course.id'}).
-                    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
-        }
-        $Str .= '    '.('&nbsp;'x8).$menudata->{'short_description'}.
-            "\n";
-    }
+
+    $Str .= Apache::lonhtmlcommon::generate_menu(@menu);
+    #$menudata->{'jscript'}
+    $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
+        ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
+        ' /> '.
+        &Apache::lonnet::recprefix($env{'request.course.id'}).
+        '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+
     $Str .="</form>\n";
     my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
     $request->print(<<GRADINGMENUJS);
@@ -8621,102 +8458,91 @@ GRADINGMENUJS
 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
 
     $result.='
-    <div class="LC_grade_select_mode">
-      <div class="LC_grade_select_mode_current">
-        <h2>
-          '.&mt('Grade Current Resource').'
-        </h2>
-        <div class="LC_grade_select_mode_body">
-          <div class="LC_grades_resource_info">
-           '.$table.'
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Sections').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-               <select name="section" multiple="multiple" size="5">'."\n";
-    if (ref($sections)) {
-        foreach my $section (sort(@$sections)) {
-            $result.='<option value="'.$section.'" '.
-                ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
-        }
-    }
+<h2>
+  '.&mt('Grade Current Resource').'
+</h2>
+<div>
+  '.$table.'
+</div>
+
+<div class="LC_columnSection">
+  
+    <fieldset>
+      <legend>
+       '.&mt('Sections').'
+      </legend>
+      <select name="section" multiple="multiple" size="5">'."\n";
+    $result.= $selsec;
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
     $result.='
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Groups').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-                '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Access Status').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-                '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Submission Status').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-               <select name="submitonly" size="5">
-                 <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
-                 <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
-                 <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
-                 <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Groups').'
+      </legend>
+      '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Access Status').'
+      </legend>
+      '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Submission Status').'
+      </legend>
+      <select name="submitonly" size="5">
+	         <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
+	         <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
+	         <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
+	         <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
                  <option value="all" '.      ($saveSub eq 'all'       ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
-               </select>
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_type_body">
-            <div class="LC_grade_select_mode_type">
+      </select>
+    </fieldset>
+  
+</div>
+
+<br />
+          <div>
+            <div>
               <label>
                 <input type="radio" name="radioChoice" value="submission" '.
                   ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
              &mt('Select individual students to grade and view submissions.').'
-              </label>
+	      </label> 
             </div>
-            <div class="LC_grade_select_mode_type">
-              <label>
+            <div>
+	      <label>
                 <input type="radio" name="radioChoice" value="viewgrades" '.
                   ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
                     &mt('Grade all selected students in a grading table.').'
               </label>
             </div>
-            <div class="LC_grade_select_mode_type">
-              <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+            <div>
+	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
-        </div>
-      </div>
-      <div class="LC_grade_select_mode_page">
+
+
         <h2>
          '.&mt('Grade Complete Folder for One Student').'
         </h2>
-        <div class="LC_grades_select_mode_body">
-          <div class="LC_grade_select_mode_type_body">
-            <div class="LC_grade_select_mode_type">
+        <div>
+            <div>
               <label>
                 <input type="radio" name="radioChoice" value="pickStudentPage" '.
-          ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
+	  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
   &mt('The <b>complete</b> page/sequence/folder: For one student').'
               </label>
             </div>
-            <div class="LC_grade_select_mode_type">
-              <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+            <div>
+	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
             </div>
-          </div>
         </div>
-      </div>
-    </div>
   </form>';
     $result .= &show_grading_menu_form($symb);
     return $result;
@@ -9153,11 +8979,7 @@ sub assign_clicker_grades {
     my ($symb)=&get_symb($r);
     if (!$symb) {return '';}
 # See which part we are saving to
-    my $res_error;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        return &navmap_errormsg();
-    }
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
 # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];
 # Start screen output
@@ -9221,13 +9043,13 @@ ENDHEADER
           my $sum=0;
           my $realnumber=$number;
           for (my $i=0;$i<$number;$i++) {
-             if  ($correct[$i] eq '-') {
-                $realnumber--;
-             } elsif ($answer[$i]) {
+             if ($answer[$i]) {
                 if ($gradingmechanism eq 'attendance') {
                    $sum+=$pcorrect;
-                } elsif ($correct[$i] eq '*') {
+                } elsif ($answer[$i] eq '*') {
                    $sum+=$pcorrect;
+                } elsif ($answer[$i] eq '-') {
+                   $realnumber--;
                 } else {
                    if ($answer[$i] eq $correct[$i]) {
                       $sum+=$pcorrect;
@@ -9261,13 +9083,6 @@ ENDHEADER
     return $result.&show_grading_menu_form($symb);
 }
 
-sub navmap_errormsg {
-    return '<div class="LC_error">'.
-           &mt('An error occurred retrieving information about resources in the course.').'<br />'.
-           &mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page..','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').
-           '</div>';
-}
-
 sub handler {
     my $request=$_[0];
     &reset_caches();
@@ -9493,13 +9308,6 @@ ssi_with_retries()
 
 =item  scantron_get_maxbubble() : 
 
-   Arguments:
-       $nav_error  - Reference to scalar which is a flag to indicate a
-                      failure to retrieve a navmap object.
-       if $nav_error is set to 1 by scantron_get_maxbubble(), the 
-       calling routine should trap the error condition and display the warning
-       found in &navmap_errormsg().
-
    Returns the maximum number of bubble lines that are expected to
    occur. Does this by walking the selected sequence rendering the
    resource and then checking &Apache::lonxml::get_problem_counter()
@@ -9565,11 +9373,6 @@ ssi_with_retries()
    Validates all scanlines in the selected file to not have any
    invalid or underspecified student/employee IDs
 
-=item navmap_errormsg() :
-
-   Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.
-   Should be called whenever the request to instantiate a navmap object fails.  
-
 =back
 
 =cut