loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.302.2.3 and 1.452

-version 1.302.2.3, 2006/02/06 23:36:20
+version 1.452, 2007/10/11 20:25:34
  Line 36  use Apache::lonhtmlcommon;
  use Apache::lonnavmaps;
  use Apache::lonhomework;
  use Apache::loncoursedata;
- use Apache::lonmsg qw(:user_normal_msg);
+ use Apache::lonmsg();
  use Apache::Constants qw(:common);
  use Apache::lonlocal;
+ use Apache::lonenc;
  use String::Similarity;
+ use LONCAPA;
+ use POSIX qw(floor);
- my %oldessays=();
  my %perm=();
+ my %bubble_lines_per_response = ();     # no. bubble lines for each response.
+                                    # index is "symb.part_id"
+ my %first_bubble_line = ();	# First bubble line no. for each bubble.
+ # Save and restore the bubble lines array to the form env.
+ sub save_bubble_lines {
+     &Apache::lonnet::logthis("Saving bubble_lines...");
+     foreach my $line (keys(%bubble_lines_per_response)) {
+ 	&Apache::lonnet::logthis("Saving form.scantron.bubblelines.$line value: $bubble_lines_per_response{$line}");
+ 	$env{"form.scantron.bubblelines.$line"}  = $bubble_lines_per_response{$line};
+ 	$env{"form.scantron.first_bubble_line.$line"} =
+ 	    $first_bubble_line{$line};
+     }
+ }
+ sub restore_bubble_lines {
+     my $line = 0;
+     %bubble_lines_per_response = ();
+     while ($env{"form.scantron.bubblelines.$line"}) {
+ 	my $value = $env{"form.scantron.bubblelines.$line"};
+ 	&Apache::lonnet::logthis("Restoring form.scantron.bubblelines.$line value: $value");
+ 	$bubble_lines_per_response{$line} = $value;
+ 	$first_bubble_line{$line}  =
+ 	    $env{"form.scantron.first_bubble_line.$line"};
+ 	$line++;
+     }
+ }
+ #  Given the parsed scanline, get the response for
+ #  'answer' number n:
+ sub get_response_bubbles {
+     my ($parsed_line, $response)  = @_;
+     my $bubble_line = $first_bubble_line{$response};
+     my $bubble_lines= $bubble_lines_per_response{$response};
+     my $selected = "";
+     for (my $bline = 0; $bline < $bubble_lines; $bline++) {
+ 	$selected .= $$parsed_line{"scantron.$bubble_line.answer"};
+ 	$bubble_line++;
+     }
+     return $selected;
+ }
  # ----- These first few routines are general use routines.----
+ # Return the number of occurences of a pattern in a string.
+ sub occurence_count {
+     my ($string, $pattern) = @_;
+     my @matches = ($string =~ /$pattern/g);
+     return scalar(@matches);
+ }
+ # Take a string known to have digits and convert all the
+ # digits into letters in the range J,A..I.
+ sub digits_to_letters {
+     my ($input) = @_;
+     my @alphabet = ('J', 'A'..'I');
+     my @input    = split(//, $input);
+     my $output ='';
+     for (my $i = 0; $i < scalar(@input); $i++) {
+ 	if ($input[$i] =~ /\d/) {
+ 	    $output .= $alphabet[$input[$i]];
+ 	} else {
+ 	    $output .= $input[$i];
+ 	}
+     }
+     return $output;
+ }
  #
  # --- Retrieve the parts from the metadata file.---
  sub getpartlist {
-     my ($url,$symb) = @_;
+     my ($symb) = @_;
-     my $partorder = &Apache::lonnet::metadata($url, 'partorder');
-     my @parts;
+     my $navmap   = Apache::lonnavmaps::navmap->new();
-     if ($partorder) {
+     my $res      = $navmap->getBySymb($symb);
- 	for my $part (split (/,/,$partorder)) {
+     my $partlist = $res->parts();
- 	    if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
+     my $url      = $res->src();
- 		push(@parts, $part);
+     my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys'));
- 	    }
- 	}
-     } else {
- 	my $metadata = &Apache::lonnet::metadata($url, 'packages');
- 	foreach (split(/\,/,$metadata)) {
- 	    if ($_ =~ /^part_(.*)$/) {
- 		if (!&Apache::loncommon::check_if_partid_hidden($1,$symb)) {
- 		    push(@parts, $1);
- 		}
- 	    }
- 	}
-     }
      my @stores;
-     foreach my $part (@parts) {
+     foreach my $part (@{ $partlist }) {
- 	my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
  	foreach my $key (@metakeys) {
  	    if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
  	}
- Line 78  sub getpartlist {
+ Line 152  sub getpartlist {
  }
  # --- Get the symbolic name of a problem and the url
- sub get_symb_and_url {
+ sub get_symb {
      my ($request,$silent) = @_;
      (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
      my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
- Line 88  sub get_symb_and_url {
+ Line 162  sub get_symb_and_url {
  	    return ();
  	}
      }
-     return ($symb,$url);
+     &Apache::lonenc::check_decrypt(\$symb);
+     return ($symb);
  }
  #--- Format fullname, username:domain if different for display
- Line 96  sub get_symb_and_url {
+ Line 171  sub get_symb_and_url {
  sub nameUserString {
      my ($type,$fullname,$uname,$udom) = @_;
      if ($type eq 'header') {
- 	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>';
+ 	return '<b>&nbsp;Fullname&nbsp;</b><span class="LC_internal_info">(Username)</span>';
      } else {
- 	return '&nbsp;'.$fullname.'<font color="#999999">&nbsp;('.$uname.
+ 	return '&nbsp;'.$fullname.'<span class="LC_internal_info">&nbsp;('.$uname.
- 	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+ 	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
      }
  }
  #--- 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 ($url,$symb) = shift;
+     my ($symb) = shift;
-     $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
-     my $allkeys = &Apache::lonnet::metadata($url,'keys');
+     my $navmap = Apache::lonnavmaps::navmap->new();
-     my %vPart;
+     my $res = $navmap->getBySymb($symb);
-     foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+     my $partlist = $res->parts();
- 	$vPart{$partid}=1;
+     my %vPart =
-     }
+ 	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
-     my %seen = ();
+     my (%response_types,%handgrade);
-     my (@partlist,%handgrade,%responseType);
+     foreach my $part (@{ $partlist }) {
-     foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
+ 	next if (%vPart && !exists($vPart{$part}));
- 	if (/^\w+response_.*/) {
- 	    my ($responsetype,$part) = split(/_/,$_,2);
+ 	my @types = $res->responseType($part);
- 	    my ($partid,$respid) = split(/_/,$part);
+ 	my @ids = $res->responseIds($part);
- 	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
+ 	for (my $i=0; $i < scalar(@ids); $i++) {
- 		next;
+ 	    $response_types{$part}{$ids[$i]} = $types[$i];
- 	    }
+ 	    $handgrade{$part.'_'.$ids[$i]} =
- 	    if (%vPart && !exists($vPart{$partid})) {
+ 		&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
- 		next;
+ 				     '.handgrade',$symb);
- 	    }
+ 	}
- 	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
+     }
- 	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
+     return ($partlist,\%handgrade,\%response_types);
- 	    $handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no');
+ }
- 	    if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
- 	    $responseType{$partid}->{$respid}=$responsetype;
+ sub flatten_responseType {
- 	    next if ($seen{$partid} > 0);
+     my ($responseType) = @_;
- 	    $seen{$partid}++;
+     my @part_response_id =
- 	    push @partlist,$partid;
+ 	map {
- 	}
+ 	    my $part = $_;
-     }
+ 	    map {
-     return \@partlist,\%handgrade,\%responseType;
+ 		[$part,$_]
+ 		} sort(keys(%{ $responseType->{$part} }));
+ 	} sort(keys(%$responseType));
+     return @part_response_id;
  }
  sub get_display_part {
-     my ($partID,$url,$symb)=@_;
+     my ($partID,$symb)=@_;
-     if (!defined($symb) || $symb eq '') {
- 	$symb=$env{'form.symb'};
- 	if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }
-     }
      my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
      if (defined($display) and $display ne '') {
- 	$display.= " (<font color=\"#999900\">id $partID</font>)";
+ 	$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";
      } else {
  	$display=$partID;
      }
- Line 156  sub get_display_part {
+ Line 230  sub get_display_part {
  #--- Show resource title
  #--- and parts and response type
  sub showResourceInfo {
-     my ($url,$probTitle,$checkboxes) = @_;
+     my ($symb,$probTitle,$checkboxes) = @_;
      my $col=3;
      if ($checkboxes) { $col=4; }
-     my $result ='<table border="0">'.
+     my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
- 	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
+     $result .='<table border="0">';
- 	$probTitle.'</font></td></tr>'."\n";
+     my ($partlist,$handgrade,$responseType) = &response_type($symb);
-     my ($partlist,$handgrade,$responseType) = &response_type($url);
      my %resptype = ();
      my $hdgrade='no';
      my %partsseen;
-     for my $part_resID (sort keys(%$handgrade)) {
+     foreach my $partID (sort keys(%$responseType)) {
- 	my $handgrade=$$handgrade{$part_resID};
+ 	foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
- 	my ($partID,$resID) = split(/_/,$part_resID);
+ 	    my $handgrade=$$handgrade{$partID.'_'.$resID};
- 	my $responsetype = $responseType->{$partID}->{$resID};
+ 	    my $responsetype = $responseType->{$partID}->{$resID};
- 	$hdgrade = $handgrade if ($handgrade eq 'yes');
+ 	    $hdgrade = $handgrade if ($handgrade eq 'yes');
- 	$result.='<tr>';
+ 	    $result.='<tr>';
- 	if ($checkboxes) {
+ 	    if ($checkboxes) {
- 	    if (exists($partsseen{$partID})) {
+ 		if (exists($partsseen{$partID})) {
- 		$result.="<td>&nbsp;</td>";
+ 		    $result.="<td>&nbsp;</td>";
- 	    } else {
+ 		} else {
- 		$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>";
+ 		    $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
+ 		}
+ 		$partsseen{$partID}=1;
  	    }
- 	    $partsseen{$partID}=1;
+ 	    my $display_part=&get_display_part($partID,$symb);
- 	}
+ 	    $result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.
- 	my $display_part=&get_display_part($partID,$url);
+ 		$resID.'</span></td>'.
- 	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
+ 		'<td><b>Type: </b>'.$responsetype.'</td></tr>';
- 	    $resID.'</font></td>'.
- 	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
  #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+ 	}
      }
      $result.='</table>'."\n";
      return $result,$responseType,$hdgrade,$partlist,$handgrade;
  }
+ sub reset_caches {
+     &reset_analyze_cache();
+     &reset_perm();
+ }
- sub get_order {
+ {
-     my ($partid,$respid,$symb,$uname,$udom)=@_;
+     my %analyze_cache;
-     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-     $url=&Apache::lonnet::clutter($url);
+     sub reset_analyze_cache {
-     my $subresult=&Apache::lonnet::ssi($url,
+ 	undef(%analyze_cache);
- 				       ('grade_target' => 'analyze'),
+     }
- 				       ('grade_domain' => $udom),
- 				       ('grade_symb' => $symb),
+     sub get_analyze {
- 				       ('grade_courseid' =>
+ 	my ($symb,$uname,$udom)=@_;
- 					        $env{'request.course.id'}),
+ 	my $key = "$symb\0$uname\0$udom";
- 				       ('grade_username' => $uname));
+ 	return $analyze_cache{$key} if (exists($analyze_cache{$key}));
-     (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
-     my %analyze=&Apache::lonnet::str2hash($subresult);
+ 	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-     return ($analyze{"$partid.$respid.shown"});
+ 	$url=&Apache::lonnet::clutter($url);
+ 	my $subresult=&Apache::lonnet::ssi($url,
+ 					   ('grade_target' => 'analyze'),
+ 					   ('grade_domain' => $udom),
+ 					   ('grade_symb' => $symb),
+ 					   ('grade_courseid' =>
+ 					    $env{'request.course.id'}),
+ 					   ('grade_username' => $uname));
+ 	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
+ 	my %analyze=&Apache::lonnet::str2hash($subresult);
+ 	return $analyze_cache{$key} = \%analyze;
+     }
+     sub get_order {
+ 	my ($partid,$respid,$symb,$uname,$udom)=@_;
+ 	my $analyze = &get_analyze($symb,$uname,$udom);
+ 	return $analyze->{"$partid.$respid.shown"};
+     }
+     sub get_radiobutton_correct_foil {
+ 	my ($partid,$respid,$symb,$uname,$udom)=@_;
+ 	my $analyze = &get_analyze($symb,$uname,$udom);
+ 	foreach my $foil (@{&get_order($partid,$respid,$symb,$uname,$udom)}) {
+ 	    if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
+ 		return $foil;
+ 	    }
+ 	}
+     }
  }
  #--- Clean response type for display
- #--- Currently filters option/rank/radiobutton/match/essay response types only.
+ #--- Currently filters option/rank/radiobutton/match/essay/Task
+ #        response types only.
  sub cleanRecord {
-     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
-     my $grayFont = '<font color="#999999">';
+ 	$uname,$udom) = @_;
+     my $grayFont = '<span class="LC_internal_info">';
      if ($response =~ /^(option|rank)$/) {
  	my %answer=&Apache::lonnet::str2hash($answer);
  	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
- Line 221  sub cleanRecord {
+ Line 329  sub cleanRecord {
  	    } else {
  		$toprow.='<td><i>'.$answer{$foil}.'&nbsp;</i></td>';
  	    }
- 	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+ 	    $bottomrow.='<td>'.$grayFont.$foil.'</span>&nbsp;</td>';
  	}
  	return '<blockquote><table border="1">'.
  	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
  	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
      } elsif ($response eq 'match') {
  	my %answer=&Apache::lonnet::str2hash($answer);
- Line 236  sub cleanRecord {
+ Line 344  sub cleanRecord {
  	    my $item=shift(@items);
  	    if ($grading{$foil} == 1) {
  		$toprow.='<td><b>'.$item.'&nbsp;</b></td>';
- 		$middlerow.='<td><b>'.$grayFont.$answer{$foil}.'&nbsp;</font></b></td>';
+ 		$middlerow.='<td><b>'.$grayFont.$answer{$foil}.'&nbsp;</span></b></td>';
  	    } else {
  		$toprow.='<td><i>'.$item.'&nbsp;</i></td>';
- 		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</font></i></td>';
+ 		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</span></i></td>';
  	    }
- 	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+ 	    $bottomrow.='<td>'.$grayFont.$foil.'</span>&nbsp;</td>';
  	}
  	return '<blockquote><table border="1">'.
  	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- 	    '<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'.
  	    $middlerow.'</tr>'.
- 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
  	    $bottomrow.'</tr>'.'</table></blockquote>';
      } elsif ($response eq 'radiobutton') {
  	my %answer=&Apache::lonnet::str2hash($answer);
  	my ($toprow,$bottomrow);
- 	my $correct=($order->[0])+1;
+ 	my $correct =
- 	for (my $i=1;$i<=$#$order;$i++) {
+ 	    &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom);
- 	    my $foil=$order->[$i];
+ 	foreach my $foil (@$order) {
  	    if (exists($answer{$foil})) {
- 		if ($i == $correct) {
+ 		if ($foil eq $correct) {
  		    $toprow.='<td><b>true</b></td>';
  		} else {
  		    $toprow.='<td><i>true</i></td>';
- Line 264  sub cleanRecord {
+ Line 372  sub cleanRecord {
  	    } else {
  		$toprow.='<td>false</td>';
  	    }
- 	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+ 	    $bottomrow.='<td>'.$grayFont.$foil.'</span>&nbsp;</td>';
  	}
  	return '<blockquote><table border="1">'.
  	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
  	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
      } elsif ($response eq 'essay') {
  	if (! exists ($env{'form.'.$symb})) {
- Line 290  sub cleanRecord {
+ Line 398  sub cleanRecord {
  	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
  	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
  	return $result;
+     } elsif ( $response eq 'Task') {
+ 	if ( $answer eq 'SUBMITTED') {
+ 	    my $files = $record->{$version."resource.$respid.$partid.bridgetask.portfiles"};
+ 	    my $result = &Apache::bridgetask::file_list($files,$uname,$udom);
+ 	    return $result;
+ 	} elsif ( grep(/^\Q$version\E.*?\.instance$/, keys(%{$record})) ) {
+ 	    my @matches = grep(/^\Q$version\E.*?\.instance$/,
+ 			       keys(%{$record}));
+ 	    return join('<br />',($version,@matches));
+ 	} else {
+ 	    my $result =
+ 		'<p>'
+ 		.&mt('Overall result: [_1]',
+ 		     $record->{$version."resource.$respid.$partid.status"})
+ 		.'</p>';
+ 	    $result .= '<ul>';
+ 	    my @grade = grep(/^\Q${version}resource.$respid.$partid.\E[^.]*[.]status$/,
+ 			     keys(%{$record}));
+ 	    foreach my $grade (sort(@grade)) {
+ 		my ($dim) = ($grade =~/[.]([^.]+)[.]status$/);
+ 		$result.= '<li>'.&mt("Dimension: [_1], status [_2] ",
+ 				     $dim, $record->{$grade}).
+ 			  '</li>';
+ 	    }
+ 	    $result.='</ul>';
+ 	    return $result;
+ 	}
+     } elsif ( $response =~ m/(?:numerical|formula)/) {
+ 	$answer =
+ 	    &Apache::loncommon::format_previous_attempt_value('submission',
+ 							      $answer);
      }
      return $answer;
  }
- Line 333  COMMONJSFUNCTIONS
+ Line 475  COMMONJSFUNCTIONS
  #--- Dumps the class list with usernames,list of sections,
  #--- section, ids and fullnames for each user.
  sub getclasslist {
-     my ($getsec,$filterlist) = @_;
+     my ($getsec,$filterlist,$getgroup) = @_;
      my @getsec;
+     my @getgroup;
+     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
      if (!ref($getsec)) {
  	if ($getsec ne '' && $getsec ne 'all') {
  	    @getsec=($getsec);
- Line 343  sub getclasslist {
+ Line 487  sub getclasslist {
  	@getsec=@{$getsec};
      }
      if (grep(/^all$/,@getsec)) { undef(@getsec); }
+     if (!ref($getgroup)) {
+ 	if ($getgroup ne '' && $getgroup ne 'all') {
+ 	    @getgroup=($getgroup);
+ 	}
+     } else {
+ 	@getgroup=@{$getgroup};
+     }
+     if (grep(/^all$/,@getgroup)) { undef(@getgroup); }
-     my $classlist=&Apache::loncoursedata::get_classlist();
+     my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
      # Bail out if we were unable to get the classlist
      return if (! defined($classlist));
+     &Apache::loncoursedata::get_group_memberships($classlist,$keylist);
      #
      my %sections;
      my %fullnames;
- Line 363  sub getclasslist {
+ Line 516  sub getclasslist {
              $classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
          my $status   =
              $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
+         my $group   =
+             $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
  	# filter students according to status selected
- 	if ($filterlist && $env{'form.Status'} ne 'Any') {
+ 	if ($filterlist && (!($stu_status =~ /Any/))) {
- 	    if ($env{'form.Status'} ne $status) {
+ 	    if (!($stu_status =~ $status)) {
- 		delete ($classlist->{$student});
+ 		delete($classlist->{$student});
  		next;
  	    }
  	}
+ 	# filter students according to groups selected
+ 	if (@getgroup) {
+ 	    my $exclude = 1;
+ 	    foreach my $grp(@getgroup) {
+ 	        if ($group eq $grp) {
+ 	            $exclude = 0;
+ 	        } elsif (($grp eq 'none') && !$group) {
+ 	            $exclude = 0;
+ 	        }
+ 	    }
+ 	    if ($exclude) {
+ 	        delete($classlist->{$student});
+ 	    }
+ 	}
  	$section = ($section ne '' ? $section : 'none');
  	if (&canview($section)) {
  	    if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
  		$sections{$section}++;
- 		$fullnames{$student}=$fullname;
+ 		if ($classlist->{$student}) {
+ 		    $fullnames{$student}=$fullname;
+ 		}
  	    } else {
  		delete($classlist->{$student});
  	    }
- Line 429  sub canview {
+ Line 600  sub canview {
  #--- Retrieve the grade status of a student for all the parts
  sub student_gradeStatus {
-     my ($url,$symb,$udom,$uname,$partlist) = @_;
+     my ($symb,$udom,$uname,$partlist) = @_;
      my %record     = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
      my %partstatus = ();
      foreach (@$partlist) {
- Line 446  sub student_gradeStatus {
+ Line 617  sub student_gradeStatus {
  # Use by verifyscript and viewgrades
  # Shows a student's view of problem and submission
  sub jscriptNform {
-     my ($url,$symb) = @_;
+     my ($symb) = @_;
+     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
      my $jscript='<script type="text/javascript" language="javascript">'."\n".
  	'    function viewOneStudent(user,domain) {'."\n".
  	'	document.onestudent.student.value = user;'."\n".
- Line 455  sub jscriptNform {
+ Line 627  sub jscriptNform {
  	'    }'."\n".
  	'</script>'."\n";
      $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
- 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
  	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
  	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
- 	'<input type="hidden" name="Status"  value="'.$env{'form.Status'}.'" />'."\n".
+ 	'<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
  	'<input type="hidden" name="command" value="submission" />'."\n".
  	'<input type="hidden" name="student" value="" />'."\n".
  	'<input type="hidden" name="userdom" value="" />'."\n".
- Line 467  sub jscriptNform {
+ Line 638  sub jscriptNform {
      return $jscript;
  }
+ # Given the score (as a number [0-1] and the weight) what is the final
+ # point value? This function will round to the nearest tenth, third,
+ # or quarter if one of those is within the tolerance of .00001.
+ sub compute_points {
+     my ($score, $weight) = @_;
+     my $tolerance = .00001;
+     my $points = $score * $weight;
+     # Check for nearness to 1/x.
+     my $check_for_nearness = sub {
+         my ($factor) = @_;
+         my $num = ($points * $factor) + $tolerance;
+         my $floored_num = floor($num);
+         if ($num - $floored_num < 2 * $tolerance * $factor) {
+             return $floored_num / $factor;
+         }
+         return $points;
+     };
+     $points = $check_for_nearness->(10);
+     $points = $check_for_nearness->(3);
+     $points = $check_for_nearness->(4);
+     return $points;
+ }
  #------------------ End of general use routines --------------------
  #
- Line 474  sub jscriptNform {
+ Line 674  sub jscriptNform {
  #
  sub most_similar {
-     my ($uname,$udom,$uessay)=@_;
+     my ($uname,$udom,$uessay,$old_essays)=@_;
  # ignore spaces and punctuation
- Line 491  sub most_similar {
+ Line 691  sub most_similar {
      my $scrsid='';
      my $sessay='';
  # go through all essays ...
-     foreach my $tkey (keys %oldessays) {
+     foreach my $tkey (keys(%$old_essays)) {
- 	my ($tname,$tdom,$tcrsid)=split(/\./,$tkey);
+ 	my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey));
  # ... except the same student
-         if (($tname ne $uname) || ($tdom ne $udom)) {
+         next if (($tname eq $uname) && ($tdom eq $udom));
- 	    my $tessay=$oldessays{$tkey};
+ 	my $tessay=$old_essays->{$tkey};
-             $tessay=~s/\W+/ /gs;
+ 	$tessay=~s/\W+/ /gs;
  # String similarity gives up if not even limit
-             my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
+ 	my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
  # Found one
-             if ($tsimilar>$limit) {
+ 	if ($tsimilar>$limit) {
- 		$limit=$tsimilar;
+ 	    $limit=$tsimilar;
-                 $sname=$tname;
+ 	    $sname=$tname;
-                 $sdom=$tdom;
+ 	    $sdom=$tdom;
-                 $scrsid=$tcrsid;
+ 	    $scrsid=$tcrsid;
-                 $sessay=$oldessays{$tkey};
+ 	    $sessay=$old_essays->{$tkey};
-             }
+ 	}
-         }
      }
      if ($limit>0.6) {
         return ($sname,$sdom,$scrsid,$sessay,$limit);
- Line 528  sub verifyreceipt {
+ Line 727  sub verifyreceipt {
      my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
  	$env{'form.receipt'};
      $receipt     =~ s/[^\-\d]//g;
-     my $url      = $env{'form.url'};
+     my ($symb)   = &get_symb($request);
-     my $symb     = $env{'form.symb'};
-     unless ($symb) {
- 	$symb    = &Apache::lonnet::symbread($url);
-     }
-     my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
+     my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
- 	$receipt.'</h3></font>'."\n".
+ 	$receipt.'</h3></span>'."\n".
- 	'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br><br>'."\n";
+ 	'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";
      my ($string,$contents,$matches) = ('','',0);
      my (undef,undef,$fullname) = &getclasslist('all','0');
      my $receiptparts=0;
-     if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+     if ($env{"course.$courseid.receiptalg"} eq 'receipt2' ||
+ 	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
      my $parts=['0'];
-     if ($receiptparts) { ($parts)=&response_type($url,$symb); }
+     if ($receiptparts) { ($parts)=&response_type($symb); }
      foreach (sort
  	     {
  		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
- Line 557  sub verifyreceipt {
+ Line 753  sub verifyreceipt {
  	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
  		$contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
  		    '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
- 		    '\')"; TARGET=_self>'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
+ 		    '\');" target="_self">'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
  		    '<td>&nbsp;'.$uname.'&nbsp;</td>'.
  		    '<td>&nbsp;'.$udom.'&nbsp;</td>';
  		if ($receiptparts) {
- Line 572  sub verifyreceipt {
+ Line 768  sub verifyreceipt {
      if ($matches == 0) {
  	$string = $title.'No match found for the above receipt.';
      } else {
- 	$string = &jscriptNform($url,$symb).$title.
+ 	$string = &jscriptNform($symb).$title.
  	    'The above receipt matches the following student'.
  	    ($matches <= 1 ? '.' : 's.')."\n".
  	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
- Line 586  sub verifyreceipt {
+ Line 782  sub verifyreceipt {
  	$string.='</tr>'."\n".$contents.
  	    '</table></td></tr></table>'."\n";
      }
-     return $string.&show_grading_menu_form($symb,$url);
+     return $string.&show_grading_menu_form($symb);
  }
  #--- This is called by a number of programs.
- Line 596  sub verifyreceipt {
+ Line 792  sub verifyreceipt {
  sub listStudents {
      my ($request) = shift;
-     my ($symb,$url) = &get_symb_and_url($request);
+     my ($symb) = &get_symb($request);
      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+     my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
      my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
      my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
      $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
  	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-     my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
+     my $result='<h3><span class="LC_info">&nbsp;'.$viewgrade.
- 	' Submissions for a Student or a Group of Students</font></h3>';
+ 	' Submissions for a Student or a Group of Students</span></h3>';
-     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
+     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
      $request->print(<<LISTJAVASCRIPT);
  <script type="text/javascript" language="javascript">
- Line 647  LISTJAVASCRIPT
+ Line 843  LISTJAVASCRIPT
      &commonJSfunctions($request);
      $request->print($result);
-     my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
+     my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
-     my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
+     my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
      my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
  	"\n".$table.
- 	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+ 	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
  	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
  	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
  	'&nbsp;<b>View Answer: </b><label><input type="radio" name="vAns" value="no"  /> no </label>'."\n".
  	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
- 	'<label><input type="radio" name="vAns" value="all" checked="on" /> all students </label><br />'."\n".
+ 	'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".
  	'&nbsp;<b>Submissions: </b>'."\n";
      if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
  	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
      }
+     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
-     my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};
+     my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
      $env{'form.Status'} = $saveStatus;
      $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
  	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
  	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
- 	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".
+ 	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
- 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
+         '&nbsp;<b>Grading Increments:</b> <select name="increment">'.
+         '<option value="1">Whole Points</option>'.
+         '<option value=".5">Half Points</option>'.
+         '<option value=".25">Quarter Points</option>'.
+         '<option value=".1">Tenths of a Point</option>'.
+         '</select>'.
+         &build_section_inputs().
  	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
  	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
  	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
  	'<input type="hidden" name="saveState"   value="'.$env{'form.saveState'}.'" />'."\n".
  	'<input type="hidden" name="probTitle"   value="'.$env{'form.probTitle'}.'" />'."\n".
- 	'<input type="hidden" name="url"  value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
  	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
      if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
- 	$gradeTable.='<input type="hidden" name="Status"   value="'.$env{'form.Status'}.'" />'."\n";
+ 	$gradeTable.='<input type="hidden" name="Status"   value="'.$stu_status.'" />'."\n";
      } else {
  	$gradeTable.='<b>Student Status:</b> '.
  	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
- Line 696  LISTJAVASCRIPT
+ Line 896  LISTJAVASCRIPT
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
  	'value="Next->" /> <br />'."\n";
      $gradeTable.=&check_buttons();
-     $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';
+     $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';
-     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');
+     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
      $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">';
      my $loop = 0;
- Line 708  LISTJAVASCRIPT
+ Line 908  LISTJAVASCRIPT
  	    && $submitonly ne 'queued'
  	    && $submitonly ne 'all') {
  	    foreach (sort(@$partlist)) {
- 		my $display_part=&get_display_part((split(/_/))[0],$url,$symb);
+ 		my $display_part=&get_display_part((split(/_/))[0],$symb);
  		$gradeTable.='<td><b>&nbsp;Part: '.$display_part.
  		    ' Status&nbsp;</b></td>';
  	    }
- Line 744  LISTJAVASCRIPT
+ Line 944  LISTJAVASCRIPT
  	if ($env{'form.showgrading'} eq 'yes'
  	    && $submitonly ne 'queued'
  	    && $submitonly ne 'all') {
- 	    (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+ 	    (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
  	    my $submitted = 0;
  	    my $graded = 0;
  	    my $incorrect = 0;
- Line 772  LISTJAVASCRIPT
+ Line 972  LISTJAVASCRIPT
  	$ctr++;
  	my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
+         my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
  	if ( $perm{'vgr'} eq 'F' ) {
  	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
  	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
- Line 780  LISTJAVASCRIPT
+ Line 980  LISTJAVASCRIPT
                 $student.':'.$$fullname{$student}.':::SECTION'.$section.
  	       ')&nbsp;" />&nbsp;&nbsp;</label></td>'."\n".'<td>'.
  	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
- 	       '&nbsp;'.$section.'</td>'."\n";
+ 	       '&nbsp;'.$section.'/'.$group.'</td>'."\n";
  	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
  		foreach (sort keys(%status)) {
- Line 813  LISTJAVASCRIPT
+ Line 1013  LISTJAVASCRIPT
      if ($ctr == 0) {
  	my $num_students=(scalar(keys(%$fullname)));
  	if ($num_students eq 0) {
- 	    $gradeTable='<br />&nbsp;<font color="red">There are no students currently enrolled.</font>';
+ 	    $gradeTable='<br />&nbsp;<span class="LC_warning">There are no students currently enrolled.</span>';
  	} else {
  	    my $submissions='submissions';
  	    if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
  	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
  	    if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
- 	    $gradeTable='<br />&nbsp;<font color="red">'.
+ 	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.
  		'No '.$submissions.' found for this resource for any students. ('.$num_students.
- 		' students checked for '.$submissions.')</font><br />';
+ 		' students checked for '.$submissions.')</span><br />';
  	}
      } elsif ($ctr == 1) {
  	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
      }
-     $gradeTable.=&show_grading_menu_form($symb,$url);
+     $gradeTable.=&show_grading_menu_form($symb);
      $request->print($gradeTable);
      return '';
  }
- Line 885  sub processGroup {
+ Line 1085  sub processGroup {
      my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
      my $total      = scalar(@stuchecked)-1;
-     foreach (@stuchecked) {
+     foreach my $student (@stuchecked) {
- 	my ($uname,$udom,$fullname) = split(/:/);
+ 	my ($uname,$udom,$fullname) = split(/:/,$student);
  	$env{'form.student'}        = $uname;
  	$env{'form.userdom'}        = $udom;
  	$env{'form.fullname'}       = $fullname;
- Line 1082  sub sub_page_kw_js {
+ Line 1282  sub sub_page_kw_js {
      my $request = shift;
      my $iconpath = $request->dir_config('lonIconsURL');
      &commonJSfunctions($request);
+     my $inner_js_msg_central=<<INNERJS;
+     <script text="text/javascript">
+     function checkInput() {
+       opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
+       var nmsg   = opener.document.SCORE.savemsgN.value;
+       var usrctr = document.msgcenter.usrctr.value;
+       var newval = opener.document.SCORE["newmsg"+usrctr];
+       newval.value = opener.checkEntities(document.msgcenter.newmsg.value);
+       var msgchk = "";
+       if (document.msgcenter.subchk.checked) {
+          msgchk = "msgsub,";
+       }
+       var includemsg = 0;
+       for (var i=1; i<=nmsg; i++) {
+           var opnmsg = opener.document.SCORE["savemsg"+i];
+           var frmmsg = document.msgcenter["msg"+i];
+           opnmsg.value = opener.checkEntities(frmmsg.value);
+           var showflg = opener.document.SCORE["shownOnce"+i];
+           showflg.value = "1";
+           var chkbox = document.msgcenter["msgn"+i];
+           if (chkbox.checked) {
+              msgchk += "savemsg"+i+",";
+              includemsg = 1;
+           }
+       }
+       if (document.msgcenter.newmsgchk.checked) {
+          msgchk += "newmsg"+usrctr;
+          includemsg = 1;
+       }
+       imgformname = opener.document.SCORE["mailicon"+usrctr];
+       imgformname.src = "$iconpath/"+((includemsg) ? "mailto.gif" : "mailbkgrd.gif");
+       var includemsg = opener.document.SCORE["includemsg"+usrctr];
+       includemsg.value = msgchk;
+       self.close()
+     }
+     </script>
+ INNERJS
+     my $inner_js_highlight_central=<<INNERJS;
+  <script type="text/javascript">
+     function updateChoice(flag) {
+       opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+       opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+       opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+       opener.document.SCORE.refresh.value = "on";
+       if (opener.document.SCORE.keywords.value!=""){
+          opener.document.SCORE.submit();
+       }
+       self.close()
+     }
+ </script>
+ INNERJS
+     my $start_page_msg_central =
+         &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
+ 				       {'js_ready'  => 1,
+ 					'only_body' => 1,
+ 					'bgcolor'   =>'#FFFFFF',});
+     my $end_page_msg_central =
+ 	&Apache::loncommon::end_page({'js_ready' => 1});
+     my $start_page_highlight_central =
+         &Apache::loncommon::start_page('Highlight Central',
+ 				       $inner_js_highlight_central,
+ 				       {'js_ready'  => 1,
+ 					'only_body' => 1,
+ 					'bgcolor'   =>'#FFFFFF',});
+     my $end_page_highlight_central =
+ 	&Apache::loncommon::end_page({'js_ready' => 1});
      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
      $docopen=~s/^document\.//;
      $request->print(<<SUBJAVASCRIPT);
- Line 1197  sub sub_page_kw_js {
+ Line 1472  sub sub_page_kw_js {
      pWin.focus();
      pDoc = pWin.document;
      pDoc.$docopen;
-     pDoc.write("<html><head>");
+     pDoc.write('$start_page_msg_central');
-     pDoc.write("<title>Message Central</title>");
-     pDoc.write("<script language=javascript>");
-     pDoc.write("function checkInput() {");
-     pDoc.write("  opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);");
-     pDoc.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
-     pDoc.write("  var usrctr = document.msgcenter.usrctr.value;");
-     pDoc.write("  var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
-     pDoc.write("  newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");
-     pDoc.write("  var msgchk = \\"\\";");
-     pDoc.write("  if (document.msgcenter.subchk.checked) {");
-     pDoc.write("     msgchk = \\"msgsub,\\";");
-     pDoc.write("  }");
-     pDoc.write("  var includemsg = 0;");
-     pDoc.write("  for (var i=1; i<=nmsg; i++) {");
-     pDoc.write("      var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
-     pDoc.write("      var frmmsg = document.msgcenter[\\"msg\\"+i];");
-     pDoc.write("      opnmsg.value = opener.checkEntities(frmmsg.value);");
-     pDoc.write("      var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
-     pDoc.write("      showflg.value = \\"1\\";");
-     pDoc.write("      var chkbox = document.msgcenter[\\"msgn\\"+i];");
-     pDoc.write("      if (chkbox.checked) {");
-     pDoc.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
-     pDoc.write("         includemsg = 1;");
-     pDoc.write("      }");
-     pDoc.write("  }");
-     pDoc.write("  if (document.msgcenter.newmsgchk.checked) {");
-     pDoc.write("     msgchk += \\"newmsg\\"+usrctr;");
-     pDoc.write("     includemsg = 1;");
-     pDoc.write("  }");
-     pDoc.write("  imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
-     pDoc.write("  imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
-     pDoc.write("  var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
-     pDoc.write("  includemsg.value = msgchk;");
-     pDoc.write("  self.close()");
-     pDoc.write("}");
-     pDoc.write("<");
-     pDoc.write("/script>");
-     pDoc.write("</head><body bgcolor=white>");
      pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
      pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-     pDoc.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br><br>");
+     pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Compose Message for \"+fullname+\"</span></h3><br /><br />");
      pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
      pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- Line 1280  sub sub_page_kw_js {
+ Line 1511  sub sub_page_kw_js {
      pDoc.write("</table>");
      pDoc.write("</td></tr></table>&nbsp;");
      pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
-     pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+     pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
      pDoc.write("</form>");
-     pDoc.write("</body></html>");
+     pDoc.write('$end_page_msg_central');
      pDoc.close();
  }
- Line 1328  sub sub_page_kw_js {
+ Line 1559  sub sub_page_kw_js {
      hwdWin.focus();
      var hDoc = hwdWin.document;
      hDoc.$docopen;
-     hDoc.write("<html><head>");
+     hDoc.write('$start_page_highlight_central');
-     hDoc.write("<title>Highlight Central</title>");
-     hDoc.write("<script language=javascript>");
-     hDoc.write("function updateChoice(flag) {");
-     hDoc.write("  opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);");
-     hDoc.write("  opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
-     hDoc.write("  opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
-     hDoc.write("  opener.document.SCORE.refresh.value = \\"on\\";");
-     hDoc.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
-     hDoc.write("     opener.document.SCORE.submit();");
-     hDoc.write("  }");
-     hDoc.write("  self.close()");
-     hDoc.write("}");
-     hDoc.write("<");
-     hDoc.write("/script>");
-     hDoc.write("</head><body bgcolor=white>");
      hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
-     hDoc.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br><br>");
+     hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Keyword Highlight Options</span></h3><br /><br />");
      hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
      hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- Line 1373  sub sub_page_kw_js {
+ Line 1585  sub sub_page_kw_js {
      hDoc.write("</table>");
      hDoc.write("</td></tr></table>&nbsp;");
      hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
-     hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+     hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
      hDoc.write("</form>");
-     hDoc.write("</body></html>");
+     hDoc.write('$end_page_highlight_central');
      hDoc.close();
    }
- Line 1383  sub sub_page_kw_js {
+ Line 1595  sub sub_page_kw_js {
  SUBJAVASCRIPT
  }
+ sub get_increment {
+     my $increment = $env{'form.increment'};
+     if ($increment != 1 && $increment != .5 && $increment != .25 &&
+         $increment != .1) {
+         $increment = 1;
+     }
+     return $increment;
+ }
  #--- displays the grading box, used in essay type problem and grading by page/sequence
  sub gradeBox {
      my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
+     my $checkIcon = '<img alt="'.&mt('Check Mark').
-     my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+ 	'" src="'.$request->dir_config('lonIconsURL').
  	'/check.gif" height="16" border="0" />';
      my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
      my $wgtmsg = ($wgt > 0 ? '(problem weight)' :
- 		  '<font color="red">problem weight assigned by computer</font>');
+ 		  '<span class="LC_info">problem weight assigned by computer</span>');
      $wgt       = ($wgt > 0 ? $wgt : '1');
      my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
- 		  '' : $$record{'resource.'.$partid.'.awarded'}*$wgt);
+ 		  '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
      my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
+     my $display_part=&get_display_part($partid,$symb);
-     my $display_part=&get_display_part($partid,undef,$symb);
      my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
  				       [$partid]);
      my $aggtries = $$record{'resource.'.$partid.'.tries'};
      if ($last_resets{$partid}) {
          $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
      }
      $result.='<table border="0"><tr><td>'.
  	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
      my $ctr = 0;
+     my $thisweight = 0;
+     my $increment = &get_increment();
      $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
-     while ($ctr<=$wgt) {
+     while ($thisweight<=$wgt) {
- 	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ 	$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
  	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
- 	    $ctr.')" value="'.$ctr.'" '.
+ 	    $thisweight.')" value="'.$thisweight.'" '.
- 	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";
+ 	    ($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
  	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+         $thisweight += $increment;
  	$ctr++;
      }
      $result.='</tr></table>';
      $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>'."\n";
      $result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
  	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
- Line 1430  sub gradeBox {
+ Line 1648  sub gradeBox {
      $result.='<td>/'.$wgt.' '.$wgtmsg.
  	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
  	' </td><td>'."\n";
      $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
  	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
      if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
- 	$result.='<option> </option>'.
+ 	$result.='<option></option>'.
- 	    '<option selected="on">excused</option>';
+ 	    '<option selected="selected">excused</option>';
      } else {
- 	$result.='<option selected="on"> </option>'.
+ 	$result.='<option selected="selected"></option>'.
  	    '<option>excused</option>';
      }
      $result.='<option>reset status</option></select>'."\n";
-     $result.="&nbsp&nbsp\n";
+     $result.="&nbsp;&nbsp;\n";
      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
  	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
  	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
- Line 1451  sub gradeBox {
+ Line 1668  sub gradeBox {
          '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
          $aggtries.'" />'."\n";
      $result.='</td></tr></table>'."\n";
+     $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
      return $result;
  }
+ sub handback_box {
+     my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
+     my ($partlist,$handgrade,$responseType) = &response_type($symb);
+     my (@respids);
+      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) {
+             push(@respids,$resp);
+         }
+     }
+     my $result;
+     foreach my $respid (@respids) {
+ 	my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
+ 	my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
+ 	next if (!@$files);
+ 	my $file_counter = 1;
+ 	foreach my $file (@$files) {
+ 	    if ($file =~ /\/portfolio\//) {
+     	        my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
+     	        my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+     	        $file_disp = "$name.$ext";
+     	        $file = $file_path.$file_disp;
+     	        $result.=&mt('Return commented version of [_1] to student.',
+     			 '<span class="LC_filename">'.$file_disp.'</span>');
+     	        $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
+     	        $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
+     	        $result.='(File will be uploaded when you click on Save & Next below.)<br />';
+     	        $file_counter++;
+ 	    }
+ 	}
+     }
+     return $result;
+ }
  sub show_problem {
-     my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
+     my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode,$form) = @_;
      my $rendered;
+     my %form = ((ref($form) eq 'HASH')? %{$form} : ());
+     &Apache::lonxml::remember_problem_counter();
      if ($mode eq 'both' or $mode eq 'text') {
  	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
- 					     $env{'request.course.id'});
+ 						       $env{'request.course.id'},
+ 						       undef,\%form);
      }
      if ($removeform) {
  	$rendered=~s|<form(.*?)>||g;
  	$rendered=~s|</form>||g;
- 	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+ 	$rendered=~s|(<input[^>]*name\s*=\s*"?)(\w+)("?)|$1would_have_been_$2$3|g;
      }
      my $companswer;
      if ($mode eq 'both' or $mode eq 'answer') {
- 	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ 	&Apache::lonxml::restore_problem_counter();
- 						    $env{'request.course.id'});
+ 	$companswer=
+ 	    &Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ 						    $env{'request.course.id'},
+ 						    %form);
      }
      if ($removeform) {
  	$companswer=~s|<form(.*?)>||g;
- Line 1500  sub show_problem {
+ Line 1759  sub show_problem {
      return $result;
  }
+ sub files_exist {
+     my ($r, $symb) = @_;
+     my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');
+     foreach my $student (@students) {
+         my ($uname,$udom,$fullname) = split(/:/,$student);
+         my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+ 					      $udom,$uname);
+         my ($string,$timestamp)= &get_last_submission(\%record);
+         foreach my $submission (@$string) {
+             my ($partid,$respid) =
+ 		($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
+             my $files=&get_submitted_files($udom,$uname,$partid,$respid,
+ 					   \%record);
+             return 1 if (@$files);
+         }
+     }
+     return 0;
+ }
+ sub download_all_link {
+     my ($r,$symb) = @_;
+     my $all_students =
+ 	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
+     my $parts =
+ 	join("\n",&Apache::loncommon::get_env_multiple('form.vPart'));
+     my $identifier = &Apache::loncommon::get_cgi_id();
+     &Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
+                             'cgi.'.$identifier.'.symb' => $symb,
+                             'cgi.'.$identifier.'.parts' => $parts,);
+     $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
+ 	      &mt('Download All Submitted Documents').'</a>');
+     return
+ }
+ sub build_section_inputs {
+     my $section_inputs;
+     if ($env{'form.section'} eq '') {
+         $section_inputs .= '<input type="hidden" name="section" value="all" />'."\n";
+     } else {
+         my @sections = &Apache::loncommon::get_env_multiple('form.section');
+         foreach my $section (@sections) {
+             $section_inputs .= '<input type="hidden" name="section" value="'.$section.'" />'."\n";
+         }
+     }
+     return $section_inputs;
+ }
  # --------------------------- show submissions of a student, option to grade
  sub submission {
      my ($request,$counter,$total) = @_;
-     (my $url=$env{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
      my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});
      $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
      my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
      $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
+     my $symb = &get_symb($request);
-     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
+     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
-     if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
      if (!&canview($usec)) {
- 	$request->print('<font color="red">Unable to view requested student.('.
+ 	$request->print('<span class="LC_warning">Unable to view requested student.('.
- 			$uname.'@'.$udom.' in section '.$usec.' in course id '.
+ 			$uname.':'.$udom.' in section '.$usec.' in course id '.
- 			$env{'request.course.id'}.')</font>');
+ 			$env{'request.course.id'}.')</span>');
- 	$request->print(&show_grading_menu_form($symb,$url));
+ 	$request->print(&show_grading_menu_form($symb));
  	return;
      }
- Line 1525  sub submission {
+ Line 1831  sub submission {
      if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
      if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
      my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-     my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+     my $checkIcon = '<img alt="'.&mt('Check Mark').
+ 	'" src="'.$request->dir_config('lonIconsURL').
  	'/check.gif" height="16" border="0" />';
+     my %old_essays;
      # header info
      if ($counter == 0) {
  	&sub_page_js($request);
  	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
  	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
  	    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
+ 	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
- 	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
+ 	    &download_all_link($request, $symb);
- 			'<font size=+1>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");
+ 	}
+ 	$request->print('<h3>&nbsp;<span class="LC_info">Submission Record</span></h3>'."\n".
+ 			'<h4>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");
  	if ($env{'form.handgrade'} eq 'no') {
  	    my $checkMark='<br /><br />&nbsp;<b>Note:</b> Part(s) graded correct by the computer is marked with a '.
- Line 1555  sub submission {
+ Line 1865  sub submission {
  	    } elsif ($env{'form.vAns'} eq 'yes') {
  		$mode='answer';
  	    }
+ 	    &Apache::lonxml::clear_problem_counter();
  	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
  	}
  	# kwclr is the only variable that is guaranteed to be non blank
          # if this subroutine has been called once.
  	my %keyhash = ();
- Line 1576  sub submission {
+ Line 1887  sub submission {
  	    $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
  	}
  	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
+ 	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
- 	$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
+ 	$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
  			'<input type="hidden" name="command"    value="handgrade" />'."\n".
  			'<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
- 			'<input type="hidden" name="Status"     value="'.$env{'form.Status'}.'" />'."\n".
+ 			'<input type="hidden" name="Status"     value="'.$stu_status.'" />'."\n".
  			'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
  			'<input type="hidden" name="probTitle"  value="'.$env{'form.probTitle'}.'" />'."\n".
  			'<input type="hidden" name="refresh"    value="off" />'."\n".
  			'<input type="hidden" name="studentNo"  value="" />'."\n".
  			'<input type="hidden" name="gradeOpt"   value="" />'."\n".
- 			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
+ 			'<input type="hidden" name="symb"       value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
  			'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".
  			'<input type="hidden" name="vProb"      value="'.$env{'form.vProb'}.'" />'."\n".
  			'<input type="hidden" name="vAns"       value="'.$env{'form.vAns'}.'" />'."\n".
  			'<input type="hidden" name="lastSub"    value="'.$env{'form.lastSub'}.'" />'."\n".
- 			'<input type="hidden" name="section"    value="'.$env{'form.section'}.'">'."\n".
+ 			&build_section_inputs().
- 			'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'">'."\n".
+ 			'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
- 			'<input type="hidden" name="handgrade"  value="'.$env{'form.handgrade'}.'">'."\n".
+ 			'<input type="hidden" name="handgrade"  value="'.$env{'form.handgrade'}.'" />'."\n".
  			'<input type="hidden" name="NCT"'.
  			' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
  	if ($env{'form.handgrade'} eq 'yes') {
- Line 1628  sub submission {
+ Line 1938  sub submission {
  #
  	    $request->print(<<KEYWORDS);
  &nbsp;<b>Keyword Options:</b>&nbsp;
- <a href="javascript:keywords(document.SCORE)"; TARGET=_self>List</a>&nbsp; &nbsp;
+ <a href="javascript:keywords(document.SCORE);" target="_self">List</a>&nbsp; &nbsp;
  <a href="#" onMouseDown="javascript:getSel(); return false"
   CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
- <a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
+ <a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />
  KEYWORDS
  #
  # Load the other essays for similarity check
  #
-             my $essayurl=&Apache::lonnet::declutter($url);
+             my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
- 	    my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+ 	    my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
- 	    $apath=&Apache::lonnet::escape($apath);
+ 	    $apath=&escape($apath);
  	    $apath=~s/\W/\_/gs;
- 	    %oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
+ 	    %old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
          }
      }
+ # This is where output for one specific student would start
+     my $bgcolor='#DDEEDD';
+     if (int($counter/2) eq $counter) { $bgcolor='#DDDDEE'; }
+     $request->print("\n\n".
+                     '<p><table border="2"><tr><th bgcolor="'.$bgcolor.'">'.$env{'form.fullname'}.'</th></tr><tr><td bgcolor="'.$bgcolor.'">');
      if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
- 	$request->print('<br /><br /><br />') if ($counter > 0);
  	my $mode;
  	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
  	    $mode='both';
- Line 1654  KEYWORDS
+ Line 1969  KEYWORDS
  	} elsif ($env{'form.vAns'} eq 'all') {
  	    $mode='answer';
  	}
+ 	&Apache::lonxml::clear_problem_counter();
  	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
      }
      my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
-     my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
+     my ($partlist,$handgrade,$responseType) = &response_type($symb);
      # Display student info
      $request->print(($counter == 0 ? '' : '<br />'));
-     my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".
+     my $result='<table border="0" width="100%"><tr><td bgcolor="#777777">'."\n".
- 	'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";
+ 	'<table border="0" width="100%"><tr bgcolor="#edffff"><td>'."\n";
      $result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";
      $result.='<input type="hidden" name="name'.$counter.
- Line 1742  KEYWORDS
+ Line 2058  KEYWORDS
  	    $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
  	} else {
  	    my %seenparts;
- 	    for my $part (sort keys(%$handgrade)) {
+ 	    my @part_response_id = &flatten_responseType($responseType);
- 		my ($partid,$respid) = split(/_/,$part);
+ 	    foreach my $part (@part_response_id) {
- 		my $display_part=&get_display_part($partid,$url,$symb);
+ 		next if ($env{'form.lastSub'} eq 'hdgrade'
+ 			 && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
+ 		my ($partid,$respid) = @{ $part };
+ 		my $display_part=&get_display_part($partid,$symb);
  		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
  		    if (exists($seenparts{$partid})) { next; }
  		    $seenparts{$partid}=1;
- Line 1752  KEYWORDS
+ Line 2072  KEYWORDS
  			' <b>Collaborative submission by:</b> '.
  			'<a href="javascript:viewSubmitter(\''.
  			$env{"form.$uname:$udom:$partid:submitted_by"}.
- 			'\')"; TARGET=_self>'.
+ 			'\');" target="_self">'.
  			$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
  		    $request->print($submitby);
  		    next;
- Line 1760  KEYWORDS
+ Line 2080  KEYWORDS
  		my $responsetype = $responseType->{$partid}->{$respid};
  		if (!exists($record{"resource.$partid.$respid.submission"})) {
  		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
- 			$display_part.' <font color="#999999">( ID '.$respid.
+ 			$display_part.' <span class="LC_internal_info">( ID '.$respid.
- 			' )</font>&nbsp; &nbsp;'.
+ 			' )</span>&nbsp; &nbsp;'.
- 			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
+ 			'<span class="LC_warning">Nothing submitted - no attempts</span><br /><br />';
  		    next;
  		}
  		foreach (@$string) {
  		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
- 		    if ($part ne ($partid.'_'.$respid)) { next; }
+ 		    if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
  		    my ($ressub,$subval) = split(/:/,$_,2);
  		    # Similarity check
  		    my $similar='';
  		    if($env{'form.checkPlag'}){
  			my ($oname,$odom,$ocrsid,$oessay,$osim)=
- 			    &most_similar($uname,$udom,$subval);
+ 			    &most_similar($uname,$udom,$subval,\%old_essays);
  			if ($osim) {
  			    $osim=int($osim*100.0);
- 			    $similar="<hr /><h3><font color=\"#FF0000\">Essay".
+ 			    my %old_course_desc =
- 				" is $osim% similar to an essay by ".
+ 				&Apache::lonnet::coursedescription($ocrsid,
- 				&Apache::loncommon::plainname($oname,$odom).
+ 								   {'one_time' => 1});
- 				'</font></h3><blockquote><i>'.
+ 			    $similar="<hr /><h3><span class=\"LC_warning\">".
+ 				&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])',
+ 				    $osim,
+ 				    &Apache::loncommon::plainname($oname,$odom),
+ 				    $oname,$odom,
+ 				    $old_course_desc{'description'},
+ 				    $old_course_desc{'num'},
+ 				    $old_course_desc{'domain'}).
+ 				'</span></h3><blockquote><i>'.
  				&keywords_highlight($oessay).
  				'</i></blockquote><hr />';
  			}
- Line 1787  KEYWORDS
+ Line 2116  KEYWORDS
  		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
  		    if ($env{'form.lastSub'} eq 'lastonly' ||
  			($env{'form.lastSub'} eq 'hdgrade' &&
- 			 $$handgrade{$part} eq 'yes')) {
+ 			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
- 			my $display_part=&get_display_part($partid,$url,$symb);
+ 			my $display_part=&get_display_part($partid,$symb);
  			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
- 			    $display_part.' <font color="#999999">( ID '.$respid.
+ 			    $display_part.' <span class="LC_internal_info">( ID '.$respid.
- 			    ' )</font>&nbsp; &nbsp;';
+ 			    ' )</span>&nbsp; &nbsp;';
- 			my @files;
+ 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
- 			if ($record{"resource.$partid.$respid.portfiles"}) {
+ 			if (@$files) {
- 			    my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
+ 			    $lastsubonly.='<br /><span class="LC_warning">Like all files provided by users, this file may contain virusses</span><br />';
- 			    foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
+ 			    my $file_counter = 0;
- 				push(@files,$file_url.$file);
+ 			    foreach my $file (@$files) {
+ 			        $file_counter ++;
- 				&Apache::lonnet::logthis("found a portfolio file".$record{"resource.$partid.$respid.portfiles"});
- 				&Apache::lonnet::logthis("uploaded URL file".$record{"resource.$partid.$respid.uploadedurl"});
- 			    }
- 			}
- 			if ($record{"resource.$partid.$respid.uploadedurl"}) {
- 			    push(@files,$record{"resource.$partid.$respid.uploadedurl"});
- 			}
- 			if (@files) {
- 			    $lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
- 			    foreach my $file (@files) {
  				&Apache::lonnet::allowuploaded('/adm/grades',$file);
- 				$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
+ 				$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
  			    }
  			    $lastsubonly.='<br />';
  			}
- Line 1824  KEYWORDS
+ Line 2143  KEYWORDS
  	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
  	$request->print($lastsubonly);
      } elsif ($env{'form.lastSub'} eq 'datesub') {
- 	my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
+ 	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
  	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
      } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
  	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- Line 1840  KEYWORDS
+ Line 2159  KEYWORDS
      if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
  	my $toGrade.='<input type="button" value="Grade Student" '.
  	    'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
- 	    .$counter.'\');" TARGET=_self> &nbsp;'."\n" if (&canmodify($usec));
+ 	    .$counter.'\');" target="_self" /> &nbsp;'."\n" if (&canmodify($usec));
  	$toGrade.='</td></tr></table></td></tr></table>'."\n";
  	if (($env{'form.command'} eq 'submission') ||
  	    ($env{'form.command'} eq 'processGroup' && $counter == $total)) {
- 	    $toGrade.='</form>'.&show_grading_menu_form($symb,$url)
+ 	    $toGrade.='</form>'.&show_grading_menu_form($symb);
  	}
  	$request->print($toGrade);
  	return;
- Line 1864  KEYWORDS
+ Line 2183  KEYWORDS
  	$result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
  	    '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
  	$result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
- 	    ',\''.$msgfor.'\')"; TARGET=_self>'.
+ 	    ',\''.$msgfor.'\');" target="_self">'.
- 	    &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.
+ 	    &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
- 	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.
+ 	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
  	    '<img src="'.$request->dir_config('lonIconsURL').
  	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
  	    '<br />&nbsp;('.
- Line 1887  KEYWORDS
+ Line 2206  KEYWORDS
      my %seen = ();
      my @partlist;
      my @gradePartRespid;
-     for (sort keys(%$handgrade)) {
+     my @part_response_id = &flatten_responseType($responseType);
- 	my ($partid,$respid) = split(/_/);
+     foreach my $part_response_id (@part_response_id) {
+     	my ($partid,$respid) = @{ $part_response_id };
+ 	my $part_resp = join('_',@{ $part_response_id });
  	next if ($seen{$partid} > 0);
  	$seen{$partid}++;
- 	next if ($$handgrade{$_} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
+ 	next if ($$handgrade{$part_resp} ne 'yes'
+ 		 && $env{'form.lastSub'} eq 'hdgrade');
  	push @partlist,$partid;
  	push @gradePartRespid,$partid.'.'.$respid;
  	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
      }
      $result='<input type="hidden" name="partlist'.$counter.
- Line 1909  KEYWORDS
+ Line 2230  KEYWORDS
      }
      $request->print($result.'</td></tr></table></td></tr></table>'."\n");
+ # Done with printing info for one student
+     $request->print('</td></tr></table></p>');
      # print end of form
      if ($counter == $total) {
  	my $endform='<table border="0"><tr><td>'."\n";
  	$endform.='<input type="button" value="Save & Next" '.
  	    'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
- 	    $total.','.scalar(@partlist).');" TARGET=_self> &nbsp;'."\n";
+ 	    $total.','.scalar(@partlist).');" target="_self" /> &nbsp;'."\n";
  	my $ntstu ='<select name="NTSTU">'.
  	    '<option>1</option><option>2</option>'.
  	    '<option>3</option><option>5</option>'.
  	    '<option>7</option><option>10</option></select>'."\n";
  	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
- 	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
+ 	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
  	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
  	$endform.='<input type="button" value="Previous" '.
- 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;'."\n".
+ 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
  	    '<input type="button" value="Next" '.
- 	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;';
+ 	    'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
  	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
+         $endform.="<input type='hidden' value='".&get_increment().
+             "' name='increment' />";
  	$endform.='</td><tr></table></form>';
- 	$endform.=&show_grading_menu_form($symb,$url);
+ 	$endform.=&show_grading_menu_form($symb);
  	$request->print($endform);
      }
      return '';
- Line 1942  sub get_last_submission {
+ Line 2270  sub get_last_submission {
  	my %lasthash=();
  	my ($version);
  	for ($version=1;$version<=$$returnhash{'version'};$version++) {
- 	    foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {
+ 	    foreach my $key (sort(split(/\:/,
- 		$lasthash{$_}=$$returnhash{$version.':'.$_};
+ 					$$returnhash{$version.':keys'}))) {
- 		   $timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));
+ 		$lasthash{$key}=$$returnhash{$version.':'.$key};
+ 		$timestamp =
+ 		    scalar(localtime($$returnhash{$version.':timestamp'}));
  	    }
  	}
- 	foreach ((keys %lasthash)) {
+ 	foreach my $key (keys(%lasthash)) {
- 	    if ($_ =~ /\.submission$/) {
+ 	    next if ($key !~ /\.submission$/);
- 		my ($partid,$foo) = split(/submission$/,$_);
- 		my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+ 	    my ($partid,$foo) = split(/submission$/,$key);
- 		    '<font color="red">Draft Copy</font> ' : '';
+ 	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
- 		push @string, (join(':',$_,$draft.$lasthash{$_}));
+ 		'<span class="LC_warning">Draft Copy</span> ' : '';
- 	    }
+ 	    push(@string, join(':', $key, $draft.$lasthash{$key}));
  	}
      }
-     @string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;
+     if (!@string) {
-     return \@string,\$timestamp;
+ 	$string[0] =
+ 	    '<span class="LC_warning">Nothing submitted - no attempts.</span>';
+     }
+     return (\@string,\$timestamp);
  }
  #--- High light keywords, with style choosen by user.
- Line 1967  sub keywords_highlight {
+ Line 2300  sub keywords_highlight {
      my $styleon   = $env{'form.kwstyle'} eq ''  ? '' : $env{'form.kwstyle'};
      (my $styleoff = $styleon) =~ s/\</\<\//;
      my @keylist   = split(/[,\s+]/,$env{'form.keywords'});
-     foreach (@keylist) {
+     foreach my $keyword (@keylist) {
- 	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
+ 	$string =~ s/\b\Q$keyword\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$keyword$styleoff<\/font>/gi;
      }
      return $string;
  }
- Line 1976  sub keywords_highlight {
+ Line 2309  sub keywords_highlight {
  #--- Called from submission routine
  sub processHandGrade {
      my ($request) = shift;
-     my $url    = $env{'form.url'};
+     my $symb   = &get_symb($request);
-     my $symb   = $env{'form.symb'};
+     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
      my $button = $env{'form.gradeOpt'};
      my $ngrade = $env{'form.NCT'};
      my $ntstu  = $env{'form.NTSTU'};
- Line 1988  sub processHandGrade {
+ Line 2321  sub processHandGrade {
  	my $ctr = 0;
  	while ($ctr < $ngrade) {
  	    my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
- 	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+ 	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
  	    if ($errorflag eq 'no_score') {
  		$ctr++;
  		next;
  	    }
  	    if ($errorflag eq 'not_allowed') {
- 		$request->print("<font color=\"red\">Not allowed to modify grades for $uname:$udom</font>");
+ 		$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");
  		$ctr++;
  		next;
  	    }
  	    my $includemsg = $env{'form.includemsg'.$ctr};
  	    my ($subject,$message,$msgstatus) = ('','','');
+ 	    my $restitle = &Apache::lonnet::gettitle($symb);
+             my ($feedurl,$showsymb) =
+ 		&get_feedurl_and_symb($symb,$uname,$udom);
+ 	    my $messagetail;
  	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
  		$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
  		unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
+ 		$subject.=' ['.$restitle.']';
  		my (@msgnum) = split(/,/,$includemsg);
  		foreach (@msgnum) {
  		    $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
- Line 2010  sub processHandGrade {
+ Line 2348  sub processHandGrade {
  		$message =&Apache::lonfeedback::clear_out_html($message);
  		if ($env{'form.withgrades'.$ctr}) {
  		    $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
- 		    $message.=" for <a href=\"".
+ 		    $messagetail = " for <a href=\"".
- 		    &Apache::lonnet::clutter($url).
+ 		                   $feedurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
- 		    "?symb=$symb\">$env{'form.probTitle'}</a>";
+ 		}
- 		}
+ 		$msgstatus =
- 		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
+                     &Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
- 							       $subject.' ['.
+ 						     $message.$messagetail,
- 							       &Apache::lonnet::declutter($url).']',$message);
+                                                      undef,$feedurl,undef,
- 		$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
+                                                      undef,undef,$showsymb,
+                                                      $restitle);
+ 		$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
  				$msgstatus);
  	    }
  	    if ($env{'form.collaborator'.$ctr}) {
  		my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
  		foreach my $collabstr (@collabstrs) {
  		    my ($part,@collaborators) = split(/:/,$collabstr);
- 		    foreach (@collaborators) {
+ 		    foreach my $collaborator (@collaborators) {
  			my ($errorflag,$pts,$wgt) =
- 			    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
+ 			    &saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
  					   $env{'form.unamedom'.$ctr},$part);
  			if ($errorflag eq 'not_allowed') {
- 			    $request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+ 			    $request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
  			    next;
- 			} else {
+ 			} elsif ($message ne '') {
- 			    if ($message ne '') {
+ 			    my ($baseurl,$showsymb) =
- 				$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$env{'form.msgsub'},$message);
+ 				&get_feedurl_and_symb($symb,$collaborator,
+ 						      $udom);
+ 			    if ($env{'form.withgrades'.$ctr}) {
+ 				$messagetail = " for <a href=\"".
+                                     $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
  			    }
+ 			    $msgstatus =
+ 				&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
  			}
  		    }
  		}
- Line 2105  sub processHandGrade {
+ Line 2450  sub processHandGrade {
  # Go directly to grade student - from submission or link from chart page
      if ($button eq 'Grade Student') {
- 	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($url);
+ 	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
  	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
  	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
  	$env{'form.fullname'} = $$fullname{$processUser};
- Line 2143  sub processHandGrade {
+ Line 2488  sub processHandGrade {
      }
      $ctr = 0;
      @parsedlist = reverse @parsedlist if ($button eq 'Previous');
-     my ($partlist) = &response_type($url);
+     my ($partlist) = &response_type($symb);
      foreach my $student (@parsedlist) {
  	my $submitonly=$env{'form.submitonly'};
  	my ($uname,$udom) = split(/:/,$student);
- Line 2157  sub processHandGrade {
+ Line 2502  sub processHandGrade {
  	if ($submitonly =~ /^(yes|graded|incorrect)$/) {
  #	    my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
- 	    my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+ 	    my %status=&student_gradeStatus($symb,$udom,$uname,$partlist);
  	    my $submitted = 0;
  	    my $ungraded = 0;
  	    my $incorrect = 0;
- Line 2193  sub processHandGrade {
+ Line 2538  sub processHandGrade {
  	$ctr++;
      }
      if ($total < 0) {
- 	my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
+ 	my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n";
  	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
  	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
- 	$the_end.=&show_grading_menu_form($symb,$url);
+ 	$the_end.=&show_grading_menu_form($symb);
  	$request->print($the_end);
      }
      return '';
- Line 2204  sub processHandGrade {
+ Line 2549  sub processHandGrade {
  #---- Save the score and award for each student, if changed
  sub saveHandGrade {
-     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
+     my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
-     my @v_flag;
+     my @version_parts;
      my $usec = &Apache::lonnet::getsection($domain,$stuname,
  					   $env{'request.course.id'});
      if (!&canmodify($usec)) { return('not_allowed'); }
-     my %record     = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
+     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
      my @parts_graded;
      my %newrecord  = ();
      my ($pts,$wgt) = ('','');
      my %aggregate = ();
      my $aggregateflag = 0;
      my @parts = split(/:/,$env{'form.partlist'.$newflg});
      foreach my $new_part (@parts) {
- 	#collaborator may vary for different parts
+ 	#collaborator ($submi may vary for different parts
  	if ($submitter && $new_part ne $part) { next; }
  	my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
  	if ($dropMenu eq 'excused') {
- Line 2227  sub saveHandGrade {
+ Line 2571  sub saveHandGrade {
  		if (exists($record{'resource.'.$new_part.'.awarded'})) {
  		    $newrecord{'resource.'.$new_part.'.awarded'} = '';
  		}
- 	    $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
+ 	        $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
  	    }
  	} elsif ($dropMenu eq 'reset status'
  		 && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
- Line 2248  sub saveHandGrade {
+ Line 2592  sub saveHandGrade {
              my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
              if ($aggtries > 0) {
-                 &decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                 &decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
                  $aggregateflag = 1;
              }
  	} elsif ($dropMenu eq '') {
- Line 2263  sub saveHandGrade {
+ Line 2607  sub saveHandGrade {
  	    my $partial= $pts/$wgt;
  	    if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
  		#do not update score for part if not changed.
+                 &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
  		next;
  	    } else {
  	        push @parts_graded, $new_part;
- Line 2288  sub saveHandGrade {
+ Line 2633  sub saveHandGrade {
  		"$env{'user.name'}:$env{'user.domain'}";
  	}
  	# unless problem has been graded, set flag to version the submitted files
- 	unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/  || $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override') {
+ 	unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/  ||
- 	    push (@v_flag,$new_part);
+ 	        $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
+ 	        $dropMenu eq 'reset status')
+ 	   {
+ 	    push (@version_parts,$new_part);
  	}
      }
      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-     if (scalar(keys(%newrecord)) > 0) {
+     if (%newrecord) {
-         if (scalar(@v_flag)) {
+         if (@version_parts) {
-             &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
+             my @changed_keys = &version_portfiles(\%record, \@parts_graded,
+                                 $env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts);
+ 	    @newrecord{@changed_keys} = @record{@changed_keys};
+ 	    foreach my $new_part (@version_parts) {
+ 		&handback_files($request,$symb,$stuname,$domain,$newflg,
+ 				$new_part,\%newrecord);
+ 	    }
          }
  	&Apache::lonnet::cstore(\%newrecord,$symb,
  				$env{'request.course.id'},$domain,$stuname);
+ 	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
- 	my @ungraded_parts;
+ 				     $cdom,$cnum,$domain,$stuname);
- 	foreach my $part (@parts) {
- 	    if ( !defined($record{'resource.'.$part.'.awarded'})
- 		 && !defined($newrecord{'resource.'.$part.'.awarded'}) ) {
- 		push(@ungraded_parts, $part);
- 	    }
- 	}
- 	if ( !@ungraded_parts ) {
- 	    &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
- 						   $cnum,$domain,$stuname);
- 	}
      }
      if ($aggregateflag) {
          &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
- Line 2321  sub saveHandGrade {
+ Line 2665  sub saveHandGrade {
      return ('',$pts,$wgt);
  }
+ sub check_and_remove_from_queue {
+     my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
+     my @ungraded_parts;
+     foreach my $part (@{$parts}) {
+ 	if (    $record->{   'resource.'.$part.'.awarded'} eq ''
+ 	     && $record->{   'resource.'.$part.'.solved' } ne 'excused'
+ 	     && $newrecord->{'resource.'.$part.'.awarded'} eq ''
+ 	     && $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
+ 		) {
+ 	    push(@ungraded_parts, $part);
+ 	}
+     }
+     if ( !@ungraded_parts ) {
+ 	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
+ 					       $cnum,$domain,$stuname);
+     }
+ }
+ sub handback_files {
+     my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
+     my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
+     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 };
+ 	my $part_resp = join('_',@{ $part_response_id });
+             if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
+                 # if multiple files are uploaded names will be 'returndoc2','returndoc3'
+                 my $file_counter = 1;
+ 		my $file_msg;
+                 while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
+                     my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
+                     my ($directory,$answer_file) =
+                         ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/);
+                     my ($answer_name,$answer_ver,$answer_ext) =
+ 		        &file_name_version_ext($answer_file);
+ 		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
+ 		    my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
+ 		    my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+                     # fix file name
+                     my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
+                     my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
+             	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
+             	                                $save_file_name);
+                     if ($result !~ m|^/uploaded/|) {
+                         $request->print('<span class="LC_error">An error occurred ('.$result.
+                         ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
+                     } else {
+                         # mark the file as read only
+                         my @files = ($save_file_name);
+                         my @what = ($symb,$env{'request.course.id'},'handback');
+                         &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
+ 			if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
+ 			    $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
+ 			}
+                         $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
+ 			$file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />";
+                     }
+                     $request->print("<br />".$fname." will be the uploaded file name");
+                     $request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
+                     $file_counter++;
+                 }
+ 		my $subject = "File Handed Back by Instructor ";
+ 		my $message = "A file has been returned that was originally submitted in reponse to: <br />";
+ 		$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
+ 		$message .= ' The returned file(s) are named: '. $file_msg;
+ 		$message .= " and can be found in your portfolio space.";
+ 		my ($feedurl,$showsymb) =
+ 		    &get_feedurl_and_symb($symb,$domain,$stuname);
+                 my $restitle = &Apache::lonnet::gettitle($symb);
+ 		my $msgstatus =
+                    &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
+ 			 ' (File Returned) ['.$restitle.']',$message,undef,
+                          $feedurl,undef,undef,undef,$showsymb,$restitle);
+             }
+         }
+     return;
+ }
+ sub get_feedurl_and_symb {
+     my ($symb,$uname,$udom) = @_;
+     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
+     $url = &Apache::lonnet::clutter($url);
+     my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
+ 					$symb,$udom,$uname);
+     if ($encrypturl =~ /^yes$/i) {
+ 	&Apache::lonenc::encrypted(\$url,1);
+ 	&Apache::lonenc::encrypted(\$symb,1);
+     }
+     return ($url,$symb);
+ }
+ sub get_submitted_files {
+     my ($udom,$uname,$partid,$respid,$record) = @_;
+     my @files;
+     if ($$record{"resource.$partid.$respid.portfiles"}) {
+         my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
+         foreach my $file (split(',',$$record{"resource.$partid.$respid.portfiles"})) {
+     	    push(@files,$file_url.$file);
+         }
+     }
+     if ($$record{"resource.$partid.$respid.uploadedurl"}) {
+         push(@files,$$record{"resource.$partid.$respid.uploadedurl"});
+     }
+     return (\@files);
+ }
  # ----------- Provides number of tries since last reset.
  sub get_num_tries {
      my ($record,$last_reset,$part) = @_;
- Line 2382  sub get_last_resets {
+ Line 2835  sub get_last_resets {
  # ----------- Handles creating versions for portfolio files as answers
  sub version_portfiles {
-     my ($record, $parts_graded, $courseid, $symb, $domain, $stuname, $v_flag) = @_;
+     my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
      my $version_parts = join('|',@$v_flag);
+     my @returned_keys;
      my $parts = join('|', @$parts_graded);
-     my $portfolio_root = &Apache::loncommon::propath($domain,
+     my $portfolio_root = &propath($domain,$stu_name).
- 						 $stuname).
+ 	'/userfiles/portfolio';
- 						'/userfiles/portfolio';
      foreach my $key (keys(%$record)) {
          my $new_portfiles;
          if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
-             my @v_portfiles;
+             my @versioned_portfiles;
-             my @portfiles = split(/,/,$$record{$key});
+             my @portfiles = split(/\s*,\s*/,$$record{$key});
-             &Apache::lonnet::logthis("should be unmarking and remarking $key",@portfiles);
              foreach my $file (@portfiles) {
-                 &Apache::lonnet::unmark_as_readonly($domain,$stuname,[$symb,$env{'request.course.id'}],$file);
+                 &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
                  my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
-                 my $version = 0;
  		my ($answer_name,$answer_ver,$answer_ext) =
  		    &file_name_version_ext($answer_file);
-                 my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);
+                 my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
-                 foreach my $row (@dir_list) {
+                 my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
-                     my ($file) = split(/\&/,$row,2);
+                 my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
- 		    my ($file_name,$file_version,$file_ext) =
+                 if ($new_answer ne 'problem getting file') {
- 			&file_name_version_ext($file);
+                     push(@versioned_portfiles, $directory.$new_answer);
-                     if (($file_name eq $answer_name) &&
+                     &Apache::lonnet::mark_as_readonly($domain,$stu_name,
- 			($file_ext eq $answer_ext)) {
+                         [$directory.$new_answer],
-                         # gets here if filename and extension match, regardless of version
+                         [$symb,$env{'request.course.id'},'graded']);
-                         if ($file_version ne '') {
-                             # a versioned file is found  so save it for later
-                             if ($file_version > $version) {
- 				$version = $file_version;
- 			    }
-                         }
-                     }
-                 }
-                 $version++;
-                 $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stuname/portfolio$directory$answer_file");
-                 if($env{'form.copy'} eq '-1') {
-                     &Apache::lonnet::logthis('problem getting file '.$directory.$answer_file);
-                 } else {
- 		    my $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
- 		    my $copy_result = &Apache::lonnet::finishuserfileupload(
-                                         $stuname,$domain,'copy',
- 				        '/portfolio'.$directory.$new_answer);
-                     push(@v_portfiles, $directory.$new_answer);
-                     &Apache::lonnet::mark_as_readonly($domain,$stuname,
-                                 ['/portfolio'.$directory.$new_answer],
-                                 [$symb,$env{'request.course.id'},'graded']);
                  }
              }
-             $$record{$key} = join(',',@v_portfiles);
+             $$record{$key} = join(',',@versioned_portfiles);
+             push(@returned_keys,$key);
          }
      }
-     return 'ok';
+     return (@returned_keys);
+ }
+ sub get_next_version {
+     my ($answer_name, $answer_ext, $dir_list) = @_;
+     my $version;
+     foreach my $row (@$dir_list) {
+         my ($file) = split(/\&/,$row,2);
+         my ($file_name,$file_version,$file_ext) =
+ 	    &file_name_version_ext($file);
+         if (($file_name eq $answer_name) &&
+ 	    ($file_ext eq $answer_ext)) {
+                 # gets here if filename and extension match, regardless of version
+                 if ($file_version ne '') {
+                 # a versioned file is found  so save it for later
+                 if ($file_version > $version) {
+ 		    $version = $file_version;
+ 	        }
+             }
+         }
+     }
+     $version ++;
+     return($version);
+ }
+ sub version_selected_portfile {
+     my ($domain,$stu_name,$directory,$file_name,$version) = @_;
+     my ($answer_name,$answer_ver,$answer_ext) =
+         &file_name_version_ext($file_name);
+     my $new_answer;
+     $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
+     if($env{'form.copy'} eq '-1') {
+         $new_answer = 'problem getting file';
+     } else {
+         $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
+         my $copy_result = &Apache::lonnet::finishuserfileupload(
+                             $stu_name,$domain,'copy',
+ 		        '/portfolio'.$directory.$new_answer);
+     }
+     return ($new_answer);
  }
  sub file_name_version_ext {
- Line 2634  sub viewgrades {
+ Line 3102  sub viewgrades {
      my ($request) = shift;
      &viewgrades_js($request);
-     my ($symb,$url) = ($env{'form.symb'},$env{'form.url'});
+     my ($symb) = &get_symb($request);
      #need to make sure we have the correct data for later EXT calls,
      #thus invalidate the cache
      &Apache::lonnet::devalidatecourseresdata(
- Line 2642  sub viewgrades {
+ Line 3110  sub viewgrades {
                   $env{'course.'.$env{'request.course.id'}.'.domain'});
      &Apache::lonnet::clear_EXT_cache_status();
-     my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
+     my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
-     $result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";
+     $result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n";
      #view individual student submission form - called using Javascript viewOneStudent
-     $result.=&jscriptNform($url,$symb);
+     $result.=&jscriptNform($symb);
      #beginning of class grading form
+     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
      $result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
- 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
  	'<input type="hidden" name="command" value="editgrades" />'."\n".
- 	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
+ 	&build_section_inputs().
  	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
- 	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
+ 	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
  	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
      my $sectionClass;
+     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
      if ($env{'form.section'} eq 'all') {
  	$sectionClass='Class </h3>';
      } elsif ($env{'form.section'} eq 'none') {
- 	$sectionClass='Students in no Section </h3>';
+ 	$sectionClass=&mt('Students in no Section').'</h3>';
      } else {
- 	$sectionClass='Students in Section '.$env{'form.section'}.'</h3>';
+ 	$sectionClass=&mt('Students in Section(s) [_1]',$section_display).'</h3>';
      }
-     $result.='<h3>Assign Common Grade To '.$sectionClass;
+     $result.='<h3>'.&mt('Assign Common Grade To [_1]',$sectionClass);
      $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
  	'<table border=0><tr bgcolor="#ffffdd"><td>';
      #radio buttons/text box for assigning points for a section or class.
      #handles different parts of a problem
-     my ($partlist,$handgrade) = &response_type($url,$symb);
+     my ($partlist,$handgrade,$responseType) = &response_type($symb);
      my %weight = ();
      my $ctsparts = 0;
      $result.='<table border="0">';
      my %seen = ();
-     for (sort keys(%$handgrade)) {
+     my @part_response_id = &flatten_responseType($responseType);
- 	my ($partid,$respid) = split (/_/,$_,2);
+     foreach my $part_response_id (@part_response_id) {
+     	my ($partid,$respid) = @{ $part_response_id };
+ 	my $part_resp = join('_',@{ $part_response_id });
  	next if $seen{$partid};
  	$seen{$partid}++;
- 	my $handgrade=$$handgrade{$_};
+ 	my $handgrade=$$handgrade{$part_resp};
  	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
  	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
- Line 2688  sub viewgrades {
+ Line 3159  sub viewgrades {
  	    $ctsparts.'" value="'.$partid.'" />'."\n";
  	$result.='<input type="hidden" name="weight_'.
  	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
- 	my $display_part=&get_display_part($partid,$url,$symb);
+ 	my $display_part=&get_display_part($partid,$symb);
  	$result.='<tr><td><b>Part:</b> '.$display_part.'&nbsp; &nbsp;<b>Point:</b> </td><td>';
  	$result.='<table border="0"><tr>';
  	my $ctr = 0;
- Line 2707  sub viewgrades {
+ Line 3178  sub viewgrades {
  	$result.= '</td><td><select name="SELVAL_'.$partid.'"'.
  	    'onChange="javascript:writeRadText(\''.$partid.'\','.
  		$weight{$partid}.')"> '.
- 	    '<option selected="on"> </option>'.
+ 	    '<option selected="selected"> </option>'.
  	    '<option>excused</option>'.
  	    '<option>reset status</option></select></td>'.
              '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
- Line 2715  sub viewgrades {
+ Line 3186  sub viewgrades {
      }
      $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
  	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
-     $result.='<input type="button" value="Reset" '.
+     $result.='<input type="button" value="Revert to Default" '.
- 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
+ 	'onClick="javascript:resetEntry('.$ctsparts.');" target="_self" />';
      #table listing all the students in a section/class
      #header of table
- Line 2724  sub viewgrades {
+ Line 3195  sub viewgrades {
      $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
  	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
  	'<td>'.&nameUserString('header')."</td>\n";
-     my (@parts) = sort(&getpartlist($url,$symb));
+     my (@parts) = sort(&getpartlist($symb));
+     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
      my @partids = ();
      foreach my $part (@parts) {
  	my $display=&Apache::lonnet::metadata($url,$part.'.display');
- Line 2732  sub viewgrades {
+ Line 3204  sub viewgrades {
  	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
  	my ($partid) = &split_part_type($part);
          push(@partids, $partid);
- 	my $display_part=&get_display_part($partid,$url,$symb);
+ 	my $display_part=&get_display_part($partid,$symb);
  	if ($display =~ /^Partial Credit Factor/) {
  	    $result.='<td><b>Score Part:</b> '.$display_part.
  		' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
- Line 2760  sub viewgrades {
+ Line 3232  sub viewgrades {
  		 return $a cmp $b;
  	     } (keys(%$fullname))) {
  	$ctr++;
- 	$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},
+ 	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
  				   $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
      }
      $result.='</table></td></tr></table>';
      $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
      $result.='<input type="button" value="Save" '.
- 	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
+ 	'onClick="javascript:submit();" target="_self" /></form>'."\n";
      if (scalar(%$fullname) eq 0) {
  	my $colspan=3+scalar(@parts);
- 	$result='<font color="red">There are no students in section "'.$env{'form.section'}.
+ 	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
- 	    '" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
+         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
+ 	$result='<span class="LC_warning">'.
+ 	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
+ 	        $section_display, $stu_status).
+ 	    '</span>';
      }
-     $result.=&show_grading_menu_form($symb,$url);
+     $result.=&show_grading_menu_form($symb);
      return $result;
  }
  #--- call by previous routine to display each student
  sub viewstudentgrade {
-     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
+     my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
      my ($uname,$udom) = split(/:/,$student);
      my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
      my %aggregates = ();
- Line 2786  sub viewstudentgrade {
+ Line 3262  sub viewstudentgrade {
  	'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
  	"\n".$ctr.'&nbsp;</td><td>&nbsp;'.
  	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
- 	'\')"; TARGET=_self>'.$fullname.'</a> '.
+ 	'\');" target="_self">'.$fullname.'</a> '.
- 	'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+ 	'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
      $student=~s/:/_/; # colon doen't work in javascript for names
      foreach my $apart (@$parts) {
  	my ($part,$type) = &split_part_type($apart);
- Line 2809  sub viewstudentgrade {
+ Line 3285  sub viewstudentgrade {
              $aggregates{$part} = 1;
          }
  	if ($type eq 'awarded') {
- 	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
+ 	    my $pts = $score eq '' ? '' : &compute_points($score,$$weight{$part});
  	    $result.='<input type="hidden" name="'.
  		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
  	    $result.='<input type="text" name="'.
- Line 2824  sub viewstudentgrade {
+ Line 3300  sub viewstudentgrade {
  	    $result.='&nbsp;<select name="'.
  		'GD_'.$student.'_'.$part.'_solved" '.
  		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
- 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>'
+ 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>'
- 		: '<option selected="on"> </option><option>excused</option>')."\n";
+ 		: '<option selected="selected"> </option><option>excused</option>')."\n";
  	    $result.='<option>reset status</option>';
  	    $result.="</select>&nbsp;</td>\n";
  	} else {
- Line 2846  sub viewstudentgrade {
+ Line 3322  sub viewstudentgrade {
  sub editgrades {
      my ($request) = @_;
-     my $symb=$env{'form.symb'};
+     my $symb=&get_symb($request);
-     my $url =$env{'form.url'};
+     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
-     my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
+     my $title='<h3><span class="LC_info">'.&mt('Current Grade Status').'</span></h3>';
-     $title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";
+     $title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4><br />'."\n";
-     $title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";
+     $title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";
      my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
      $result.= '<table border="0"><tr bgcolor="#deffff">'.
- Line 2871  sub editgrades {
+ Line 3347  sub editgrades {
      my %columns = ();
      my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
-     my (@parts) = sort(&getpartlist($url,$symb));
+     my (@parts) = sort(&getpartlist($symb));
      my $header;
      while ($ctr < $env{'form.totalparts'}) {
  	my $partid = $env{'form.partid_'.$ctr};
- Line 2879  sub editgrades {
+ Line 3355  sub editgrades {
  	$weight{$partid} = $env{'form.weight_'.$partid};
  	$ctr++;
      }
+     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
      foreach my $partid (@partid) {
  	$header .= '<td align="center">&nbsp;<b>Old Score</b>&nbsp;</td>'.
  	    '<td align="center">&nbsp;<b>New Score</b>&nbsp;</td>';
- Line 2896  sub editgrades {
+ Line 3373  sub editgrades {
  	}
      }
      foreach my $partid (@partid) {
- 	my $display_part=&get_display_part($partid,$url,$symb);
+ 	my $display_part=&get_display_part($partid,$symb);
  	$result .= '<td colspan="'.$columns{$partid}.
  	    '" align="center"><b>Part:</b> '.$display_part.
  	    ' (Weight = '.$weight{$partid}.')</td>';
- Line 2917  sub editgrades {
+ Line 3394  sub editgrades {
  	my $usec=$classlist->{"$uname:$udom"}[5];
  	if (!&canmodify($usec)) {
  	    my $numcols=scalar(@partid)*4+2;
- 	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
+ 	    $noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>";
  	    next;
  	}
          my %aggregate = ();
- Line 3036  sub editgrades {
+ Line 3513  sub editgrades {
  	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
      }
      $result .= '</table></td></tr></table>'."\n".
- 	&show_grading_menu_form ($symb,$url);
+ 	&show_grading_menu_form ($symb);
      my $msg = '<br /><b>Number of records updated = '.$rec_update.
  	' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
  	'<b>Total number of students = '.$env{'form.total'}.'</b><br />';
- Line 3047  sub split_part_type {
+ Line 3524  sub split_part_type {
      my ($partstr) = @_;
      my ($temp,@allparts)=split(/_/,$partstr);
      my $type=pop(@allparts);
-     my $part=join('.',@allparts);
+     my $part=join('_',@allparts);
      return ($part,$type);
  }
- Line 3139  ENDPICK
+ Line 3616  ENDPICK
  }
  sub csvuploadmap_header {
-     my ($request,$symb,$url,$datatoken,$distotal)= @_;
+     my ($request,$symb,$datatoken,$distotal)= @_;
      my $javascript;
      if ($env{'form.upfile_associate'} eq 'reverse') {
  	$javascript=&csvupload_javascript_reverse_associate();
- Line 3147  sub csvuploadmap_header {
+ Line 3624  sub csvuploadmap_header {
  	$javascript=&csvupload_javascript_forward_associate();
      }
-     my ($result) = &showResourceInfo($url,$env{'form.probTitle'});
+     my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
      my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
      my $ignore=&mt('Ignore First Line');
+     $symb = &Apache::lonenc::check_encrypt($symb);
      $request->print(<<ENDPICK);
  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
- <h3><font color="#339933">Uploading Class Grades</font></h3>
+ <h3><span class="LC_info">Uploading Class Grades</span></h3>
  $result
- <hr>
+ <hr />
  <h3>Identify fields</h3>
  Total number of records found in file: $distotal <hr />
  Enter as many fields as you can. The system will inform you and bring you back
- Line 3169  to this page if the data selected is ins
+ Line 3647  to this page if the data selected is ins
  <input type="hidden" name="upfile_associate"
                                         value="$env{'form.upfile_associate'}" />
  <input type="hidden" name="symb"       value="$symb" />
- <input type="hidden" name="url"        value="$url" />
  <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
  <input type="hidden" name="probTitle"  value="$env{'form.probTitle'}" />
  <input type="hidden" name="command"    value="csvuploadoptions" />
- Line 3183  ENDPICK
+ Line 3660  ENDPICK
  }
  sub csvupload_fields {
-     my ($url,$symb) = @_;
+     my ($symb) = @_;
-     my (@parts) = &getpartlist($url,$symb);
+     my (@parts) = &getpartlist($symb);
      my @fields=(['ID','Student ID'],
  		['username','Student Username'],
  		['domain','Student Domain']);
+     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
      foreach my $part (sort(@parts)) {
  	my @datum;
  	my $display=&Apache::lonnet::metadata($url,$part.'.display');
- Line 3230  CSVFORMJS
+ Line 3708  CSVFORMJS
  sub upcsvScores_form {
      my ($request) = shift;
-     my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb)=&get_symb($request);
      if (!$symb) {return '';}
      my $result=&checkforfile_js();
      $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
-     my ($table) = &showResourceInfo($url,$env{'form.probTitle'});
+     my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
      $result.=$table;
-     $result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";
+     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
-     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-     $result.='&nbsp;<b>Specify a file containing the class scores for current resource'.
+     $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource').
  	'.</b></td></tr>'."\n";
      $result.='<tr bgcolor=#ffffe6><td>'."\n";
+     my $upload=&mt("Upload Scores");
      my $upfile_select=&Apache::loncommon::upfile_select_html();
      my $ignore=&mt('Ignore First Line');
+     $symb = &Apache::lonenc::check_encrypt($symb);
      $result.=<<ENDUPFORM;
  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
  <input type="hidden" name="symb" value="$symb" />
- <input type="hidden" name="url" value="$url" />
  <input type="hidden" name="command" value="csvuploadmap" />
  <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
  <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
  $upfile_select
- <br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
+ <br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
  <label><input type="checkbox" name="noFirstLine" />$ignore</label>
  </form>
  ENDUPFORM
-     $result.='</td></tr></table>'."\n";
+     $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+                            &mt("How do I create a CSV file from a spreadsheet"))
+     .'</td></tr></table>'."\n";
      $result.='</td></tr></table><br /><br />'."\n";
-     $result.=&show_grading_menu_form($symb,$url);
+     $result.=&show_grading_menu_form($symb);
      return $result;
  }
  sub csvuploadmap {
      my ($request)= @_;
-     my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb)=&get_symb($request);
      if (!$symb) {return '';}
      my $datatoken;
- Line 3276  sub csvuploadmap {
+ Line 3757  sub csvuploadmap {
      }
      my @records=&Apache::loncommon::upfile_record_sep();
      if ($env{'form.noFirstLine'}) { shift(@records); }
-     &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
+     &csvuploadmap_header($request,$symb,$datatoken,$#records+1);
      my ($i,$keyfields);
      if (@records) {
- 	my @fields=&csvupload_fields($url,$symb);
+ 	my @fields=&csvupload_fields($symb);
  	if ($env{'form.upfile_associate'} eq 'reverse') {
  	    &Apache::loncommon::csv_print_samples($request,\@records);
- Line 3291  sub csvuploadmap {
+ Line 3772  sub csvuploadmap {
  	    unshift(@fields,['none','']);
  	    $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
  							    \@fields);
- 	    foreach my $rec (@records) {
+             foreach my $rec (@records) {
- 		my %temp = &Apache::loncommon::record_sep($rec);
+                 my %temp = &Apache::loncommon::record_sep($rec);
- 		if (%temp) {
+                 if (%temp) {
- 		    $keyfields=join(',',sort(keys(%temp)));
+                     $keyfields=join(',',sort(keys(%temp)));
- 		    last;
+                     last;
- 		}
+                 }
- 	    }
+             }
  	}
      }
      &csvuploadmap_footer($request,$i,$keyfields);
-     $request->print(&show_grading_menu_form($symb,$url));
+     $request->print(&show_grading_menu_form($symb));
      return '';
  }
  sub csvuploadoptions {
      my ($request)= @_;
-     my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb)=&get_symb($request);
      my $checked=(($env{'form.noFirstLine'})?'1':'0');
      my $ignore=&mt('Ignore First Line');
      $request->print(<<ENDPICK);
  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
- <h3><font color="#339933">Uploading Class Grade Options</font></h3>
+ <h3><span class="LC_info">Uploading Class Grade Options</span></h3>
  <input type="hidden" name="command"    value="csvuploadassign" />
  <!--
  <p>
- Line 3346  ENDPICK
+ Line 3827  ENDPICK
      # FIXME do a check for any invalid user ids?...
      $request->print('<input type="submit" value="Assign Grades" /><br />
  <hr /></form>'."\n");
-     $request->print(&show_grading_menu_form($symb,$url));
+     $request->print(&show_grading_menu_form($symb));
      return '';
  }
- Line 3369  sub get_fields {
+ Line 3850  sub get_fields {
  sub csvuploadassign {
      my ($request)= @_;
-     my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb)=&get_symb($request);
      if (!$symb) {return '';}
+     my $error_msg = '';
      &Apache::loncommon::load_tmp_file($request);
      my @gradedata = &Apache::loncommon::upfile_record_sep();
      if ($env{'form.noFirstLine'}) { shift(@gradedata); }
- Line 3423  sub csvuploadassign {
+ Line 3905  sub csvuploadassign {
  		my $part=$1;
  		my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
  					      $symb,$domain,$username);
- 		$entries{$fields{$dest}}=~s/\s//g;
+                 if ($wgt) {
- 		my $pcr=$entries{$fields{$dest}} / $wgt;
+                     $entries{$fields{$dest}}=~s/\s//g;
- 		my $award='correct_by_override';
+                     my $pcr=$entries{$fields{$dest}} / $wgt;
- 		$grades{"resource.$part.awarded"}=$pcr;
+                     my $award='correct_by_override';
- 		$grades{"resource.$part.solved"}=$award;
+                     $grades{"resource.$part.awarded"}=$pcr;
- 		$points{$part}=1;
+                     $grades{"resource.$part.solved"}=$award;
+                     $points{$part}=1;
+                 } else {
+                     $error_msg = "<br />" .
+                         &mt("Some point values were assigned"
+                             ." for problems with a weight "
+                             ."of zero. These values were "
+                             ."ignored.");
+                 }
  	    } else {
  		if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
  		if ($dest=~/stores_(.*)_solved/)  { if ($points{$1}) {next;} }
- Line 3438  sub csvuploadassign {
+ Line 3928  sub csvuploadassign {
  		$grades{$store_key}=$entries{$fields{$dest}};
  	    }
  	}
- 	if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
+ 	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
  	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
- #	&Apache::lonnet::logthis(" storing ".(join('-',%grades)));
  	my $result=&Apache::lonnet::cstore(\%grades,$symb,
  					   $env{'request.course.id'},
  					   $domain,$username);
- Line 3448  sub csvuploadassign {
+ Line 3937  sub csvuploadassign {
  	    $request->print('.');
  	} else {
  	    $request->print("<p>
-                               <font color='red'>
+                               <span class=\"LC_error\">
-                                  Failed to store student $username\@$domain.
+                                  Failed to save student $username:$domain.
-                                  Message when trying to store was ($result)
+                                  Message when trying to save was ($result)
-                               </font>
+                               </span>
                               </p>" );
  	}
  	$request->rflush();
  	$countdone++;
      }
-     $request->print("<br />Stored $countdone students\n");
+     $request->print("<br />Saved $countdone students\n");
      if (@skipped) {
- 	$request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');
+ 	$request->print('<p><h4><b>Skipped Students</b></h4></p>');
  	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
      }
      if (@notallowed) {
- 	$request->print('<p><font size="+1" color="red"><b>Students Not Allowed to Modify</b></font></p>');
+ 	$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>');
  	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
      }
      $request->print("<br />\n");
-     $request->print(&show_grading_menu_form($symb,$url));
+     $request->print(&show_grading_menu_form($symb));
-     return '';
+     return $error_msg;
  }
  #------------- end of section for handling csv file upload ---------
  #
- Line 3497  function checkPickOne(formname) {
+ Line 3986  function checkPickOne(formname) {
  </script>
  LISTJAVASCRIPT
      &commonJSfunctions($request);
-     my ($symb,$url) = &get_symb_and_url($request);
+     my ($symb) = &get_symb($request);
      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
-     my $result='<h3><font color="#339933">&nbsp;'.
+     my $result='<h3><span class="LC_info">&nbsp;'.
- 	'Manual Grading by Page or Sequence</font></h3>';
+ 	'Manual Grading by Page or Sequence</span></h3>';
      $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
      $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
-     my ($titles,$symbx) = &getSymbMap($request);
+     my ($titles,$symbx) = &getSymbMap();
      my ($curpage) =&Apache::lonnet::decode_symb($symb);
  #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
  #    my $type=($curpage =~ /\.(page|sequence)/);
- Line 3515  LISTJAVASCRIPT
+ Line 4004  LISTJAVASCRIPT
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
  	$result.='<option value="'.$ctr.'" '.
- 	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+ 	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
  	    '>'.$showtitle.'</option>'."\n";
  	$ctr++;
      }
-     $result.= '</select>'."<br>\n";
+     $result.= '</select>'."<br />\n";
      $ctr=0;
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- Line 3530  LISTJAVASCRIPT
+ Line 4019  LISTJAVASCRIPT
      $result.='<input type="hidden" name="page" />'."\n".
  	'<input type="hidden" name="title" />'."\n";
-     $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+     $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
  	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
      $result.='&nbsp;<b>Submission Details: </b>'.
  	'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
- 	'<label><input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions</label>'."\n".
+ 	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n".
  	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";
-     $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
+     $result.=&build_section_inputs();
- 	'<input type="hidden" name="Status"  value="'.$env{'form.Status'}.'" />'."\n".
+     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
+     $result.='<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
  	'<input type="hidden" name="command" value="displayPage" />'."\n".
- 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
  	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
+     $result.='&nbsp;<b>'.&mt('Use CODE:').' </b>'.
+ 	'<input type="text" name="CODE" value="" /><br />'."\n";
      $result.='&nbsp;<input type="button" '.
  	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
      $request->print($result);
-     my $studentTable.='&nbsp;<b>Select a student you wish to grade and then click on the Next button.</b><br>'.
+     my $studentTable.='&nbsp;<b>Select a student you wish to grade and then click on the Next button.</b><br />'.
  	'<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">'.
  	'<td align="right">&nbsp;<b>No.</b></td>'.
- Line 3575  LISTJAVASCRIPT
+ Line 4067  LISTJAVASCRIPT
  	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
  	$ptr++;
      }
-     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%2 == 0);
+     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td></tr>' if ($ptr%2 == 0);
-     $studentTable.='</td></tr></table></td></tr></table>'."\n";
+     $studentTable.='</table></td></tr></table>'."\n";
      $studentTable.='<input type="button" '.
  	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
-     $studentTable.=&show_grading_menu_form($symb,$url);
+     $studentTable.=&show_grading_menu_form($symb);
      $request->print($studentTable);
      return '';
  }
  sub getSymbMap {
-     my ($request) = @_;
      my $navmap = Apache::lonnavmaps::navmap->new();
      my %symbx = ();
- Line 3599  sub getSymbMap {
+ Line 4090  sub getSymbMap {
 ,0,1);
      for my $sequence ($navmap->getById('0.0'), @sequences) {
  	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
- 	    my $title = $minder.'.'.$sequence->compTitle();
+ 	    my $title = $minder.'.'.
- 	    push @titles, $title; # minder in case two titles are identical
+ 		&HTML::Entities::encode($sequence->compTitle(),'"\'&');
- 	    $symbx{$title} = $sequence->symb();
+ 	    push(@titles, $title); # minder in case two titles are identical
+ 	    $symbx{$title} = &HTML::Entities::encode($sequence->symb(),'"\'&');
  	    $minder++;
  	}
      }
- Line 3613  sub getSymbMap {
+ Line 4105  sub getSymbMap {
  sub displayPage {
      my ($request) = shift;
-     my ($symb,$url) = &get_symb_and_url($request);
+     my ($symb) = &get_symb($request);
      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
- Line 3630  sub displayPage {
+ Line 4122  sub displayPage {
      &Apache::lonnet::clear_EXT_cache_status();
      if (!&canview($usec)) {
- 	$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
+ 	$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');
- 	$request->print(&show_grading_menu_form($symb,$url));
+ 	$request->print(&show_grading_menu_form($symb));
  	return;
      }
-     my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
+     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
      $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
  	'</h3>'."\n";
+     if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+ 	$result.='<h3>&nbsp;CODE: '.$env{'form.CODE'}.'</h3>'."\n";
+     } else {
+ 	delete($env{'form.CODE'});
+     }
      &sub_page_js($request);
      $request->print($result);
- Line 3644  sub displayPage {
+ Line 4141  sub displayPage {
      my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
      my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
      if (!$map) {
- 	$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');
+ 	$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');
- 	$request->print(&show_grading_menu_form($symb,$url));
+ 	$request->print(&show_grading_menu_form($symb));
  	return;
      }
      my $iterator = $navmap->getIterator($map->map_start(),
- Line 3657  sub displayPage {
+ Line 4154  sub displayPage {
  	'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".
  	'<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".
  	'<input type="hidden" name="title"   value="'.$env{'form.title'}.'" />'."\n".
- 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
  	'<input type="hidden" name="overRideScore" value="no" />'."\n".
  	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
-     my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+     if (defined($env{'form.CODE'})) {
+ 	$studentTable.=
+ 	    '<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
+     }
+     my $checkIcon = '<img alt="'.&mt('Check Mark').
+ 	'" src="'.$request->dir_config('lonIconsURL').
  	'/check.gif" height="16" border="0" />';
      $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
- Line 3672  sub displayPage {
+ Line 4173  sub displayPage {
  	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
  	'<td><b>&nbsp;'.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+     &Apache::lonxml::clear_problem_counter();
      my ($depth,$question,$prob) = (1,1,1);
      $iterator->next(); # skip the first BEGIN_MAP
      my $curRes = $iterator->next(); # for "current resource"
- Line 3679  sub displayPage {
+ Line 4181  sub displayPage {
          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
          if($curRes == $iterator->END_MAP) { $depth--; }
-         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+         if (ref($curRes) && $curRes->is_problem()) {
  	    my $parts = $curRes->parts();
              my $title = $curRes->compTitle();
  	    my $symbx = $curRes->symb();
  	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
- 		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+ 		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
  	    $studentTable.='<td valign="top">';
+ 	    my %form = ('CODE' => $env{'form.CODE'},);
  	    if ($env{'form.vProb'} eq 'yes' ) {
  		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
- 					     undef,'both');
+ 					     undef,'both',\%form);
  	    } else {
- 		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'});
+ 		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
  		$companswer =~ s|<form(.*?)>||g;
  		$companswer =~ s|</form>||g;
  #		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
  #		    $companswer =~ s/$1/ /ms;
- #		    $request->print('match='.$1."<br>\n");
+ #		    $request->print('match='.$1."<br />\n");
  #		}
  #		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
- 		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br>&nbsp;<b>Correct answer:</b><br>'.$companswer;
+ 		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>Correct answer:</b><br />'.$companswer;
  	    }
  	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
  	    if ($env{'form.lastSub'} eq 'datesub') {
  		if ($record{'version'} eq '') {
- 		    $studentTable.='<br />&nbsp;<font color="red">No recorded submission for this problem</font><br />';
+ 		    $studentTable.='<br />&nbsp;<span class="LC_warning">No recorded submission for this problem</span><br />';
  		} else {
  		    my %responseType = ();
  		    foreach my $partid (@{$parts}) {
- Line 3741  sub displayPage {
+ Line 4244  sub displayPage {
          $curRes = $iterator->next();
      }
-     $studentTable.='</td></tr></table></td></tr></table>'."\n".
+     $studentTable.='</table></td></tr></table>'."\n".
  	'<input type="button" value="Save" '.
- 	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
+ 	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
  	'</form>'."\n";
-     $studentTable.=&show_grading_menu_form($symb,$url);
+     $studentTable.=&show_grading_menu_form($symb);
      $request->print($studentTable);
      return '';
- Line 3754  sub displayPage {
+ Line 4257  sub displayPage {
  sub displaySubByDates {
      my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
      my $isCODE=0;
+     my $isTask = ($symb =~/\.task$/);
      if (exists($record->{'resource.CODE'})) { $isCODE=1; }
      my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
  	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
- Line 3766  sub displaySubByDates {
+ Line 4270  sub displaySubByDates {
      my %orders;
      $mark{'correct_by_student'} = $checkIcon;
      if (!exists($$record{'1:timestamp'})) {
- 	return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />';
+ 	return '<br />&nbsp;<span class="LC_warning">Nothing submitted - no attempts</span><br />';
      }
+     my $interaction;
      for ($version=1;$version<=$$record{'version'};$version++) {
  	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+ 	if (exists($$record{$version.':resource.0.version'})) {
+ 	    $interaction = $$record{$version.':resource.0.version'};
+ 	}
+ 	my $where = ($isTask ? "$version:resource.$interaction"
+ 		             : "$version:resource");
  	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
  	if ($isCODE) {
  	    $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
- Line 3777  sub displaySubByDates {
+ Line 4289  sub displaySubByDates {
  	my @versionKeys = split(/\:/,$$record{$version.':keys'});
  	my @displaySub = ();
  	foreach my $partid (@{$parts}) {
- 	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
+ 	    my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
+ 			            : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
  #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
- 	    my $display_part=&get_display_part($partid,undef,$symb);
+ 	    my $display_part=&get_display_part($partid,$symb);
  	    foreach my $matchKey (@matchKey) {
  		if (exists($$record{$version.':'.$matchKey}) &&
  		    $$record{$version.':'.$matchKey} ne '') {
- 		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+ 		    my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
+ 				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
  		    $displaySub[0].='<b>Part:</b>&nbsp;'.$display_part.'&nbsp;';
- 		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
+ 		    $displaySub[0].='<span class="LC_internal_info">(ID&nbsp;'.
- 			$responseId.')</font>&nbsp;<b>';
+ 			$responseId.')</span>&nbsp;<b>';
- 		    if ($$record{"$version:resource.$partid.tries"} eq '') {
+ 		    if ($$record{"$where.$partid.tries"} eq '') {
  			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
  		    } else {
  			$displaySub[0].='Trial&nbsp;'.
- 			    $$record{"$version:resource.$partid.tries"};
+ 			    $$record{"$where.$partid.tries"};
  		    }
- 		    my $responseType=$responseType->{$partid}->{$responseId};
+ 		    my $responseType=($isTask ? 'Task'
+                                               : $responseType->{$partid}->{$responseId});
  		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
  		    if (!exists($orders{$partid}->{$responseId})) {
  			$orders{$partid}->{$responseId}=
  			    &get_order($partid,$responseId,$symb,$uname,$udom);
  		    }
  		    $displaySub[0].='</b>&nbsp; '.
- 			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';
+ 			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
  		}
  	    }
- 	    if (exists $$record{"$version:resource.$partid.award"}) {
+ 	    if (exists($$record{"$where.$partid.checkedin"})) {
+ 		$displaySub[1].='Checked in by '.
+ 		    $$record{"$where.$partid.checkedin"}.' into slot '.
+ 		    $$record{"$where.$partid.checkedin.slot"}.
+ 		    '<br />';
+ 	    }
+ 	    if (exists $$record{"$where.$partid.award"}) {
  		$displaySub[1].='<b>Part:</b>&nbsp;'.$display_part.' &nbsp;'.
- 		    lc($$record{"$version:resource.$partid.award"}).' '.
+ 		    lc($$record{"$where.$partid.award"}).' '.
- 		    $mark{$$record{"$version:resource.$partid.solved"}}.
+ 		    $mark{$$record{"$where.$partid.solved"}}.
  		    '<br />';
  	    }
- 	    if (exists $$record{"$version:resource.$partid.regrader"}) {
+ 	    if (exists $$record{"$where.$partid.regrader"}) {
- 		$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+ 		$displaySub[2].=$$record{"$where.$partid.regrader"}.
+ 		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+ 	    } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
+ 		$displaySub[2].=
+ 		    $$record{"$version:resource.$partid.regrader"}.
  		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
  	    }
  	}
- Line 3840  sub updateGradeByPage {
+ Line 4368  sub updateGradeByPage {
      my ($uname,$udom) = split(/:/,$env{'form.student'});
      my $usec=$classlist->{$env{'form.student'}}[5];
      if (!&canmodify($usec)) {
- 	$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
+ 	$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>');
- 	$request->print(&show_grading_menu_form($env{'form.symb'},$env{'form.url'}));
+ 	$request->print(&show_grading_menu_form($env{'form.symb'}));
  	return;
      }
-     my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
+     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
      $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
  	'</h3>'."\n";
- Line 3854  sub updateGradeByPage {
+ Line 4382  sub updateGradeByPage {
      my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
      my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
      if (!$map) {
- 	$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');
+ 	$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>');
- 	my ($symb,$url)=&get_symb_and_url($request);
+ 	my ($symb)=&get_symb($request);
- 	$request->print(&show_grading_menu_form($symb,$url));
+ 	$request->print(&show_grading_menu_form($symb));
  	return;
      }
      my $iterator = $navmap->getIterator($map->map_start(),
- Line 3876  sub updateGradeByPage {
+ Line 4404  sub updateGradeByPage {
          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
          if($curRes == $iterator->END_MAP) { $depth--; }
-         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+         if (ref($curRes) && $curRes->is_problem()) {
  	    my $parts = $curRes->parts();
              my $title = $curRes->compTitle();
  	    my $symbx = $curRes->symb();
  	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
- 		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+ 		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
  	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
  	    my %newrecord=();
- Line 3923  sub updateGradeByPage {
+ Line 4451  sub updateGradeByPage {
                          $aggregateflag = 1;
                      }
  		}
- 		my $display_part=&get_display_part($partid,undef,
+ 		my $display_part=&get_display_part($partid,$curRes->symb());
- 						   $curRes->symb());
  		my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
  		$displayPts[0].='&nbsp;<b>Part:</b> '.$display_part.' = '.
  		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
- 		    '&nbsp;<br>';
+ 		    '&nbsp;<br />';
  		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
  		     (($score eq 'excused') ? 'excused' : $newpts).
- 		    '&nbsp;<br>';
+ 		    '&nbsp;<br />';
  		$question++;
- 		next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+ 		next if ($dropMenu eq 'reset status' || ($newpts eq $oldpts && $score ne 'excused'));
  		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
  		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
- Line 3944  sub updateGradeByPage {
+ Line 4470  sub updateGradeByPage {
  		$changeflag++;
  	    }
  	    if (scalar(keys(%newrecord)) > 0) {
+ 		my %record =
+ 		    &Apache::lonnet::restore($symbx,$env{'request.course.id'},
+ 					     $udom,$uname);
+ 		if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+ 		    $newrecord{'resource.CODE'} = $env{'form.CODE'};
+ 		} elsif (&Apache::lonnet::validCODE($record{'resource.CODE'})) {
+ 		    $newrecord{'resource.CODE'} = '';
+ 		}
  		&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
  					$udom,$uname);
+ 		%record = &Apache::lonnet::restore($symbx,
+ 						   $env{'request.course.id'},
+ 						   $udom,$uname);
+ 		&check_and_remove_from_queue($parts,\%record,undef,$symbx,
+ 					     $cdom,$cnum,$udom,$uname);
  	    }
              if ($aggregateflag) {
                  &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                        $env{'course.'.$env{'request.course.id'}.'.domain'},
- Line 3963  sub updateGradeByPage {
+ Line 4504  sub updateGradeByPage {
      }
      $studentTable.='</td></tr></table></td></tr></table>';
-     $studentTable.=&show_grading_menu_form($env{'form.symb'},$env{'form.url'});
+     $studentTable.=&show_grading_menu_form($env{'form.symb'});
      my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
  		  'The scores were changed for '.
  		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
- Line 3980  sub updateGradeByPage {
+ Line 4521  sub updateGradeByPage {
  #
  #------ start of section for handling grading by page/sequence ---------
+ =pod
+ =head1 Bubble sheet grading routines
+   For this documentation:
+    'scanline' refers to the full line of characters
+    from the file that we are parsing that represents one entire sheet
+    'bubble line' refers to the data
+    representing the line of bubbles that are on the physical bubble sheet
+ The overall process is that a scanned in bubble sheet data is uploaded
+ into a course. When a user wants to grade, they select a
+ sequence/folder of resources, a file of bubble sheet info, and pick
+ one of the predefined configurations for what each scanline looks
+ like.
+ Next each scanline is checked for any errors of either 'missing
+ bubbles' (it's an error because it may have been mis-scanned
+ because too light bubbling), 'double bubble' (each bubble line should
+ have no more that one letter picked), invalid or duplicated CODE,
+ invalid student ID
+ If the CODE option is used that determines the randomization of the
+ homework problems, either way the student ID is looked up into a
+ username:domain.
+ During the validation phase the instructor can choose to skip scanlines.
+ After the validation phase, there are now 3 bubble sheet files
+   scantron_original_filename (unmodified original file)
+   scantron_corrected_filename (file where the corrected information has replaced the original information)
+   scantron_skipped_filename (contains the exact text of scanlines that where skipped)
+ Also there is a separate hash nohist_scantrondata that contains extra
+ correction information that isn't representable in the bubble sheet
+ file (see &scantron_getfile() for more information)
+ After all scanlines are either valid, marked as valid or skipped, then
+ foreach line foreach problem in the picked sequence, an ssi request is
+ made that simulates a user submitting their selected letter(s) against
+ the homework problem.
+ =over 4
+ =item defaultFormData
+   Returns html hidden inputs used to hold context/default values.
+  Arguments:
+   $symb - $symb of the current resource
+ =cut
  sub defaultFormData {
-     my ($symb,$url)=@_;
+     my ($symb)=@_;
-     return '
+     return '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-       <input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
-      '<input type="hidden" name="url"     value="'.$url.'" />'."\n".
       '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
       '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
  }
+ =pod
+ =item getSequenceDropDown
+    Return html dropdown of possible sequences to grade
+  Arguments:
+    $symb - $symb of the current resource
+ =cut
  sub getSequenceDropDown {
-     my ($request,$symb)=@_;
+     my ($symb)=@_;
      my $result='<select name="selectpage">'."\n";
-     my ($titles,$symbx) = &getSymbMap($request);
+     my ($titles,$symbx) = &getSymbMap();
      my ($curpage)=&Apache::lonnet::decode_symb($symb);
      my $ctr=0;
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
  	$result.='<option value="'.$$symbx{$_}.'" '.
- 	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+ 	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
  	    '>'.$showtitle.'</option>'."\n";
  	$ctr++;
      }
- Line 4006  sub getSequenceDropDown {
+ Line 4616  sub getSequenceDropDown {
      return $result;
  }
+ =pod
+ =item scantron_filenames
+    Returns a list of the scantron files in the current course
+ =cut
  sub scantron_filenames {
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
      my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
- 				    &Apache::loncommon::propath($cdom,$cname));
+ 				    &propath($cdom,$cname));
      my @possiblenames;
      foreach my $filename (sort(@files)) {
  	($filename)=split(/&/,$filename);
- Line 4021  sub scantron_filenames {
+ Line 4640  sub scantron_filenames {
      return @possiblenames;
  }
+ =pod
+ =item scantron_uploads
+    Returns  html drop-down list of scantron files in current course.
+  Arguments:
+    $file2grade - filename to set as selected in the dropdown
+ =cut
  sub scantron_uploads {
      my ($file2grade) = @_;
      my $result=	'<select name="scantron_selectfile">';
      $result.="<option></option>";
      foreach my $filename (sort(&scantron_filenames())) {
- 	$result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n";
+ 	$result.="<option".($filename eq $file2grade ? ' selected="selected"':'').">$filename</option>\n";
      }
      $result.="</select>";
      return $result;
  }
+ =pod
+ =item scantron_scantab
+   Returns html drop down of the scantron formats in the scantronformat.tab
+   file.
+ =cut
  sub scantron_scantab {
      my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
      my $result='<select name="scantron_format">'."\n";
- Line 4046  sub scantron_scantab {
+ Line 4685  sub scantron_scantab {
      return $result;
  }
+ =pod
+ =item scantron_CODElist
+   Returns html drop down of the saved CODE lists from current course,
+   generated from earlier printings.
+ =cut
  sub scantron_CODElist {
      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- Line 4060  sub scantron_CODElist {
+ Line 4708  sub scantron_CODElist {
      return $namechoice;
  }
+ =pod
+ =item scantron_CODEunique
+   Returns the html for "Each CODE to be used once" radio.
+ =cut
  sub scantron_CODEunique {
-     my $result='<nobr>
+     my $result='<span style="white-space: nowrap;">
                   <label><input type="radio" name="scantron_CODEunique"
-                         value="yes" checked="checked" /> Yes </label>
+                         value="yes" checked="checked" />'.&mt('Yes').' </label>
-                 </nobr>
+                 </span>
-                 <nobr>
+                 <span style="white-space: nowrap;">
                   <label><input type="radio" name="scantron_CODEunique"
-                         value="no" /> No </label>
+                         value="no" />'.&mt('No').' </label>
-                 </nobr>';
+                 </span>';
      return $result;
  }
+ =pod
+ =item scantron_selectphase
+   Generates the initial screen to start the bubble sheet process.
+   Allows for - starting a grading run.
+              - downloading existing scan data (original, corrected
+                                                 or skipped info)
+              - uploading new scan data
+  Arguments:
+   $r          - The Apache request object
+   $file2grade - name of the file that contain the scanned data to score
+ =cut
  sub scantron_selectphase {
      my ($r,$file2grade) = @_;
-     my ($symb,$url)=&get_symb_and_url($r);
+     my ($symb)=&get_symb($r);
      if (!$symb) {return '';}
-     my $sequence_selector=&getSequenceDropDown($r,$symb);
+     my $sequence_selector=&getSequenceDropDown($symb);
-     my $default_form_data=&defaultFormData($symb,$url);
+     my $default_form_data=&defaultFormData($symb);
-     my $grading_menu_button=&show_grading_menu_form($symb,$url);
+     my $grading_menu_button=&show_grading_menu_form($symb);
      my $file_selector=&scantron_uploads($file2grade);
      my $format_selector=&scantron_scantab();
      my $CODE_selector=&scantron_CODElist();
      my $CODE_unique=&scantron_CODEunique();
      my $result;
-     #FIXME allow instructor to be able to download the scantron file
-     # and to upload it,
+     # Chunk of form to prompt for a file to grade and how:
      $result.= <<SCANTRONFORM;
      <table width="100%" border="0">
      <tr>
- Line 4118  sub scantron_selectphase {
+ Line 4792  sub scantron_selectphase {
  	    <td> Options: </td>
              <td>
  	       <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
-                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label>
+                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />
+                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
  	    </td>
            </tr>
            <tr bgcolor="#ffffe6">
- Line 4137  SCANTRONFORM
+ Line 4812  SCANTRONFORM
      if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
          &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+ 	# Chunk of form to prompt for a scantron file upload.
          $r->print(<<SCANTRONFORM);
      <tr>
        <td bgcolor="#777777">
- Line 4149  SCANTRONFORM
+ Line 4826  SCANTRONFORM
            <tr bgcolor="#ffffe6">
              <td>
  SCANTRONFORM
-     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+     my $default_form_data=&defaultFormData(&get_symb($r,1));
      my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
      $r->print(<<UPLOAD);
- Line 4182  UPLOAD
+ Line 4859  UPLOAD
      </tr>
  SCANTRONFORM
      }
+     # Chunk of the form that prompts to view a scoring office file,
+     # corrected file, skipped records in a file.
      $r->print(<<SCANTRONFORM);
      <tr>
        <form action='/adm/grades' name='scantron_download'>
          <td bgcolor="#777777">
+ 	  $default_form_data
            <input type="hidden" name="command" value="scantron_download" />
            <table width="100%" border="0">
              <tr bgcolor="#e6ffff">
- Line 4215  SCANTRONFORM
+ Line 4897  SCANTRONFORM
      return
  }
+ =pod
+ =item get_scantron_config
+    Parse and return the scantron configuration line selected as a
+    hash of configuration file fields.
+  Arguments:
+     which - the name of the configuration to parse from the file.
+  Returns:
+             If the named configuration is not in the file, an empty
+             hash is returned.
+     a hash with the fields
+       name         - internal name for the this configuration setup
+       description  - text to display to operator that describes this config
+       CODElocation - if 0 or the string 'none'
+                           - no CODE exists for this config
+                      if -1 || the string 'letter'
+                           - a CODE exists for this config and is
+                             a string of letters
+                      Unsupported value (but planned for future support)
+                           if a positive integer
+                                - The CODE exists as the first n items from
+                                  the question section of the form
+                           if the string 'number'
+                                - The CODE exists for this config and is
+                                  a string of numbers
+       CODEstart   - (only matter if a CODE exists) column in the line where
+                      the CODE starts
+       CODElength  - length of the CODE
+       IDstart     - column where the student ID number starts
+       IDlength    - length of the student ID info
+       Qstart      - column where the information from the bubbled
+                     'questions' start
+       Qlength     - number of columns comprising a single bubble line from
+                     the sheet. (usually either 1 or 10)
+       Qon         - either a single character representing the character used
+                     to signal a bubble was chosen in the positional setup, or
+                     the string 'letter' if the letter of the chosen bubble is
+                     in the final, or 'number' if a number representing the
+                     chosen bubble is in the file (1->A 0->J)
+       Qoff        - the character used to represent that a bubble was
+                     left blank
+       PaperID     - if the scanning process generates a unique number for each
+                     sheet scanned the column that this ID number starts in
+       PaperIDlength - number of columns that comprise the unique ID number
+                       for the sheet of paper
+       FirstName   - column that the first name starts in
+       FirstNameLength - number of columns that the first name spans
+       LastName    - column that the last name starts in
+       LastNameLength - number of columns that the last name spans
+ =cut
  sub get_scantron_config {
      my ($which) = @_;
      my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
- Line 4247  sub get_scantron_config {
+ Line 4986  sub get_scantron_config {
      return %config;
  }
+ =pod
+ =item username_to_idmap
+     creates a hash keyed by student id with values of the corresponding
+     student username:domain.
+   Arguments:
+     $classlist - reference to the class list hash. This is a hash
+                  keyed by student name:domain  whose elements are references
+                  to arrays containing various chunks of information
+                  about the student. (See loncoursedata for more info).
+   Returns
+     %idmap - the constructed hash
+ =cut
  sub username_to_idmap {
      my ($classlist)= @_;
      my %idmap;
- Line 4257  sub username_to_idmap {
+ Line 5015  sub username_to_idmap {
      return %idmap;
  }
+ =pod
+ =item scantron_fixup_scanline
+    Process a requested correction to a scanline.
+   Arguments:
+     $scantron_config   - hash from &get_scantron_config()
+     $scan_data         - hash of correction information
+                           (see &scantron_getfile())
+     $line              - existing scanline
+     $whichline         - line number of the passed in scanline
+     $field             - type of change to process
+                          (either
+                           'ID'     -> correct the student ID number
+                           'CODE'   -> correct the CODE
+                           'answer' -> fixup the submitted answers)
+    $args               - hash of additional info,
+                           - 'ID'
+                                'newid' -> studentID to use in replacement
+                                           of existing one
+                           - 'CODE'
+                                'CODE_ignore_dup' - set to true if duplicates
+                                                    should be ignored.
+ 	                       'CODE' - is new code or 'use_unfound'
+                                         if the existing unfound code should
+                                         be used as is
+                           - 'answer'
+                                'response' - new answer or 'none' if blank
+                                'question' - the bubble line to change
+   Returns:
+     $line - the modified scanline
+   Side effects:
+     $scan_data - may be updated
+ =cut
  sub scantron_fixup_scanline {
      my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
      if ($field eq 'ID') {
  	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
  	    return ($line,1,'New value too large');
- Line 4302  sub scantron_fixup_scanline {
+ Line 5102  sub scantron_fixup_scanline {
  		$answer=$alphabet[$args->{'response'}];
  	    } elsif ($on eq 'number') {
  		$answer=$args->{'response'}+1;
+ 		if ($answer == 10) { $answer = '0'; }
  	    } else {
  		substr($answer,$args->{'response'},1)=$on;
  	    }
- Line 4314  sub scantron_fixup_scanline {
+ Line 5115  sub scantron_fixup_scanline {
      return $line;
  }
+ =pod
+ =item scan_data
+     Edit or look up  an item in the scan_data hash.
+   Arguments:
+     $scan_data  - The hash (see scantron_getfile)
+     $key        - shorthand of the key to edit (actual key is
+                   scantronfilename_key).
+     $data        - New value of the hash entry.
+     $delete      - If true, the entry is removed from the hash.
+   Returns:
+     The new value of the hash table field (undefined if deleted).
+ =cut
  sub scan_data {
      my ($scan_data,$key,$value,$delete)=@_;
      my $filename=$env{'form.scantron_selectfile'};
- Line 4324  sub scan_data {
+ Line 5144  sub scan_data {
      return $scan_data->{$filename.'_'.$key};
  }
+ =pod
+ =item scantron_parse_scanline
+   Decodes a scanline from the selected scantron file
+  Arguments:
+     line             - The text of the scantron file line to process
+     whichline        - Line number
+     scantron_config  - Hash describing the format of the scantron lines.
+     scan_data        - Hash of extra information about the scanline
+                        (see scantron_getfile for more information)
+     just_header      - True if should not process question answers but only
+                        the stuff to the left of the answers.
+  Returns:
+    Hash containing the result of parsing the scanline
+    Keys are all proceeded by the string 'scantron.'
+        CODE    - the CODE in use for this scanline
+        useCODE - 1 if the CODE is invalid but it usage has been forced
+                  by the operator
+        CODE_ignore_dup - 1 if the CODE is a duplicated use when unique
+                             CODEs were selected, but the usage has been
+                             forced by the operator
+        ID  - student ID
+        PaperID - if used, the ID number printed on the sheet when the
+                  paper was scanned
+        FirstName - first name from the sheet
+        LastName  - last name from the sheet
+      if just_header was not true these key may also exist
+        missingerror - a list of bubble ranges that are considered to be answers
+                       to a single question that don't have any bubbles filled in.
+                       Of the form questionnumber:firstbubblenumber:count.
+        doubleerror  - a list of bubble ranges that are considered to be answers
+                       to a single question that have more than one bubble filled in.
+                       Of the form questionnumber::firstbubblenumber:count
+                 In the above, count is the number of bubble responses in the
+                 input line needed to represent the possible answers to the question.
+                 e.g. a radioresponse with 15 choices in an answer sheet with 10 choices
+                 per line would have count = 2.
+        maxquest     - the number of the last bubble line that was parsed
+        (<number> starts at 1)
+        <number>.answer - zero or more letters representing the selected
+                          letters from the scanline for the bubble line
+                          <number>.
+                          if blank there was either no bubble or there where
+                          multiple bubbles, (consult the keys missingerror and
+                          doubleerror if this is an error condition)
+ =cut
  sub scantron_parse_scanline {
-     my ($line,$whichline,$scantron_config,$scan_data,$justHeader)=@_;
+     my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;
      my %record;
-     my $questions=substr($line,$$scantron_config{'Qstart'}-1);
+     my $questions=substr($line,$$scantron_config{'Qstart'}-1);  # Answers
-     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
+     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);     # earlier stuff
      if (!($$scantron_config{'CODElocation'} eq 0 ||
  	  $$scantron_config{'CODElocation'} eq 'none')) {
  	if ($$scantron_config{'CODElocation'} < 0 ||
- Line 4358  sub scantron_parse_scanline {
+ Line 5235  sub scantron_parse_scanline {
      $record{'scantron.LastName'}=
  	substr($data,$$scantron_config{'LastName'}-1,
  	       $$scantron_config{'LastNamelength'});
-     if ($justHeader) { return \%record; }
+     if ($just_header) { return \%record; }
      my @alphabet=('A'..'Z');
      my $questnum=0;
+     my $ansnum  =1;		# Multiple 'answer lines'/question.
      while ($questions) {
+ 	my $answers_needed = $bubble_lines_per_response{$questnum};
+ 	my $answer_length  = $$scantron_config{'Qlength'} * $answers_needed;
  	$questnum++;
- 	my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
+ 	my $currentquest = substr($questions,0,$answer_length);
- 	substr($questions,0,$$scantron_config{'Qlength'})='';
+ 	$questions       = substr($questions,0,$answer_length)='';
- 	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
+ 	if (length($currentquest) < $answer_length) { next; }
+ 	# Qon letter implies for each slot in currentquest we have:
+ 	#    ? or * for doubles a letter in A-Z for a bubble and
+         #    about anything else (esp. a value of Qoff for missing
+ 	#    bubbles.
  	if ($$scantron_config{'Qon'} eq 'letter') {
- 	    if ($currentquest eq '?') {
+ 	    if ($currentquest =~ /\?/
+ 		|| $currentquest =~ /\*/
+ 		|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
  		push(@{$record{'scantron.doubleerror'}},$questnum);
- 		$record{"scantron.$questnum.answer"}='';
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
- 	    } elsif (!$currentquest
+ 		    $record{"scantron.$ansnum.answer"}='';
- 		     || $currentquest eq $$scantron_config{'Qoff'}
+ 		    $ansnum++;
- 		     || $currentquest !~ /^[A-Z]$/) {
+ 		}
- 		$record{"scantron.$questnum.answer"}='';
+ 	    } elsif (!defined($currentquest)
+ 		     || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
+ 		     || (&occurence_count($currentquest, "[A-Z]") == 0)) {
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+ 		    $record{"scantron.$ansnum.answer"}='';
+ 		    $ansnum++;
+ 		}
  		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
  		    push(@{$record{"scantron.missingerror"}},$questnum);
+ 		    $ansnum += $answers_needed;
  		}
  	    } else {
- 		$record{"scantron.$questnum.answer"}=$currentquest;
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+ 		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ 		    $ansnum++;
+ 		}
  	    }
+ 	# Qon 'number' implies each slot gives a digit that indexes the
+ 	#    the bubbles filled or Qoff or a non number for unbubbled lines.
+         #    and *? for double bubbles on a line.
+ 	#    these answers are also stored as letters.
  	} elsif ($$scantron_config{'Qon'} eq 'number') {
- 	    if ($currentquest eq '?') {
+ 	    if ($currentquest =~ /\?/
+ 		|| $currentquest =~ /\*/
+ 		|| (&occurence_count($currentquest, '\d') > 1)) {
  		push(@{$record{'scantron.doubleerror'}},$questnum);
- 		$record{"scantron.$questnum.answer"}='';
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
- 		} elsif (!$currentquest
+ 		    $record{"scantron.$ansnum.answer"}='';
- 			 || $currentquest eq $$scantron_config{'Qoff'}
+ 		    $ansnum++;
- 			 || $currentquest !~ /^\d$/) {
+ 		}
- 		$record{"scantron.$questnum.answer"}='';
+ 	    } elsif (!defined($currentquest)
+ 		     || (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest))
+ 		     || (&occurence_count($currentquest, '\d') == 0)) {
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+ 		    $record{"scantron.$ansnum.answer"}='';
+ 		    $ansnum++;
+ 		}
  		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
  		    push(@{$record{"scantron.missingerror"}},$questnum);
+ 		    $ansnum += $answers_needed;
  		}
  	    } else {
- 		$record{"scantron.$questnum.answer"}=
+ 		$currentquest = &digits_to_letters($currentquest);
- 		    $alphabet[$currentquest-1];
+ 		for (my $ans =0; $ans < $answers_needed; $ans++) {
+ 		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ 		    $ansnum++;
+ 		}
  	    }
  	} else {
+ 	    # Otherwise there's a positional notation;
+ 	    # each bubble line requires Qlength items, and there are filled in
+ 	    # bubbles for each case where there 'Qon' characters.
+ 	    #
  	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
- 	    if (length($array[0]) eq $$scantron_config{'Qlength'}) {
- 		$record{"scantron.$questnum.answer"}='';
+ 	    # If the split only  giveas us one element.. the full length of the
+ 	    # answser string, no bubbles are filled in:
+ 	    if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+ 		    $record{"scantron.$ansnum.answer"}='';
+ 		    $ansnum++;
+ 		}
  		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
  		    push(@{$record{"scantron.missingerror"}},$questnum);
  		}
- 	    } else {
+ 	    } elsif (scalar(@array) lt 2) {
- 		$record{"scantron.$questnum.answer"}=
- 		    $alphabet[length($array[0])];
+ 		my $location      = [length($array[0])];
+ 		my $line_num      = $location / $$scantron_config{'Qlength'};
+ 		my $bubble        = $alphabet[$location % $$scantron_config{'Qlength'}];
+ 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+ 		    if ($ans eq $line_num) {
+ 			$record{"scantron.$ansnum.answer"} = $bubble;
+ 		    } else {
+ 			$record{"scantron.$ansnum.answer"} = ' ';
+ 		    }
+ 		    $ansnum++;
+ 		}
  	    }
- 	    if (scalar(@array) gt 2) {
+ 	    #  If there's more than one instance of a bubble character
+ 	    #  That's a double bubble; with positional notation we can
+ 	    #  record all the bubbles filled in as well as the
+ 	    #  fact this response consists of multiple bubbles.
+ 	    #
+ 	    else {
  		push(@{$record{'scantron.doubleerror'}},$questnum);
+ 		my $first_answer = $ansnum;
+ 		for (my $ans =0; $ans < $answers_needed; $ans++) {
+ 		    $record{"scantron.$ansnum.answer"} = '';
+ 		    $ans++;
+ 		}
  		my @ans=@array;
  		my $i=length($ans[0]);shift(@ans);
  		while ($#ans) {
  		    $i+=length($ans[0])+1;
- 		    $record{"scantron.$questnum.answer"}.=$alphabet[$i];
+ 		    my $line   = $i/$$scantron_config{'Qlength'} + $first_answer;
+ 		    my $bubble = $i%$$scantron_config{'Qlength'};
+ 		    $record{"scantron.$line.answer"}.=$alphabet[$bubble];
  		    shift(@ans);
  		}
  	    }
- Line 4423  sub scantron_parse_scanline {
+ Line 5391  sub scantron_parse_scanline {
      return \%record;
  }
+ =pod
+ =item scantron_add_delay
+    Adds an error message that occurred during the grading phase to a
+    queue of messages to be shown after grading pass is complete
+  Arguments:
+    $delayqueue  - arrary ref of hash ref of error messages
+    $scanline    - the scanline that caused the error
+    $errormesage - the error message
+    $errorcode   - a numeric code for the error
+  Side Effects:
+    updates the $delayqueue to have a new hash ref of the error
+ =cut
  sub scantron_add_delay {
      my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
      push(@$delayqueue,
- Line 4431  sub scantron_add_delay {
+ Line 5417  sub scantron_add_delay {
  	 );
  }
+ =pod
+ =item scantron_find_student
+    Finds the username for the current scanline
+   Arguments:
+    $scantron_record - hash result from scantron_parse_scanline
+    $scan_data       - hash of correction information
+                       (see &scantron_getfile() form more information)
+    $idmap           - hash from &username_to_idmap()
+    $line            - number of current scanline
+   Returns:
+    Either 'username:domain' or undef if unknown
+ =cut
  sub scantron_find_student {
      my ($scantron_record,$scan_data,$idmap,$line)=@_;
      my $scanID=$$scantron_record{'scantron.ID'};
- Line 4445  sub scantron_find_student {
+ Line 5449  sub scantron_find_student {
      return undef;
  }
+ =pod
+ =item scantron_filter
+    Filter sub for lonnavmaps, filters out hidden resources if ignore
+    hidden resources was selected
+ =cut
  sub scantron_filter {
      my ($curres)=@_;
-                         # randomout is dysfunctional at best for this purpose
-     if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {
+     if (ref($curres) && $curres->is_problem()) {
+ 	# if the user has asked to not have either hidden
+ 	# or 'randomout' controlled resources to be graded
+ 	# don't include them
+ 	if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
+ 	    && $curres->randomout) {
+ 	    return 0;
+ 	}
  	return 1;
      }
      return 0;
  }
+ =pod
+ =item scantron_process_corrections
+    Gets correction information out of submitted form data and corrects
+    the scanline
+ =cut
  sub scantron_process_corrections {
      my ($r) = @_;
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
- Line 4504  sub scantron_process_corrections {
+ Line 5533  sub scantron_process_corrections {
  	}
      }
      if ($err) {
- 	$r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>");
+ 	$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>");
      } else {
  	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
  	&scantron_putfile($scanlines,$scan_data);
      }
  }
+ =pod
+ =item reset_skipping_status
+    Forgets the current set of remember skipped scanlines (and thus
+    reverts back to considering all lines in the
+    scantron_skipped_<filename> file)
+ =cut
  sub reset_skipping_status {
      my ($scanlines,$scan_data)=&scantron_getfile();
      &scan_data($scan_data,'remember_skipping',undef,1);
      &scantron_putfile(undef,$scan_data);
  }
- sub allow_skipping {
+ =pod
+ =item start_skipping
+    Marks a scanline to be skipped.
+ =cut
+ sub start_skipping {
      my ($scan_data,$i)=@_;
      my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
-     delete($remembered{$i});
+     if ($env{'form.scantron_options_redo'} =~ /^redo_/) {
+ 	$remembered{$i}=2;
+     } else {
+ 	$remembered{$i}=1;
+     }
      &scan_data($scan_data,'remember_skipping',join(':',%remembered));
  }
+ =pod
+ =item should_be_skipped
+    Checks whether a scanline should be skipped.
+ =cut
  sub should_be_skipped {
-     my ($scan_data,$i)=@_;
+     my ($scanlines,$scan_data,$i)=@_;
      if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
  	# not redoing old skips
+ 	if ($scanlines->{'skipped'}[$i]) { return 1; }
  	return 0;
      }
      my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
-     if (exists($remembered{$i})) { return 0; }
+     if (exists($remembered{$i}) && $remembered{$i} != 2 ) {
+ 	return 0;
+     }
      return 1;
  }
+ =pod
+ =item remember_current_skipped
+    Discovers what scanlines are in the scantron_skipped_<filename>
+    file and remembers them into scan_data for later use.
+ =cut
  sub remember_current_skipped {
      my ($scanlines,$scan_data)=&scantron_getfile();
      my %to_remember;
- Line 4543  sub remember_current_skipped {
+ Line 5615  sub remember_current_skipped {
  	    $to_remember{$i}=1;
  	}
      }
-     &Apache::lonnet::logthis('remembering '.join(':',%to_remember));
      &scan_data($scan_data,'remember_skipping',join(':',%to_remember));
      &scantron_putfile(undef,$scan_data);
  }
+ =pod
+ =item check_for_error
+     Checks if there was an error when attempting to remove a specific
+     scantron_.. bubble sheet data file. Prints out an error if
+     something went wrong.
+ =cut
  sub check_for_error {
      my ($r,$result)=@_;
      if ($result ne 'ok' && $result ne 'not_found' ) {
- 	$r->print("An error occured ($result) when trying to Remove the existing corrections.");
+ 	$r->print("An error occurred ($result) when trying to Remove the existing corrections.");
      }
  }
+ =pod
+ =item scantron_warning_screen
+    Interstitial screen to make sure the operator has selected the
+    correct options before we start the validation phase.
+ =cut
  sub scantron_warning_screen {
      my ($button_text)=@_;
      my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
-     my $CODElist="a";
+     my $CODElist;
      if ($scantron_config{'CODElocation'} &&
  	$scantron_config{'CODEstart'} &&
  	$scantron_config{'CODElength'}) {
  	$CODElist=$env{'form.scantron_CODElist'};
- 	if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
+ 	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
  	$CODElist=
  	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
- 	    $CODElist.'</tt></td></tr>';
+ 	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
      }
      return (<<STUFF);
  <p>
- <font color="red">Please double check the information
+ <span class="LC_warning">Please double check the information
-                  below before clicking on '$button_text'</font>
+                  below before clicking on '$button_text'</span>
  </p>
  <table>
  <tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
  <tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
  $CODElist
  </table>
- </font>
  <br />
  <p> If this information is correct, please click on '$button_text'.</p>
  <p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
- Line 4588  $CODElist
+ Line 5678  $CODElist
  STUFF
  }
+ =pod
+ =item scantron_do_warning
+    Check if the operator has picked something for all required
+    fields. Error out if something is missing.
+ =cut
  sub scantron_do_warning {
      my ($r)=@_;
-     my ($symb,$url)=&get_symb_and_url($r);
+     my ($symb)=&get_symb($r);
      if (!$symb) {return '';}
-     my $default_form_data=&defaultFormData($symb,$url);
+     my $default_form_data=&defaultFormData($symb);
      $r->print(&scantron_form_start().$default_form_data);
      if ( $env{'form.selectpage'} eq '' ||
  	 $env{'form.scantron_selectfile'} eq '' ||
  	 $env{'form.scantron_format'} eq '' ) {
  	$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
  	if ( $env{'form.selectpage'} eq '') {
- 	    $r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>');
+ 	    $r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');
  	}
  	if ( $env{'form.scantron_selectfile'} eq '') {
- 	    $r->print('<p><font color="red">You have not selected a file that contains the student\'s response data.</font></p>');
+ 	    $r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');
  	}
  	if ( $env{'form.scantron_format'} eq '') {
- 	    $r->print('<p><font color="red">You have not selected a the format of the student\'s response data.</font></p>');
+ 	    $r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');
  	}
      } else {
  	my $warning=&scantron_warning_screen('Grading: Validate Records');
- Line 4615  $warning
+ Line 5714  $warning
  <input type="hidden" name="command" value="scantron_validate" />
  STUFF
      }
-     $r->print("</form><br />".&show_grading_menu_form($symb,$url)."</body></html>");
+     $r->print("</form><br />".&show_grading_menu_form($symb));
      return '';
  }
+ =pod
+ =item scantron_form_start
+     html hidden input for remembering all selected grading options
+ =cut
  sub scantron_form_start {
      my ($max_bubble)=@_;
      my $result= <<SCANTRONFORM;
- Line 4631  sub scantron_form_start {
+ Line 5738  sub scantron_form_start {
    <input type="hidden" name="scantron_CODEunique" value="$env{'form.scantron_CODEunique'}" />
    <input type="hidden" name="scantron_options_redo" value="$env{'form.scantron_options_redo'}" />
    <input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />
+   <input type="hidden" name="scantron_options_hidden" value="$env{'form.scantron_options_hidden'}" />
  SCANTRONFORM
+   my $line = 0;
+     while (defined($env{"form.scantron.bubblelines.$line"})) {
+ 	&Apache::lonnet::logthis("Saving chunk for $line");
+        my $chunk =
+ 	   '<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
+        $chunk .=
+ 	   '<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n";
+        $result .= $chunk;
+        $line++;
+    }
      return $result;
  }
+ =pod
+ =item scantron_validate_file
+     Dispatch routine for doing validation of a bubble sheet data file.
+     Also processes any necessary information resets that need to
+     occur before validation begins (ignore previous corrections,
+     restarting the skipped records processing)
+ =cut
  sub scantron_validate_file {
      my ($r) = @_;
-     my ($symb,$url)=&get_symb_and_url($r);
+     my ($symb)=&get_symb($r);
      if (!$symb) {return '';}
-     my $default_form_data=&defaultFormData($symb,$url);
+     my $default_form_data=&defaultFormData($symb);
      # do the detection of only doing skipped records first befroe we delete
-     # them  when doing the corrections reset
+     # them when doing the corrections reset
      if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
  	&reset_skipping_status();
      }
      if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {
  	&remember_current_skipped();
- 	&scantron_remove_file('skipped');
  	$env{'form.scantron_options_redo'}='redo_skipped_ready';
      }
- Line 4662  sub scantron_validate_file {
+ Line 5792  sub scantron_validate_file {
      if ($env{'form.scantron_corrections'}) {
  	&scantron_process_corrections($r);
      }
-     $r->print("<p>Gathering neccessary info.</p>");$r->rflush();
+     $r->print("<p>Gathering necessary info.</p>");$r->rflush();
      #get the student pick code ready
      $r->print(&Apache::loncommon::studentbrowser_javascript());
-     my $max_bubble=&scantron_get_maxbubble($r);
+     my $max_bubble=&scantron_get_maxbubble();
      my $result=&scantron_form_start($max_bubble).$default_form_data;
      $r->print($result);
-     my @validate_phases=( 'ID',
+     my @validate_phases=( 'sequence',
+ 			  'ID',
  			  'CODE',
  			  'doublebubble',
  			  'missingbubbles');
- Line 4678  sub scantron_validate_file {
+ Line 5809  sub scantron_validate_file {
      }
      my $currentphase=$env{'form.validatepass'};
+     &Apache::lonnet::logthis("Phase: $currentphase");
      my $stop=0;
      while (!$stop && $currentphase < scalar(@validate_phases)) {
  	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
- Line 4702  STUFF
+ Line 5835  STUFF
  	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
      }
      if ($stop) {
- 	$r->print('<input type="submit" name="submit" value="Continue ->" />');
+ 	if ($validate_phases[$currentphase] eq 'sequence') {
- 	$r->print(' using corrected info <br />');
+ 	    $r->print('<input type="submit" name="submit" value="Ignore -> " />');
- 	$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
+ 	    $r->print(' this error <br />');
- 	$r->print(" this scanline saving it for later.");
+ 	    $r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");
+ 	} else {
+ 	    $r->print('<input type="submit" name="submit" value="Continue ->" />');
+ 	    $r->print(' using corrected info <br />');
+ 	    $r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
+ 	    $r->print(" this scanline saving it for later.");
+ 	}
      }
-     $r->print(" </form><br />".&show_grading_menu_form($symb,$url).
+     $r->print(" </form><br />".&show_grading_menu_form($symb));
- 	      "</body></html>");
      return '';
  }
+ =pod
+ =item scantron_remove_file
+    Removes the requested bubble sheet data file, makes sure that
+    scantron_original_<filename> is never removed
+ =cut
  sub scantron_remove_file {
      my ($which)=@_;
      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
- Line 4726  sub scantron_remove_file {
+ Line 5876  sub scantron_remove_file {
      return &Apache::lonnet::removeuserfile($cname,$cdom,$file);
  }
+ =pod
+ =item scantron_remove_scan_data
+    Removes all scan_data correction for the requested bubble sheet
+    data file.  (In the case that both the are doing skipped records we need
+    to remember the old skipped lines for the time being so that element
+    persists for a while.)
+ =cut
  sub scantron_remove_scan_data {
      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 4748  sub scantron_remove_scan_data {
+ Line 5910  sub scantron_remove_scan_data {
      return $result;
  }
+ =pod
+ =item scantron_getfile
+     Fetches the requested bubble sheet data file (all 3 versions), and
+     the scan_data hash
+   Arguments:
+     None
+   Returns:
+hash references
+      - first one has
+          orig      -
+          corrected -
+          skipped   -  each of which points to an array ref of the specified
+                       file broken up into individual lines
+          count     - number of scanlines
+      - second is the scan_data hash possible keys are
+        ($number refers to scanline numbered $number and thus the key affects
+         only that scanline
+         $bubline refers to the specific bubble line element and the aspects
+         refers to that specific bubble line element)
+        $number.user - username:domain to use
+        $number.CODE_ignore_dup
+                     - ignore the duplicate CODE error
+        $number.useCODE
+                     - use the CODE in the scanline as is
+        $number.no_bubble.$bubline
+                     - it is valid that there is no bubbled in bubble
+                       at $number $bubline
+        remember_skipping
+                     - a frozen hash containing keys of $number and values
+                       of either
+- we are on a 'do skipped records pass' and plan
+                             on processing this line
+- we are on a 'do skipped records pass' and this
+                             scanline has been marked to skip yet again
+ =cut
  sub scantron_getfile {
      #FIXME really would prefer a scantron directory
      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
- Line 4780  sub scantron_getfile {
+ Line 5987  sub scantron_getfile {
      return (\%scanlines,\%scan_data);
  }
+ =pod
+ =item lonnet_putfile
+    Wrapper routine to call &Apache::lonnet::finishuserfileupload
+  Arguments:
+    $contents - data to store
+    $filename - filename to store $contents into
+  Returns:
+    result value from &Apache::lonnet::finishuserfileupload
+ =cut
  sub lonnet_putfile {
      my ($contents,$filename)=@_;
      my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
- Line 4789  sub lonnet_putfile {
+ Line 6011  sub lonnet_putfile {
  }
+ =pod
+ =item scantron_putfile
+     Stores the current version of the bubble sheet data files, and the
+     scan_data hash. (Does not modify the original version only the
+     corrected and skipped versions.
+  Arguments:
+     $scanlines - hash ref that looks like the first return value from
+                  &scantron_getfile()
+     $scan_data - hash ref that looks like the second return value from
+                  &scantron_getfile()
+ =cut
  sub scantron_putfile {
      my ($scanlines,$scan_data) = @_;
      #FIXME really would prefer a scantron directory
- Line 4809  sub scantron_putfile {
+ Line 6047  sub scantron_putfile {
      &Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
  }
+ =pod
+ =item scantron_get_line
+    Returns the correct version of the scanline
+  Arguments:
+     $scanlines - hash ref that looks like the first return value from
+                  &scantron_getfile()
+     $scan_data - hash ref that looks like the second return value from
+                  &scantron_getfile()
+     $i         - number of the requested line (starts at 0)
+  Returns:
+    A scanline, (either the original or the corrected one if it
+    exists), or undef if the requested scanline should be
+    skipped. (Either because it's an skipped scanline, or it's an
+    unskipped scanline and we are not doing a 'do skipped scanlines'
+    pass.
+ =cut
  sub scantron_get_line {
      my ($scanlines,$scan_data,$i)=@_;
-     if (&should_be_skipped($scan_data,$i)) { return undef; }
+     if (&should_be_skipped($scanlines,$scan_data,$i)) { return undef; }
-     if ($scanlines->{'skipped'}[$i]) { return undef; }
+     #if ($scanlines->{'skipped'}[$i]) { return undef; }
      if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
      return $scanlines->{'orig'}[$i];
  }
+ =pod
+ =item scantron_todo_count
+     Counts the number of scanlines that need processing.
+  Arguments:
+     $scanlines - hash ref that looks like the first return value from
+                  &scantron_getfile()
+     $scan_data - hash ref that looks like the second return value from
+                  &scantron_getfile()
+  Returns:
+     $count - number of scanlines to process
+ =cut
  sub get_todo_count {
      my ($scanlines,$scan_data)=@_;
      my $count=0;
- Line 4828  sub get_todo_count {
+ Line 6105  sub get_todo_count {
      return $count;
  }
+ =pod
+ =item scantron_put_line
+     Updates the 'corrected' or 'skipped' versions of the bubble sheet
+     data file.
+  Arguments:
+     $scanlines - hash ref that looks like the first return value from
+                  &scantron_getfile()
+     $scan_data - hash ref that looks like the second return value from
+                  &scantron_getfile()
+     $i         - line number to update
+     $newline   - contents of the updated scanline
+     $skip      - if true make the line for skipping and update the
+                  'skipped' file
+ =cut
  sub scantron_put_line {
      my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
      if ($skip) {
  	$scanlines->{'skipped'}[$i]=$newline;
- 	&allow_skipping($scan_data,$i);
+ 	&start_skipping($scan_data,$i);
  	return;
      }
      $scanlines->{'corrected'}[$i]=$newline;
  }
+ =pod
+ =item scantron_clear_skip
+    Remove a line from the 'skipped' file
+  Arguments:
+     $scanlines - hash ref that looks like the first return value from
+                  &scantron_getfile()
+     $scan_data - hash ref that looks like the second return value from
+                  &scantron_getfile()
+     $i         - line number to update
+ =cut
+ sub scantron_clear_skip {
+     my ($scanlines,$scan_data,$i)=@_;
+     if (exists($scanlines->{'skipped'}[$i])) {
+ 	undef($scanlines->{'skipped'}[$i]);
+ 	return 1;
+     }
+     return 0;
+ }
+ =pod
+ =item scantron_filter_not_exam
+    Filter routine used by &Apache::lonnavmaps::retrieveResources(), to
+    filter out resources that are not marked as 'exam' mode
+ =cut
+ sub scantron_filter_not_exam {
+     my ($curres)=@_;
+     if (ref($curres) && $curres->is_problem() && !$curres->is_exam()) {
+ 	# if the user has asked to not have either hidden
+ 	# or 'randomout' controlled resources to be graded
+ 	# don't include them
+ 	if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
+ 	    && $curres->randomout) {
+ 	    return 0;
+ 	}
+ 	return 1;
+     }
+     return 0;
+ }
+ =pod
+ =item scantron_validate_sequence
+     Validates the selected sequence, checking for resource that are
+     not set to exam mode.
+ =cut
+ sub scantron_validate_sequence {
+     my ($r,$currentphase) = @_;
+     my $navmap=Apache::lonnavmaps::navmap->new();
+     my (undef,undef,$sequence)=
+ 	&Apache::lonnet::decode_symb($env{'form.selectpage'});
+     my $map=$navmap->getResourceByUrl($sequence);
+     $r->print('<input type="hidden" name="validate_sequence_exam"
+                                     value="ignore" />');
+     if ($env{'form.validate_sequence_exam'} ne 'ignore') {
+ 	my @resources=
+ 	    $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
+ 	if (@resources) {
+ 	    $r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
+ 	    return (1,$currentphase);
+ 	}
+     }
+     return (0,$currentphase+1);
+ }
+ =pod
+ =item scantron_validate_ID
+    Validates all scanlines in the selected file to not have any
+    invalid or underspecified student IDs
+ =cut
  sub scantron_validate_ID {
      my ($r,$currentphase) = @_;
- Line 4848  sub scantron_validate_ID {
+ Line 6234  sub scantron_validate_ID {
      #get scantron line setup
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
+     &scantron_get_maxbubble();	# parse needs the bubble_lines.. array.
      my %found=('ids'=>{},'usernames'=>{});
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- Line 4900  sub scantron_validate_ID {
+ Line 6288  sub scantron_validate_ID {
      return (0,$currentphase+1);
  }
+ =pod
+ =item scantron_get_correction
+    Builds the interface screen to interact with the operator to fix a
+    specific error condition in a specific scanline
+  Arguments:
+     $r           - Apache request object
+     $i           - number of the current scanline
+     $scan_record - hash ref as returned from &scantron_parse_scanline()
+     $scan_config - hash ref as returned from &get_scantron_config()
+     $line        - full contents of the current scanline
+     $error       - error condition, valid values are
+                    'incorrectCODE', 'duplicateCODE',
+                    'doublebubble', 'missingbubble',
+                    'duplicateID', 'incorrectID'
+     $arg         - extra information needed
+        For errors:
+          - duplicateID   - paper number that this studentID was seen before on
+          - duplicateCODE - array ref of the paper numbers this CODE was
+                            seen on before
+          - incorrectCODE - current incorrect CODE
+          - doublebubble  - array ref of the bubble lines that have double
+                            bubble errors
+          - missingbubble - array ref of the bubble lines that have missing
+                            bubble errors
+ =cut
  sub scantron_get_correction {
      my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
- Line 4908  sub scantron_get_correction {
+ Line 6326  sub scantron_get_correction {
  #the previous one or the current one
      $r->print("<p><b>An error was detected ($error)</b>");
-     if ( defined($$scan_record{'scantron.PaperID'}) ) {
+     if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
  	$r->print(" for PaperID <tt>".
  		  $$scan_record{'scantron.PaperID'}."</tt> \n");
      } else {
- Line 4959  sub scantron_get_correction {
+ Line 6377  sub scantron_get_correction {
  	    if ($closest > 0) {
  		foreach my $testcode (@{$closest}) {
  		    my $checked='';
- 		    if (!$i) { $checked=' checked="on" '; }
+ 		    if (!$i) { $checked=' checked="checked" '; }
  		    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
  		    $r->print("\n<br />");
  		    $i++;
- Line 4967  sub scantron_get_correction {
+ Line 6385  sub scantron_get_correction {
  	    }
  	}
  	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
- 	    my $checked; if (!$i) { $checked=' checked="on" '; }
+ 	    my $checked; if (!$i) { $checked=' checked="checked" '; }
  	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
  	    $r->print("\n<br />");
  	}
- Line 4984  function change_radio(field) {
+ Line 6402  function change_radio(field) {
  </script>
  ENDSCRIPT
  	my $href="/adm/pickcode?".
- 	   "form=".&Apache::lonnet::escape("scantronupload").
+ 	   "form=".&escape("scantronupload").
- 	   "&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}).
+ 	   "&scantron_format=".&escape($env{'form.scantron_format'}).
- 	   "&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}).
+ 	   "&scantron_CODElist=".&escape($env{'form.scantron_CODElist'}).
- 	   "&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).
+ 	   "&curCODE=".&escape($$scan_record{'scantron.CODE'}).
- 	   "&scantron_selectfile=".&Apache::lonnet::escape($env{'form.scantron_selectfile'});
+ 	   "&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
- 	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
+ 	if ($env{'form.scantron_CODElist'} =~ /\S/) {
- 	$r->print("\n<br />");
+ 	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
+ 	    $r->print("\n<br />");
+ 	}
  	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
  	$r->print("\n<br /><br />");
      } elsif ($error eq 'doublebubble') {
- Line 5000  ENDSCRIPT
+ Line 6420  ENDSCRIPT
  	$r->print($message);
  	$r->print("<p>Please indicate which bubble should be used for grading</p>");
  	foreach my $question (@{$arg}) {
- 	    my $selected=$$scan_record{"scantron.$question.answer"};
- 	    &scantron_bubble_selector($r,$scan_config,$question,split('',$selected));
+ 	    my $selected  = &get_response_bubbles($scan_record, $question);
+ 	    &scantron_bubble_selector($r,$scan_config,$question,
+ 				      split('',$selected));
  	}
      } elsif ($error eq 'missingbubble') {
  	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
- Line 5011  ENDSCRIPT
+ Line 6433  ENDSCRIPT
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
  		  join(',',@{$arg}).'" />');
  	foreach my $question (@{$arg}) {
- 	    my $selected=$$scan_record{"scantron.$question.answer"};
+ 	    my $selected = &get_response_bubbles($scan_record, $question);
  	    &scantron_bubble_selector($r,$scan_config,$question);
  	}
      } else {
- Line 5021  ENDSCRIPT
+ Line 6443  ENDSCRIPT
  }
+ =pod
+ =item scantron_bubble_selector
+    Generates the html radiobuttons to correct a single bubble line
+    possibly showing the existing the selected bubbles if known
+  Arguments:
+     $r           - Apache request object
+     $scan_config - hash from &get_scantron_config()
+     $quest       - number of the bubble line to make a corrector for
+     $selected    - array of letters of previously selected bubbles
+ =cut
  sub scantron_bubble_selector {
      my ($r,$scan_config,$quest,@selected)=@_;
      my $max=$$scan_config{'Qlength'};
      my $scmode=$$scan_config{'Qon'};
      if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
+     my $response = $quest-1;
+     my $lines = $bubble_lines_per_response{$response};
+     &Apache::lonnet::logthis("Question $quest, lines: $lines");
+     my $total_lines = $lines*2;
      my @alphabet=('A'..'Z');
-     $r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");
+     $r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");
-     for (my $i=0;$i<$max+1;$i++) {
- 	$r->print("\n".'<td align="center">');
+     for (my $l = 0; $l < $lines; $l++) {
- 	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
+ 	if ($l != 0) {
- 	else { $r->print('&nbsp;'); }
+ 	    $r->print('<tr>');
- 	$r->print('</td>');
+ 	}
-     }
-     $r->print('</tr><tr>');
+ 	# FIXME:  This loop probably has to be considerably more clever for
-     for (my $i=0;$i<$max;$i++) {
+ 	#  multiline bubbles: User can multibubble by having bubbles in
- 	$r->print("\n".
+ 	#  several lines.  User can skip lines legitimately etc. etc.
- 		  '<td><label><input type="radio" name="scantron_correct_Q_'.
- 		  $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
+ 	for (my $i=0;$i<$max;$i++) {
-     }
+ 	    $r->print("\n".'<td align="center">');
-     $r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
+ 	    if ($selected[0] eq $alphabet[$i]) {
+ 		$r->print('X');
+ 		shift(@selected) ;
+ 	    } else {
+ 		$r->print('&nbsp;');
+ 	    }
+ 	    $r->print('</td>');
+ 	}
+ 	if ($l == 0) {
+ 	    my $lspan = $total_lines * 2;   #  2 table rows per bubble line.
+ 	    $r->print('<td rowspan='.$lspan.'><label><input type="radio" name="scantron_correct_Q_'.
  	      $quest.'" value="none" /> No bubble </label></td>');
-     $r->print('</tr></table>');
+ 	}
+ 	$r->print('</tr><tr>');
+ 	# FIXME: This may have to be a bit more clever for
+ 	#        multiline questions (different values e.g..).
+ 	for (my $i=0;$i<$max;$i++) {
+ 	    $r->print("\n".
+ 		      '<td><label><input type="radio" name="scantron_correct_Q_'.
+ 		      $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
+ 	}
+ 	$r->print('</tr>');
+     }
+     $r->print('</table>');
  }
+ =pod
+ =item num_matches
+    Counts the number of characters that are the same between the two arguments.
+  Arguments:
+    $orig - CODE from the scanline
+    $code - CODE to match against
+  Returns:
+    $count - integer count of the number of same characters between the
+             two arguments
+ =cut
  sub num_matches {
      my ($orig,$code) = @_;
      my @code=split(//,$code);
- Line 5058  sub num_matches {
+ Line 6548  sub num_matches {
      return $same;
  }
+ =pod
+ =item scantron_get_closely_matching_CODEs
+    Cycles through all CODEs and finds the set that has the greatest
+    number of same characters as the provided CODE
+  Arguments:
+    $allcodes - hash ref returned by &get_codes()
+    $CODE     - CODE from the current scanline
+  Returns:
+element list
+     - first elements is number of how closely matching the best fit is
+       (5 means best set has 5 matching characters)
+     - second element is an arrary ref containing the set of valid CODEs
+       that best fit the passed in CODE
+ =cut
  sub scantron_get_closely_matching_CODEs {
      my ($allcodes,$CODE)=@_;
      my @CODEs;
- Line 5068  sub scantron_get_closely_matching_CODEs
+ Line 6578  sub scantron_get_closely_matching_CODEs
      return ($#CODEs,$CODEs[-1]);
  }
+ =pod
+ =item get_codes
+    Builds a hash which has keys of all of the valid CODEs from the selected
+    set of remembered CODEs.
+  Arguments:
+   $old_name - name of the set of remembered CODEs
+   $cdom     - domain of the course
+   $cnum     - internal course name
+  Returns:
+   %allcodes - keys are the valid CODEs, values are all 1
+ =cut
  sub get_codes {
      my ($old_name, $cdom, $cnum) = @_;
      if (!$old_name) {
- Line 5090  sub get_codes {
+ Line 6617  sub get_codes {
      return %allcodes;
  }
+ =pod
+ =item scantron_validate_CODE
+    Validates all scanlines in the selected file to not have any
+    invalid or underspecified CODEs and that none of the codes are
+    duplicated if this was requested.
+ =cut
  sub scantron_validate_CODE {
      my ($r,$currentphase) = @_;
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
- Line 5107  sub scantron_validate_CODE {
+ Line 6644  sub scantron_validate_CODE {
      my %allcodes=&get_codes();
+     &scantron_get_maxbubble();	# parse needs the lines per response array.
      my ($scanlines,$scan_data)=&scantron_getfile();
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
  	my $line=&scantron_get_line($scanlines,$scan_data,$i);
- Line 5141  sub scantron_validate_CODE {
+ Line 6680  sub scantron_validate_CODE {
      return (0,$currentphase+1);
  }
+ =pod
+ =item scantron_validate_doublebubble
+    Validates all scanlines in the selected file to not have any
+    bubble lines with multiple bubbles marked.
+ =cut
  sub scantron_validate_doublebubble {
      my ($r,$currentphase) = @_;
      #get student info
- Line 5150  sub scantron_validate_doublebubble {
+ Line 6698  sub scantron_validate_doublebubble {
      #get scantron line setup
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
+     &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);
  	if ($line=~/^[\s\cz]*$/) { next; }
- Line 5164  sub scantron_validate_doublebubble {
+ Line 6715  sub scantron_validate_doublebubble {
      return (0,$currentphase+1);
  }
- sub scantron_get_maxbubble {
+ =pod
-     my ($r)=@_;
+ =item scantron_get_maxbubble
+    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()
+    for what the current value of the problem counter is.
+    Caches the results to $env{'form.scantron_maxbubble'},
+    $env{'form.scantron.bubble_lines.n'} and
+    $env{'form.scantron.first_bubble_line.n'}
+    which are the total number of bubble, lines, the number of bubble
+    lines for reponse n and number of the first bubble line for response n.
+ =cut
+ sub scantron_get_maxbubble {
+     &Apache::lonnet::logthis("get_max_bubble");
      if (defined($env{'form.scantron_maxbubble'}) &&
  	$env{'form.scantron_maxbubble'}) {
+ 	&Apache::lonnet::logthis("cached");
+ 	&restore_bubble_lines();
  	return $env{'form.scantron_maxbubble'};
      }
-     my $navmap=Apache::lonnavmaps::navmap->new();
+     &Apache::lonnet::logthis("computing");
-     my (undef,undef,$sequence)=
+     my (undef, undef, $sequence) =
  	&Apache::lonnet::decode_symb($env{'form.selectpage'});
+     my $navmap=Apache::lonnavmaps::navmap->new();
      my $map=$navmap->getResourceByUrl($sequence);
      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-     &Apache::lonnet::delenv('form.counter');
+     &Apache::lonxml::clear_problem_counter();
+     my $uname       = $env{'form.student'};
+     my $udom        = $env{'form.userdom'};
+     my $cid         = $env{'request.course.id'};
+     my $total_lines = 0;
+     %bubble_lines_per_response = ();
+     %first_bubble_line         = ();
+     my $response_number = 0;
+     my $bubble_line     = 0;
      foreach my $resource (@resources) {
- 	my $result=&Apache::lonnet::ssi($resource->src().'?symb='.&Apache::lonnet::escape($resource->symb()));
+ 	my $symb = $resource->symb();
+ 	&Apache::lonxml::clear_bubble_lines_for_part();
+ 	my $result=&Apache::lonnet::ssi($resource->src(),
+ 					('symb' => $resource->symb()),
+ 					('grade_target' => 'analyze'),
+ 					('grade_courseid' => $cid),
+ 					('grade_domain' => $udom),
+ 					('grade_username' => $uname));
+ 	my (undef, $an) =
+ 	    split(/_HASH_REF__/,$result, 2);
+ 	my %analysis = &Apache::lonnet::str2hash($an);
+ 	foreach my $part_id (@{$analysis{'parts'}}) {
+ 	    my ($trash, $part) = split(/\./, $part_id);
+ 	    my $lines = $analysis{"$part_id.bubble_lines"}[0];
+ 	    # TODO - make this a persistent hash not an array.
+ 	    $first_bubble_line{$response_number}           = $bubble_line;
+ 	    $bubble_lines_per_response{$response_number}   = $lines;
+ 	    $response_number++;
+ 	    $bubble_line +=  $lines;
+ 	    $total_lines +=  $lines;
+ 	}
      }
      &Apache::lonnet::delenv('scantron\.');
-     my $envfile=$env{'user.environment'};
-     $envfile=~/\/([^\/]+)\.id$/;
+     &save_bubble_lines();
-     $envfile=$1;
+     $env{'form.scantron_maxbubble'} =
-     &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+ 	$total_lines;
- 					     $envfile);
-     $env{'form.scantron_maxbubble'}=$env{'form.counter'}-1;
      return $env{'form.scantron_maxbubble'};
  }
+ =pod
+ =item scantron_validate_missingbubbles
+    Validates all scanlines in the selected file to not have any
+     answers that don't have bubbles that have not been verified
+     to be bubble free.
+ =cut
  sub scantron_validate_missingbubbles {
      my ($r,$currentphase) = @_;
      #get student info
- Line 5221  sub scantron_validate_missingbubbles {
+ Line 6844  sub scantron_validate_missingbubbles {
      return (0,$currentphase+1);
  }
+ =pod
+ =item scantron_process_students
+    Routine that does the actual grading of the bubble sheet information.
+    The parsed scanline hash is added to %env
+    Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
+    foreach resource , with the form data of
+ 	'submitted'     =>'scantron'
+ 	'grade_target'  =>'grade',
+ 	'grade_username'=> username of student
+ 	'grade_domain'  => domain of student
+ 	'grade_courseid'=> of course
+ 	'grade_symb'    => symb of resource to grade
+     This triggers a grading pass. The problem grading code takes care
+     of converting the bubbled letter information (now in %env) into a
+     valid submission.
+ =cut
  sub scantron_process_students {
      my ($r) = @_;
      my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
-     my ($symb,$url)=&get_symb_and_url($r);
+     my ($symb)=&get_symb($r);
      if (!$symb) {return '';}
-     my $default_form_data=&defaultFormData($symb,$url);
+     my $default_form_data=&defaultFormData($symb);
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
- Line 5255  SCANTRONFORM
+ Line 6902  SCANTRONFORM
      my $start=&Time::HiRes::time();
      my $i=-1;
      my ($uname,$udom,$started);
+     &scantron_get_maxbubble();	# Need the bubble lines array to parse.
      while ($i<$scanlines->{'count'}) {
   	($uname,$udom)=('','');
   	$i++;
- Line 5279  SCANTRONFORM
+ Line 6929  SCANTRONFORM
   	    next;
   	}
    	($uname,$udom)=split(/:/,$uname);
-   	&Apache::lonnet::delenv('form.counter');
+ 	&Apache::lonxml::clear_problem_counter();
    	&Apache::lonnet::appenv(%$scan_record);
+ 	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
+ 	    &scantron_putfile($scanlines,$scan_data);
+ 	}
  	my $i=0;
  	foreach my $resource (@resources) {
- Line 5291  SCANTRONFORM
+ Line 6946  SCANTRONFORM
  		      'grade_domain'  =>$udom,
  		      'grade_courseid'=>$env{'request.course.id'},
  		      'grade_symb'    =>$resource->symb());
- 	    if (exists($scan_record->{'scantron.CODE'}) &&
+ 	    if (exists($scan_record->{'scantron.CODE'})
- 		$scan_record->{'scantron.CODE'}) {
+ 		&&
+ 		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
  		$form{'CODE'}=$scan_record->{'scantron.CODE'};
  	    } else {
  		$form{'CODE'}='';
  	    }
  	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
  	    if ($result ne '') {
- 		&Apache::lonnet::logthis("scantron grading error -> $result");
- 		&Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $env{'request.course.id'} url ".$resource->src());
  	    }
  	    if (&Apache::loncommon::connection_aborted($r)) { last; }
  	}
  	$completedstudents{$uname}={'line'=>$line};
  	if (&Apache::loncommon::connection_aborted($r)) { last; }
      } continue {
- 	&Apache::lonnet::delenv('form.counter');
+ 	&Apache::lonxml::clear_problem_counter();
  	&Apache::lonnet::delenv('scantron\.');
      }
      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- Line 5315  SCANTRONFORM
+ Line 6969  SCANTRONFORM
  #    $r->print("<p>took $lasttime</p>");
      $r->print("</form>");
-     $r->print(&show_grading_menu_form($symb,$url));
+     $r->print(&show_grading_menu_form($symb));
      return '';
  }
+ =pod
+ =item scantron_upload_scantron_data
+     Creates the screen for adding a new bubble sheet data file to a course.
+ =cut
  sub scantron_upload_scantron_data {
      my ($r)=@_;
      $r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));
- Line 5327  sub scantron_upload_scantron_data {
+ Line 6989  sub scantron_upload_scantron_data {
  							  'coursename');
      my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
  						   'domainid');
-     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+     my $default_form_data=&defaultFormData(&get_symb($r,1));
      $r->print(<<UPLOAD);
  <script type="text/javascript" language="javascript">
      function checkUpload(formname) {
- Line 5355  UPLOAD
+ Line 7017  UPLOAD
      return '';
  }
+ =pod
+ =item scantron_upload_scantron_data_save
+    Adds a provided bubble information data file to the course if user
+    has the correct privileges to do so.
+ =cut
  sub scantron_upload_scantron_data_save {
      my($r)=@_;
-     my ($symb,$url)=&get_symb_and_url($r,1);
+     my ($symb)=&get_symb($r,1);
      my $doanotherupload=
  	'<br /><form action="/adm/grades" method="post">'."\n".
  	'<input type="hidden" name="command" value="scantronupload" />'."\n".
- Line 5368  sub scantron_upload_scantron_data_save {
+ Line 7039  sub scantron_upload_scantron_data_save {
  			    $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
  	$r->print("You are not allowed to upload Scantron data to the requested course.<br />");
  	if ($symb) {
- 	    $r->print(&show_grading_menu_form($symb,$url));
+ 	    $r->print(&show_grading_menu_form($symb));
  	} else {
  	    $r->print($doanotherupload);
  	}
- Line 5393  sub scantron_upload_scantron_data_save {
+ Line 7064  sub scantron_upload_scantron_data_save {
      my $uploadedfile=$fname;
      $fname='scantron_orig_'.$fname;
      if (length($env{'form.upfile'}) < 2) {
- 	$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
+ 	$r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
      } else {
  	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
  	if ($result =~ m|^/uploaded/|) {
- 	    $r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+ 	    $r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
  	} else {
- 	    $r->print("<font color='red'>Error:</font> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
+ 	    $r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
  	}
      }
      if ($symb) {
- Line 5410  sub scantron_upload_scantron_data_save {
+ Line 7081  sub scantron_upload_scantron_data_save {
      return '';
  }
+ =pod
+ =item valid_file
+    Validates that the requested bubble data file exists in the course.
+ =cut
  sub valid_file {
      my ($requested_file)=@_;
      foreach my $filename (sort(&scantron_filenames())) {
- 	&Apache::lonnet::logthis("$requested_file  $filename");
  	if ($requested_file eq $filename) { return 1; }
      }
      return 0;
  }
+ =pod
+ =item scantron_download_scantron_data
+    Shows a list of the three internal files (original, corrected,
+    skipped) for a specific bubble sheet data file that exists in the
+    course.
+ =cut
  sub scantron_download_scantron_data {
      my ($r)=@_;
-     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+     my $default_form_data=&defaultFormData(&get_symb($r,1));
      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $file=$env{'form.scantron_selectfile'};
- Line 5431  sub scantron_download_scantron_data {
+ Line 7119  sub scantron_download_scantron_data {
  	    The requested file name was invalid.
          </p>
  ERROR
- 	$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+ 	$r->print(&show_grading_menu_form(&get_symb($r,1)));
  	return;
      }
      my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
- Line 5451  ERROR
+ Line 7139  ERROR
  	<a href="$skipped">Skipped</a>, a file of records that were skipped.
      </p>
  DOWNLOAD
-     $r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+     $r->print(&show_grading_menu_form(&get_symb($r,1)));
      return '';
  }
+ =pod
+ =back
+ =cut
  #-------- end of section for handling grading scantron forms -------
  #
  #-------------------------------------------------------------------
- Line 5463  DOWNLOAD
+ Line 7157  DOWNLOAD
  #
  #--- Show a Grading Menu button - Calls the next routine ---
  sub show_grading_menu_form {
-     my ($symb,$url)=@_;
+     my ($symb)=@_;
      my $result.='<br /><form action="/adm/grades" method="post">'."\n".
- 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
  	'<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
  	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
  	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
- Line 5486  sub savedState {
+ Line 7179  sub savedState {
      return \%savedState;
  }
- #--- Displays the main menu page -------
+ sub grading_menu {
- sub gradingmenu {
      my ($request) = @_;
-     my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb)=&get_symb($request);
      if (!$symb) {return '';}
      my $probTitle = &Apache::lonnet::gettitle($symb);
+     my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
+     #
+     # Define menu data
+     $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+     my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
+     $request->print($table);
+     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
+                   'handgrade'=>$hdgrade,
+                   'probTitle'=>$probTitle,
+                   'command'=>'submit_options',
+                   '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.'),
+                  });
+     $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.')});
+     $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.')});
+     $fields{'command'} = 'scantron_selectphase';
+     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     push (@menu, { url => $url,
+                    name => &mt('Grade Scantron Forms'),
+                    short_description =>
+             &mt('')});
+     $fields{'command'} = 'verify';
+     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     push (@menu, { url => "",
+                    jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
+                    name => &mt('Verify Receipt'),
+                    short_description =>
+             &mt('')});
+     $fields{'command'} = 'manage';
+     $url = &Apache::lonhtmlcommon::build_url('/adm/helper/resettimes.helper',\%fields);
+     push (@menu, { url => $url,
+                    name => &mt('Manage Access Times'),
+                    short_description =>
+             &mt('')});
+     $fields{'command'} = 'view';
+     $url = &Apache::lonhtmlcommon::build_url('/adm/pickcode',\%fields);
+     push (@menu, { url => $url,
+                    name => &mt('View Saved CODEs'),
+                    short_description =>
+             &mt('')});
+     #
+     # Create the menu
+     my $Str;
+     # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
+     $Str .= '<form method="post" action="" name="gradingMenu">';
+     $Str .= '<input type="hidden" name="command" value="" />'.
+     	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+ 	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
+ 	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" ue="" />'."\n".
+ 	'<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')) {
+             $Str .='    <h3><a '.
+                 $menudata->{'jscript'}.
+                 ' href="'.
+                 $menudata->{'url'}.'" >'.
+                 $menudata->{'name'}."</a></h3>\n";
+         } else {
+             $Str .='    <h3><a '.
+                 $menudata->{'jscript'}.
+                 ' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
+                 $menudata->{'name'}."</a></h3>\n";
+             $Str .= ('&nbsp;'x8).
+                     ' receipt: '.&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 .="</dl>\n";
+     $Str .="</form>\n";
      $request->print(<<GRADINGMENUJS);
  <script type="text/javascript" language="javascript">
      function checkChoice(formname,val,cmdx) {
- Line 5513  sub gradingmenu {
+ Line 7296  sub gradingmenu {
  	}
  	if (val < 7) formname.submit();
      }
+     function checkChoice2(formname,val,cmdx) {
+ 	if (val <= 2) {
+ 	    var cmd = radioSelection(formname.radioChoice);
+ 	    var cmdsave = cmd;
+ 	} else {
+ 	    cmd = cmdx;
+ 	    cmdsave = 'submission';
+ 	}
+ 	formname.command.value = cmd;
+ 	if (val < 5) formname.submit();
+ 	if (val == 5) {
+ 	    if (!checkReceiptNo(formname,'notOK')) { return false;}
+ 	    formname.submit();
+ 	}
+ 	if (val < 7) formname.submit();
+     }
      function checkReceiptNo(formname,nospace) {
  	var receiptNo = formname.receipt.value;
- Line 5530  sub gradingmenu {
+ Line 7329  sub gradingmenu {
  </script>
  GRADINGMENUJS
      &commonJSfunctions($request);
-     my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>';
+     my $result='<h3>&nbsp;<span class="LC_info">Manual Grading/View Submission</span></h3>';
-     my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
      $result.=$table;
      my (undef,$sections) = &getclasslist('all','0');
      my $savedState = &savedState();
- Line 5541  GRADINGMENUJS
+ Line 7339  GRADINGMENUJS
      my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
- 	'<input type="hidden" name="symb"        value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- 	'<input type="hidden" name="url"         value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
+ 	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" ue="" />'."\n".
+ 	'<input type="hidden" name="saveState"   value="" />'."\n".
+ 	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
+ 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
+     $result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".
+ 	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
+ 	'&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".
+ 	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
+     $result.='<table width="100%" border="0">';
+     $result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
+     $result.='<td><b>'.&mt('Sections').'</b></td>';
+ #    $result.='<td>Groups</td>';
+     $result.='<td><b>'.&mt('Access Status').'</td>'."\n";
+     $result.='</tr>';
+     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
+ 	'&nbsp;<select name="section" multiple="multiple" size="3">'."\n";
+     if (ref($sections)) {
+ 	foreach (sort (@$sections)) {
+ 	    $result.='<option value="'.$_.'" '.
+ 		($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
+ 	}
+     }
+     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
+     return $Str;
+ }
+ #--- Displays the submissions first page -------
+ sub submit_options {
+     my ($request) = @_;
+     my ($symb)=&get_symb($request);
+     if (!$symb) {return '';}
+     my $probTitle = &Apache::lonnet::gettitle($symb);
+     $request->print(<<GRADINGMENUJS);
+ <script type="text/javascript" language="javascript">
+     function checkChoice(formname,val,cmdx) {
+ 	if (val <= 2) {
+ 	    var cmd = radioSelection(formname.radioChoice);
+ 	    var cmdsave = cmd;
+ 	} else {
+ 	    cmd = cmdx;
+ 	    cmdsave = 'submission';
+ 	}
+ 	formname.command.value = cmd;
+ 	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
+ 	    ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+ 	if (val < 5) formname.submit();
+ 	if (val == 5) {
+ 	    if (!checkReceiptNo(formname,'notOK')) { return false;}
+ 	    formname.submit();
+ 	}
+ 	if (val < 7) formname.submit();
+     }
+     function checkReceiptNo(formname,nospace) {
+ 	var receiptNo = formname.receipt.value;
+ 	var checkOpt = false;
+ 	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
+ 	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
+ 	if (checkOpt) {
+ 	    alert("Please enter a receipt number given by a student in the receipt box.");
+ 	    formname.receipt.value = "";
+ 	    formname.receipt.focus();
+ 	    return false;
+ 	}
+ 	return true;
+     }
+ </script>
+ GRADINGMENUJS
+     &commonJSfunctions($request);
+     my $result='<h3>&nbsp;<span class="LC_info">Manual Grading/View Submission</span></h3>';
+     my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
+     $result.=$table;
+     my (undef,$sections) = &getclasslist('all','0');
+     my $savedState = &savedState();
+     my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
+     my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
+     my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
+     my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
+     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
+ 	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
  	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
  	'<input type="hidden" name="command"     value="" />'."\n".
- Line 5550  GRADINGMENUJS
+ Line 7433  GRADINGMENUJS
  	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
  	'<input type="hidden" name="showgrading" value="yes" />'."\n";
-     $result.='<table width="100%" border=0><tr><td bgcolor=#777777>'."\n".
+     $result.='<table border="0"><tr><td bgcolor=#777777>'."\n".
- 	'<table width=100% border=0><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
+ 	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n".
  	'&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".
  	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
-     $result.='<table width="100%" border=0>';
+     $result.='<table width="100%" border="0">';
+     $result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
+     $result.='<td><b>'.&mt('Sections').'</b></td>';
+     $result.='<td><b>'.&mt('Groups').'</b></td>';
+     $result.='<td><b>'.&mt('Access Status').'</td>'."\n";
+     $result.='</tr>';
      $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
- 	'&nbsp;'.&mt('Select Section').': <select name="section">'."\n";
+ 	'&nbsp;<select name="section" multiple="multiple" size="3">'."\n";
      if (ref($sections)) {
  	foreach (sort (@$sections)) {
  	    $result.='<option value="'.$_.'" '.
- 		($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
+ 		($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
  	}
      }
-     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select> &nbsp; ';
+     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
+     $result.= '</td><td>'."\n";
-     $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+     $result.= &Apache::lonstatistics::GroupSelect('group','multiple',3);
+     $result.='</td><td>'."\n";
+     $result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');
      $result.='</td></tr>';
-     $result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.
+     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.
  	'<input type="radio" name="radioChoice" value="submission" '.
- 	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+ 	($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
  	'</label> <select name="submitonly">'.
  	'<option value="yes" '.
- 	($saveSub eq 'yes' ? 'selected="on"' : '').'>'.&mt('with submissions').'</option>'.
+ 	($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.
  	'<option value="queued" '.
- 	($saveSub eq 'queued' ? 'selected="on"' : '').'>'.&mt('in grading queue').'</option>'.
+ 	($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>'.
  	'<option value="graded" '.
- 	($saveSub eq 'graded' ? 'selected="on"' : '').'>'.&mt('with ungraded submissions').'</option>'.
+ 	($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>'.
  	'<option value="incorrect" '.
- 	($saveSub eq 'incorrect' ? 'selected="on"' : '').'>'.&mt('with incorrect submissions').'</option>'.
+ 	($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.
  	'<option value="all" '.
- 	($saveSub eq 'all' ? 'selected="on"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
+ 	($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
-     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
  	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
- 	($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
+ 	($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
  	'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";
-     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
+     $result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
  	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
- 	($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+ 	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
  	'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
-     $result.='<tr bgcolor="#ffffe6"><td><br />'.
+     $result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.
  	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
  	'</td></tr></table>'."\n";
-     $result.='</td><td valign="top">';
+     $result.='</td>'; #<td valign="top">';
-     $result.='<table width="100%" border=0>';
+ #    $result.='<table width="100%" border="0">';
-     $result.='<tr bgcolor="#ffffe6"><td>'.
+ #    $result.='<tr bgcolor="#ffffe6"><td>'.
- 	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
+ #	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
- 	' '.&mt('scores from file').' </td></tr>'."\n";
+ #	' '.&mt('scores from file').' </td></tr>'."\n";
+ #
-     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ #    $result.='<tr bgcolor="#ffffe6"><td>'.
- 	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
+ #        '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
- 	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
+ #        ' '.&mt('clicker file').' </td></tr>'."\n";
+ #
-     if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
+ #    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- 	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ #	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
- 	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
+ #	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
- 	    ' '.&mt('receipt').': '.
+ #
- 	    &Apache::lonnet::recprefix($env{'request.course.id'}).
+ #    if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
- 	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
+ #	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- 	    '</td></tr>'."\n";
+ #	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
-     }
+ #	    ' '.&mt('receipt').': '.
-     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ #	    &Apache::lonnet::recprefix($env{'request.course.id'}).
- 	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
+ #	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
- 	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
+ #	    '</td></tr>'."\n";
-     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ #    }
- 	'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
+ #    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- 	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
+ #	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
+ #	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
-     $result.='</form></td></tr></table>'."\n".
+ #    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- 	'</td></tr></table>'."\n".
+ #	'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
- 	'</td></tr></table>'."\n";
+ #	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
+ #
+ #    $result.='</table>'."\n".'</td>';
+     $result.= '</tr></table>'."\n".
+ 	'</td></tr></table></form>'."\n";
      return $result;
  }
- Line 5653  sub init_perm {
+ Line 7547  sub init_perm {
      }
  }
+ sub gather_clicker_ids {
+     my %clicker_ids;
+     my $classlist = &Apache::loncoursedata::get_classlist();
+     # Set up a couple variables.
+     my $username_idx = &Apache::loncoursedata::CL_SNAME();
+     my $domain_idx   = &Apache::loncoursedata::CL_SDOM();
+     my $status_idx   = &Apache::loncoursedata::CL_STATUS();
+     foreach my $student (keys(%$classlist)) {
+         if ($classlist->{$student}->[$status_idx] ne 'Active') { next; }
+         my $username = $classlist->{$student}->[$username_idx];
+         my $domain   = $classlist->{$student}->[$domain_idx];
+         my $clickers =
+ 	    (&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1];
+         foreach my $id (split(/\,/,$clickers)) {
+             $id=~s/^[\#0]+//;
+             $id=~s/[\-\:]//g;
+             if (exists($clicker_ids{$id})) {
+ 		$clicker_ids{$id}.=','.$username.':'.$domain;
+             } else {
+ 		$clicker_ids{$id}=$username.':'.$domain;
+             }
+         }
+     }
+     return %clicker_ids;
+ }
+ sub gather_adv_clicker_ids {
+     my %clicker_ids;
+     my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
+     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+     foreach my $element (sort(keys(%coursepersonnel))) {
+         foreach my $person (split(/\,/,$coursepersonnel{$element})) {
+             my ($puname,$pudom)=split(/\:/,$person);
+             my $clickers =
+ 		(&Apache::lonnet::userenvironment($pudom,$puname,'clickers'))[1];
+             foreach my $id (split(/\,/,$clickers)) {
+ 		$id=~s/^[\#0]+//;
+                 $id=~s/[\-\:]//g;
+ 		if (exists($clicker_ids{$id})) {
+ 		    $clicker_ids{$id}.=','.$puname.':'.$pudom;
+ 		} else {
+ 		    $clicker_ids{$id}=$puname.':'.$pudom;
+ 		}
+             }
+         }
+     }
+     return %clicker_ids;
+ }
+ sub clicker_grading_parameters {
+     return ('gradingmechanism' => 'scalar',
+             'upfiletype' => 'scalar',
+             'specificid' => 'scalar',
+             'pcorrect' => 'scalar',
+             'pincorrect' => 'scalar');
+ }
+ sub process_clicker {
+     my ($r)=@_;
+     my ($symb)=&get_symb($r);
+     if (!$symb) {return '';}
+     my $result=&checkforfile_js();
+     $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+     my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
+     $result.=$table;
+     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
+     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
+     $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource').
+         '.</b></td></tr>'."\n";
+     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+ # Attempt to restore parameters from last session, set defaults if not present
+     my %Saveable_Parameters=&clicker_grading_parameters();
+     &Apache::loncommon::restore_course_settings('grades_clicker',
+                                                  \%Saveable_Parameters);
+     if (!$env{'form.pcorrect'}) { $env{'form.pcorrect'}=100; }
+     if (!$env{'form.pincorrect'}) { $env{'form.pincorrect'}=100; }
+     if (!$env{'form.gradingmechanism'}) { $env{'form.gradingmechanism'}='attendance'; }
+     if (!$env{'form.upfiletype'}) { $env{'form.upfiletype'}='iclicker'; }
+     my %checked;
+     foreach my $gradingmechanism ('attendance','personnel','specific') {
+        if ($env{'form.gradingmechanism'} eq $gradingmechanism) {
+           $checked{$gradingmechanism}="checked='checked'";
+        }
+     }
+     my $upload=&mt("Upload File");
+     my $type=&mt("Type");
+     my $attendance=&mt("Award points just for participation");
+     my $personnel=&mt("Correctness determined from response by course personnel");
+     my $specific=&mt("Correctness determined from response with clicker ID(s)");
+     my $pcorrect=&mt("Percentage points for correct solution");
+     my $pincorrect=&mt("Percentage points for incorrect solution");
+     my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
+ 						   ('iclicker' => 'i>clicker',
+                                                     'interwrite' => 'interwrite PRS'));
+     $symb = &Apache::lonenc::check_encrypt($symb);
+     $result.=<<ENDUPFORM;
+ <script type="text/javascript">
+ function sanitycheck() {
+ // Accept only integer percentages
+    document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
+    document.forms.gradesupload.pincorrect.value=Math.round(document.forms.gradesupload.pincorrect.value);
+ // Find out grading choice
+    for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) {
+       if (document.forms.gradesupload.gradingmechanism[i].checked) {
+          gradingchoice=document.forms.gradesupload.gradingmechanism[i].value;
+       }
+    }
+ // By default, new choice equals user selection
+    newgradingchoice=gradingchoice;
+ // Not good to give more points for false answers than correct ones
+    if (Math.round(document.forms.gradesupload.pcorrect.value)<Math.round(document.forms.gradesupload.pincorrect.value)) {
+       document.forms.gradesupload.pcorrect.value=document.forms.gradesupload.pincorrect.value;
+    }
+ // If new choice is attendance only, and old choice was correctness-based, restore defaults
+    if ((gradingchoice=='attendance') && (document.forms.gradesupload.waschecked.value!='attendance')) {
+       document.forms.gradesupload.pcorrect.value=100;
+       document.forms.gradesupload.pincorrect.value=100;
+    }
+ // If the values are different, cannot be attendance only
+    if ((Math.round(document.forms.gradesupload.pcorrect.value)!=Math.round(document.forms.gradesupload.pincorrect.value)) &&
+        (gradingchoice=='attendance')) {
+        newgradingchoice='personnel';
+    }
+ // Change grading choice to new one
+    for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) {
+       if (document.forms.gradesupload.gradingmechanism[i].value==newgradingchoice) {
+          document.forms.gradesupload.gradingmechanism[i].checked=true;
+       } else {
+          document.forms.gradesupload.gradingmechanism[i].checked=false;
+       }
+    }
+ // Remember the old state
+    document.forms.gradesupload.waschecked.value=newgradingchoice;
+ }
+ </script>
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+ <input type="hidden" name="symb" value="$symb" />
+ <input type="hidden" name="command" value="processclickerfile" />
+ <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
+ <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
+ <input type="file" name="upfile" size="50" />
+ <br /><label>$type: $selectform</label>
+ <br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
+ <br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
+ <br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
+ <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
+ <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
+ <br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>
+ <br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label>
+ <br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
+ </form>
+ ENDUPFORM
+     $result.='</td></tr></table>'."\n".
+              '</td></tr></table><br /><br />'."\n";
+     $result.=&show_grading_menu_form($symb);
+     return $result;
+ }
+ sub process_clicker_file {
+     my ($r)=@_;
+     my ($symb)=&get_symb($r);
+     if (!$symb) {return '';}
+     my %Saveable_Parameters=&clicker_grading_parameters();
+     &Apache::loncommon::store_course_settings('grades_clicker',
+                                               \%Saveable_Parameters);
+     my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+     if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
+ 	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
+ 	return $result.&show_grading_menu_form($symb);
+     }
+     my %clicker_ids=&gather_clicker_ids();
+     my %correct_ids;
+     if ($env{'form.gradingmechanism'} eq 'personnel') {
+ 	%correct_ids=&gather_adv_clicker_ids();
+     }
+     if ($env{'form.gradingmechanism'} eq 'specific') {
+ 	foreach my $correct_id (split(/[\s\,]/,$env{'form.specificid'})) {;
+ 	   $correct_id=~tr/a-z/A-Z/;
+ 	   $correct_id=~s/\s//gs;
+ 	   $correct_id=~s/^[\#0]+//;
+            $correct_id=~s/[\-\:]//g;
+            if ($correct_id) {
+ 	      $correct_ids{$correct_id}='specified';
+            }
+         }
+     }
+     if ($env{'form.gradingmechanism'} eq 'attendance') {
+ 	$result.=&mt('Score based on attendance only');
+     } else {
+ 	my $number=0;
+ 	$result.='<p><b>'.&mt('Correctness determined by the following IDs').'</b>';
+ 	foreach my $id (sort(keys(%correct_ids))) {
+ 	    $result.='<br /><tt>'.$id.'</tt> - ';
+ 	    if ($correct_ids{$id} eq 'specified') {
+ 		$result.=&mt('specified');
+ 	    } else {
+ 		my ($uname,$udom)=split(/\:/,$correct_ids{$id});
+ 		$result.=&Apache::loncommon::plainname($uname,$udom);
+ 	    }
+ 	    $number++;
+ 	}
+         $result.="</p>\n";
+ 	if ($number==0) {
+ 	    $result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
+ 	    return $result.&show_grading_menu_form($symb);
+ 	}
+     }
+     if (length($env{'form.upfile'}) < 2) {
+         $result.=&mt('[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.',
+ 		     '<span class="LC_error">',
+ 		     '</span>',
+ 		     '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>');
+         return $result.&show_grading_menu_form($symb);
+     }
+ # Were able to get all the info needed, now analyze the file
+     $result.=&Apache::loncommon::studentbrowser_javascript();
+     $symb = &Apache::lonenc::check_encrypt($symb);
+     my $heading=&mt('Scanning clicker file');
+     $result.=(<<ENDHEADER);
+ <br /><table width="100%" border="0"><tr><td bgcolor="#777777">
+ <table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
+ <b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>
+ <form method="post" action="/adm/grades" name="clickeranalysis">
+ <input type="hidden" name="symb" value="$symb" />
+ <input type="hidden" name="command" value="assignclickergrades" />
+ <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
+ <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
+ <input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />
+ <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
+ <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />
+ ENDHEADER
+     my %responses;
+     my @questiontitles;
+     my $errormsg='';
+     my $number=0;
+     if ($env{'form.upfiletype'} eq 'iclicker') {
+ 	($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
+     }
+     if ($env{'form.upfiletype'} eq 'interwrite') {
+         ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
+     }
+     $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
+              '<input type="hidden" name="number" value="'.$number.'" />'.
+              &mt('Awarding [_1] percent for corrion(s)',$number).'<br />'.
+              '<input type="hidden" name="number" value="'.$number.'" />'.
+              &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
+                  $env{'form.pcorrect'},$env{'form.pincorrect'}).
+              '<br />';
+ # Remember Question Titles
+ # FIXME: Possibly need delimiter other than ":"
+     for (my $i=0;$i<$number;$i++) {
+         $result.='<input type="hidden" name="question:'.$i.'" value="'.
+                  &HTML::Entities::encode($questiontitles[$i],'"&<>').'" />';
+     }
+     my $correct_count=0;
+     my $student_count=0;
+     my $unknown_count=0;
+ # Match answers with usernames
+ # FIXME: Possibly need delimiter other than ":"
+     foreach my $id (keys(%responses)) {
+        if ($correct_ids{$id}) {
+           $result.="\n".'<input type="hidden" name="correct:'.$correct_count.':'.$correct_ids{$id}.'" value="'.$responses{$id}.'" />';
+           $correct_count++;
+        } elsif ($clicker_ids{$id}) {
+           if ($clicker_ids{$id}=~/\,/) {
+ # More than one user with the same clicker!
+              $result.="\n<hr />".&mt('Clicker registered more than once').": <tt>".$id."</tt><br />";
+              $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
+                            "<select name='multi".$id."'>";
+              foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {
+                  $result.="<option value='".$reguser."'>".&Apache::loncommon::plainname(split(/\:/,$reguser)).' ('.$reguser.')</option>';
+              }
+              $result.='</select>';
+              $unknown_count++;
+           } else {
+ # Good: found one and only one user with the right clicker
+              $result.="\n".'<input type="hidden" name="student:'.$clicker_ids{$id}.'" value="'.$responses{$id}.'" />';
+              $student_count++;
+           }
+        } else {
+           $result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
+           $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
+                    "\n".&mt("Username").": <input type='text' name='uname".$id."' />&nbsp;".
+                    "\n".&mt("Domain").": ".
+                    &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).'&nbsp;'.
+                    &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id);
+           $unknown_count++;
+        }
+     }
+     $result.='<hr />'.
+              &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count);
+     if ($env{'form.gradingmechanism'} ne 'attendance') {
+        if ($correct_count==0) {
+           $errormsg.="Found no correct answers answers for grading!";
+        } elsif ($correct_count>1) {
+           $result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>';
+        }
+     }
+     if ($number<1) {
+        $errormsg.="Found no questions.";
+     }
+     if ($errormsg) {
+        $result.='<br /><span class="LC_error">'.&mt($errormsg).'</span>';
+     } else {
+        $result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';
+     }
+     $result.='</form></td></tr></table>'."\n".
+              '</td></tr></table><br /><br />'."\n";
+     return $result.&show_grading_menu_form($symb);
+ }
+ sub iclicker_eval {
+     my ($questiontitles,$responses)=@_;
+     my $number=0;
+     my $errormsg='';
+     foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
+         my %components=&Apache::loncommon::record_sep($line);
+         my @entries=map {$components{$_}} (sort(keys(%components)));
+ 	if ($entries[0] eq 'Question') {
+ 	    for (my $i=3;$i<$#entries;$i+=6) {
+ 		$$questiontitles[$number]=$entries[$i];
+ 		$number++;
+ 	    }
+ 	}
+ 	if ($entries[0]=~/^\#/) {
+ 	    my $id=$entries[0];
+ 	    my @idresponses;
+ 	    $id=~s/^[\#0]+//;
+ 	    for (my $i=0;$i<$number;$i++) {
+ 		my $idx=3+$i*6;
+ 		push(@idresponses,$entries[$idx]);
+ 	    }
+ 	    $$responses{$id}=join(',',@idresponses);
+ 	}
+     }
+     return ($errormsg,$number);
+ }
+ sub interwrite_eval {
+     my ($questiontitles,$responses)=@_;
+     my $number=0;
+     my $errormsg='';
+     my $skipline=1;
+     my $questionnumber=0;
+     my %idresponses=();
+     foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
+         my %components=&Apache::loncommon::record_sep($line);
+         my @entries=map {$components{$_}} (sort(keys(%components)));
+         if ($entries[1] eq 'Time') { $skipline=0; next; }
+         if ($entries[1] eq 'Response') { $skipline=1; }
+         next if $skipline;
+         if ($entries[0]!=$questionnumber) {
+            $questionnumber=$entries[0];
+            $$questiontitles[$number]=&mt('Question [_1]',$questionnumber);
+            $number++;
+         }
+         my $id=$entries[4];
+         $id=~s/^[\#0]+//;
+         $id=~s/^v\d*\://i;
+         $id=~s/[\-\:]//g;
+         $idresponses{$id}[$number]=$entries[6];
+     }
+     foreach my $id (keys %idresponses) {
+        $$responses{$id}=join(',',@{$idresponses{$id}});
+        $$responses{$id}=~s/^\s*\,//;
+     }
+     return ($errormsg,$number);
+ }
+ sub assign_clicker_grades {
+     my ($r)=@_;
+     my ($symb)=&get_symb($r);
+     if (!$symb) {return '';}
+ # See which part we are saving to
+     my ($partlist,$handgrade,$responseType) = &response_type($symb);
+ # FIXME: This should probably look for the first handgradeable part
+     my $part=$$partlist[0];
+ # Start screen output
+     my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+     my $heading=&mt('Assigning grades based on clicker file');
+     $result.=(<<ENDHEADER);
+ <br /><table width="100%" border="0"><tr><td bgcolor="#777777">
+ <table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
+ <b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>
+ ENDHEADER
+ # Get correct result
+ # FIXME: Possibly need delimiter other than ":"
+     my @correct=();
+     my $gradingmechanism=$env{'form.gradingmechanism'};
+     my $number=$env{'form.number'};
+     if ($gradingmechanism ne 'attendance') {
+        foreach my $key (keys(%env)) {
+           if ($key=~/^form\.correct\:/) {
+              my @input=split(/\,/,$env{$key});
+              for (my $i=0;$i<=$#input;$i++) {
+                  if (($correct[$i]) && ($input[$i]) &&
+                      ($correct[$i] ne $input[$i])) {
+                     $result.='<br /><span class="LC_warning">'.
+                              &mt('More than one correct result given for question "[_1]": [_2] versus [_3].',
+                                  $env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>';
+                  } elsif ($input[$i]) {
+                     $correct[$i]=$input[$i];
+                  }
+              }
+           }
+        }
+        for (my $i=0;$i<$number;$i++) {
+           if (!$correct[$i]) {
+              $result.='<br /><span class="LC_error">'.
+                       &mt('No correct result given for question "[_1]"!',
+                           $env{'form.question:'.$i}).'</span>';
+           }
+        }
+        $result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ($_?$_:'-') } @correct));
+     }
+ # Start grading
+     my $pcorrect=$env{'form.pcorrect'};
+     my $pincorrect=$env{'form.pincorrect'};
+     my $storecount=0;
+     foreach my $key (keys(%env)) {
+        my $user='';
+        if ($key=~/^form\.student\:(.*)$/) {
+           $user=$1;
+        }
+        if ($key=~/^form\.unknown\:(.*)$/) {
+           my $id=$1;
+           if (($env{'form.uname'.$id}) && ($env{'form.udom'.$id})) {
+              $user=$env{'form.uname'.$id}.':'.$env{'form.udom'.$id};
+           } elsif ($env{'form.multi'.$id}) {
+              $user=$env{'form.multi'.$id};
+           }
+        }
+        if ($user) {
+           my @answer=split(/\,/,$env{$key});
+           my $sum=0;
+           for (my $i=0;$i<$number;$i++) {
+              if ($answer[$i]) {
+                 if ($gradingmechanism eq 'attendance') {
+                    $sum+=$pcorrect;
+                 } else {
+                    if ($answer[$i] eq $correct[$i]) {
+                       $sum+=$pcorrect;
+                    } else {
+                       $sum+=$pincorrect;
+                    }
+                 }
+              }
+           }
+           my $ave=$sum/(100*$number);
+ # Store
+           my ($username,$domain)=split(/\:/,$user);
+           my %grades=();
+           $grades{"resource.$part.solved"}='correct_by_override';
+           $grades{"resource.$part.awarded"}=$ave;
+           $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+           my $returncode=&Apache::lonnet::cstore(\%grades,$symb,
+                                                  $env{'request.course.id'},
+                                                  $domain,$username);
+           if ($returncode ne 'ok') {
+              $result.="<br /><span class=\"LC_error\">Failed to save student $username:$domain. Message when trying to save was ($returncode)</span>";
+           } else {
+              $storecount++;
+           }
+        }
+     }
+ # We are done
+     $result.='<br />'.&mt('Successfully stored grades for [_1] student(s).',$storecount).
+              '</td></tr></table>'."\n".
+              '</td></tr></table><br /><br />'."\n";
+     return $result.&show_grading_menu_form($symb);
+ }
  sub handler {
      my $request=$_[0];
-     &reset_perm();
+     &reset_caches();
      if ($env{'browser.mathml'}) {
  	&Apache::loncommon::content_type($request,'text/xml');
      } else {
- Line 5665  sub handler {
+ Line 8042  sub handler {
      $request->send_http_header;
      return '' if $request->header_only;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-     my $url=$env{'form.url'};
+     my $symb=&get_symb($request,1);
-     my $symb=$env{'form.symb'};
      my @commands=&Apache::loncommon::get_env_multiple('form.command');
      my $command=$commands[0];
      if ($#commands > 0) {
  	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
      }
-     if (!$url) {
- 	my ($temp1,$temp2);
- 	($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
+     $request->print(&Apache::loncommon::start_page('Grading'));
- 	$url = $env{'form.url'};
+     if ($symb eq '' && $command eq '') {
-     }
-     &send_header($request);
-     if ($url eq '' && $symb eq '' && $command eq '') {
  	if ($env{'user.adv'}) {
  	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
  		($env{'form.codethree'})) {
- Line 5717  sub handler {
+ Line 8091  sub handler {
  	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
  	    &processGroup($request);
  	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
- 	    $request->print(&gradingmenu($request));
+ 	    $request->print(&grading_menu($request));
+ 	} elsif ($command eq 'submit_options' && $perm{'vgr'}) {
+ 	    $request->print(&submit_options($request));
  	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
  	    $request->print(&viewgrades($request));
  	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
- Line 5726  sub handler {
+ Line 8102  sub handler {
  	    $request->print(&editgrades($request));
  	} elsif ($command eq 'verify' && $perm{'vgr'}) {
  	    $request->print(&verifyreceipt($request));
+         } elsif ($command eq 'processclicker' && $perm{'mgr'}) {
+             $request->print(&process_clicker($request));
+         } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
+             $request->print(&process_clicker_file($request));
+         } elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {
+             $request->print(&assign_clicker_grades($request));
  	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
  	    $request->print(&upcsvScores_form($request));
  	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
- Line 5746  sub handler {
+ Line 8128  sub handler {
  	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
  	    $request->print(&csvuploadassign($request));
  	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
+ 	    &Apache::lonnet::logthis("Selecting pyhase");
  	    $request->print(&scantron_selectphase($request));
   	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
   	    $request->print(&scantron_do_warning($request));
- Line 5768  sub handler {
+ Line 8151  sub handler {
  	    $request->print("Access Denied ($command)");
  	}
      }
-     &send_footer($request);
+     $request->print(&Apache::loncommon::end_page());
+     &reset_caches();
      return '';
  }
- sub send_header {
-     my ($request)= @_;
-     $request->print(&Apache::lontexconvert::header());
- #  $request->print("
- #<script>
- #remotewindow=open('','homeworkremote');
- #remotewindow.close();
- #</script>");
-     $request->print(&Apache::loncommon::bodytag('Grading'));
-     $request->rflush();
- }
- sub send_footer {
-     my ($request)= @_;
-     $request->print('</body></html>');
- }
 ;
  __END__;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.302.2.3
changed lines
	Added in v.1.452