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.130.2.1.2.9 and 1.323

-version 1.130.2.1.2.9, 2003/10/14 00:05:16
+version 1.323, 2006/02/28 02:47:30
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # 2/9,2/13 Guy Albertelli
- # 6/8 Gerd Kortemeyer
- # 7/26 H.K. Ng
- # 8/20 Gerd Kortemeyer
- # Year 2002
- # June-August H.K. Ng
- # Year 2003
- # February, March H.K. Ng
- # July, H. K. Ng
- #
  package Apache::grades;
  use strict;
- Line 48  use Apache::lonhomework;
+ Line 38  use Apache::lonhomework;
  use Apache::loncoursedata;
  use Apache::lonmsg qw(:user_normal_msg);
  use Apache::Constants qw(:common);
+ use Apache::lonlocal;
  use String::Similarity;
+ use POSIX qw(floor);
  my %oldessays=();
  my %perm=();
  # ----- These first few routines are general use routines.----
  #
- # --- Retrieve the parts that matches stores_\d+ from the metadata file.---
+ # --- Retrieve the parts from the metadata file.---
  sub getpartlist {
-     my ($url) = @_;
+     my ($url,$symb) = @_;
-     my @parts =();
+     my $partorder = &Apache::lonnet::metadata($url, 'partorder');
-     my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+     my @parts;
-     foreach my $key (@metakeys) {
+     if ($partorder) {
- 	if ( $key =~ m/stores_(\w+)_.*/) {
+ 	for my $part (split (/,/,$partorder)) {
- 	    push(@parts,$key);
+ 	    if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
+ 		push(@parts, $part);
+ 	    }
+ 	}
+     } 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) {
+ 	my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+ 	foreach my $key (@metakeys) {
+ 	    if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
  	}
      }
-     return @parts;
+     return @stores;
  }
  # --- Get the symbolic name of a problem and the url
  sub get_symb_and_url {
-     my ($request) = @_;
+     my ($request,$silent) = @_;
-     (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+     (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)));
+     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
-     if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
+     if ($symb eq '') {
-     return ($symb,$url);
+ 	if (!$silent) {
- }
+ 	    $request->print("Unable to handle ambiguous references:$url:.");
+ 	    return ();
- # --- Retrieve the fullname for a user. Return lastname, first middle ---
+ 	}
- # --- Generation is attached next to the lastname if it exists. ---
- sub get_fullname {
-     my ($uname,$udom) = @_;
-     my %name=&Apache::lonnet::get('environment', ['lastname','generation',
- 						  'firstname','middlename'],
-                                   $udom,$uname);
-     my $fullname;
-     my ($tmp) = keys(%name);
-     if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-         $fullname = &Apache::loncoursedata::ProcessFullName
-             (@name{qw/lastname generation firstname middlename/});
-     } else {
-         &Apache::lonnet::logthis('grades.pm: no name data for '.$uname.
-                                  '@'.$udom.':'.$tmp);
      }
-     return $fullname;
+     return ($symb,$url);
  }
  #--- Format fullname, username:domain if different for display
- Line 101  sub get_fullname {
+ Line 97  sub get_fullname {
  sub nameUserString {
      my ($type,$fullname,$uname,$udom) = @_;
      if ($type eq 'header') {
- 	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>&nbsp;';
+ 	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>';
      } else {
  	return '&nbsp;'.$fullname.'<font color="#999999">&nbsp;('.$uname.
- 	    ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+ 	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
      }
  }
- Line 112  sub nameUserString {
+ Line 108  sub nameUserString {
  #--- Indicate if a response type is coded handgraded or not. ---
  sub response_type {
      my ($url,$symb) = shift;
-     $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
+     $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
      my $allkeys = &Apache::lonnet::metadata($url,'keys');
+     my %vPart;
+     foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+ 	$vPart{$partid}=1;
+     }
      my %seen = ();
-     my (@partlist,%handgrade);
+     my (@partlist,%handgrade,%responseType);
      foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
- 	if (/^\w+response_\w+.*/) {
+ 	if (/^\w+response_.*/) {
  	    my ($responsetype,$part) = split(/_/,$_,2);
  	    my ($partid,$respid) = split(/_/,$part);
+ 	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
+ 		next;
+ 	    }
+ 	    if (%vPart && !exists($vPart{$partid})) {
+ 		next;
+ 	    }
  	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
  	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
- 	    $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no');
+ 	    $handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no');
+ 	    if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
+ 	    $responseType{$partid}->{$respid}=$responsetype;
  	    next if ($seen{$partid} > 0);
  	    $seen{$partid}++;
  	    push @partlist,$partid;
  	}
      }
-     return \@partlist,\%handgrade;
+     return \@partlist,\%handgrade,\%responseType;
+ }
+ sub get_display_part {
+     my ($partID,$url,$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>)";
+     } else {
+ 	$display=$partID;
+     }
+     return $display;
  }
  #--- Show resource title
  #--- and parts and response type
  sub showResourceInfo {
-     my ($url,$probTitle) = @_;
+     my ($url,$probTitle,$checkboxes) = @_;
+     my $col=3;
+     if ($checkboxes) { $col=4; }
      my $result ='<table border="0">'.
- 	'<tr><td colspan=3><font size=+1><b>Current Resource: </b>'.$probTitle.'</font></td></tr>'."\n";
+ 	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
-     my ($partlist,$handgrade) = &response_type($url);
+ 	$probTitle.'</font></td></tr>'."\n";
+     my ($partlist,$handgrade,$responseType) = &response_type($url);
      my %resptype = ();
      my $hdgrade='no';
-     for (sort keys(%$handgrade)) {
+     my %partsseen;
- 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+     for my $part_resID (sort keys(%$handgrade)) {
- 	my $partID = (split(/_/))[0];
+ 	my $handgrade=$$handgrade{$part_resID};
- 	$resptype{$partID} = $responsetype;
+ 	my ($partID,$resID) = split(/_/,$part_resID);
+ 	my $responsetype = $responseType->{$partID}->{$resID};
  	$hdgrade = $handgrade if ($handgrade eq 'yes');
- 	$result.='<tr><td><b>Part </b>'.$partID.'</td>'.
+ 	$result.='<tr>';
+ 	if ($checkboxes) {
+ 	    if (exists($partsseen{$partID})) {
+ 		$result.="<td>&nbsp;</td>";
+ 	    } else {
+ 		$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>";
+ 	    }
+ 	    $partsseen{$partID}=1;
+ 	}
+ 	my $display_part=&get_display_part($partID,$url);
+ 	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
+ 	    $resID.'</font></td>'.
  	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
  #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
      }
      $result.='</table>'."\n";
-     return $result,\%resptype,$hdgrade,$partlist,$handgrade;
+     return $result,$responseType,$hdgrade,$partlist,$handgrade;
  }
+ sub get_order {
+     my ($partid,$respid,$symb,$uname,$udom)=@_;
+     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+     $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{"$partid.$respid.shown"});
+ }
  #--- Clean response type for display
- #--- Currently filters option response type only.
+ #--- Currently filters option/rank/radiobutton/match/essay response types only.
  sub cleanRecord {
-     my ($answer,$response,$symb) = @_;
+     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
-     if ($response eq 'option') {
+     my $grayFont = '<font color="#999999">';
- 	my (@IDs,@ans);
+     if ($response =~ /^(option|rank)$/) {
- 	foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
+ 	my %answer=&Apache::lonnet::str2hash($answer);
- 	    my ($optionID,$ans) = split(/=/);
+ 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
- 	    push @IDs,$optionID.'</font>';
+ 	my ($toprow,$bottomrow);
- 	    push @ans,$ans;
+ 	foreach my $foil (@$order) {
+ 	    if ($grading{$foil} == 1) {
+ 		$toprow.='<td><b>'.$answer{$foil}.'&nbsp;</b></td>';
+ 	    } else {
+ 		$toprow.='<td><i>'.$answer{$foil}.'&nbsp;</i></td>';
+ 	    }
+ 	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
  	}
- 	my $grayFont = '<font color="#999999">';
  	return '<blockquote><table border="1">'.
- 	    '<tr valign="top"><td>Answer</td><td>'.
+ 	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- 	    (join '</td><td>',@ans).'</td></tr>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
- 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td><td>'.$grayFont.
+ 	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
- 	    (join '</td><td>'.$grayFont,@IDs).'</font></td></tr>'.
+     } elsif ($response eq 'match') {
- 	    '</table></blockquote>';
+ 	my %answer=&Apache::lonnet::str2hash($answer);
-     }
+ 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
-     if ($response eq 'essay') {
+ 	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
- 	if (! exists ($ENV{'form.'.$symb})) {
+ 	my ($toprow,$middlerow,$bottomrow);
+ 	foreach my $foil (@$order) {
+ 	    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>';
+ 	    } else {
+ 		$toprow.='<td><i>'.$item.'&nbsp;</i></td>';
+ 		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</font></i></td>';
+ 	    }
+ 	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+ 	}
+ 	return '<blockquote><table border="1">'.
+ 	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.
+ 	    $middlerow.'</tr>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ 	    $bottomrow.'</tr>'.'</table></blockquote>';
+     } elsif ($response eq 'radiobutton') {
+ 	my %answer=&Apache::lonnet::str2hash($answer);
+ 	my ($toprow,$bottomrow);
+ 	my $correct=($order->[0])+1;
+ 	for (my $i=1;$i<=$#$order;$i++) {
+ 	    my $foil=$order->[$i];
+ 	    if (exists($answer{$foil})) {
+ 		if ($i == $correct) {
+ 		    $toprow.='<td><b>true</b></td>';
+ 		} else {
+ 		    $toprow.='<td><i>true</i></td>';
+ 		}
+ 	    } else {
+ 		$toprow.='<td>false</td>';
+ 	    }
+ 	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+ 	}
+ 	return '<blockquote><table border="1">'.
+ 	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+ 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ 	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+     } elsif ($response eq 'essay') {
+ 	if (! exists ($env{'form.'.$symb})) {
  	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
- 						  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 						  $env{'course.'.$env{'request.course.id'}.'.domain'},
- 						  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ 						  $env{'course.'.$env{'request.course.id'}.'.num'});
- 	    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ 	    my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
- 	    $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+ 	    $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
- 	    $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+ 	    $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
- 	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+ 	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
- 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
+ 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
- 	    $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
+ 	    $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
  	}
- 	return '<br /><br /><blockquote>'.&keywords_highlight($answer).'</blockquote>';
+ 	$answer =~ s-\n-<br />-g;
+ 	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
+     } elsif ( $response eq 'organic') {
+ 	my $result='Smile representation: "<tt>'.$answer.'</tt>"';
+ 	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
+ 	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
+ 	return $result;
      }
      return $answer;
  }
- Line 218  sub commonJSfunctions {
+ Line 323  sub commonJSfunctions {
  		}
  	    }
  	} else {
- 	    if (selectOne.selected) return selectOne.value;
+             // only one value it must be the selected one
+ 	    return selectOne.value;
  	}
      }
  </script>
- Line 229  COMMONJSFUNCTIONS
+ Line 335  COMMONJSFUNCTIONS
  #--- section, ids and fullnames for each user.
  sub getclasslist {
      my ($getsec,$filterlist) = @_;
-     $getsec = $getsec eq '' ? 'all' : $getsec;
+     my @getsec;
+     if (!ref($getsec)) {
+ 	if ($getsec ne '' && $getsec ne 'all') {
+ 	    @getsec=($getsec);
+ 	}
+     } else {
+ 	@getsec=@{$getsec};
+     }
+     if (grep(/^all$/,@getsec)) { undef(@getsec); }
      my $classlist=&Apache::loncoursedata::get_classlist();
      # Bail out if we were unable to get the classlist
      return if (! defined($classlist));
      #
      my %sections;
      my %fullnames;
-     foreach (keys(%$classlist)) {
+     foreach my $student (keys(%$classlist)) {
-         # the following undefs are for 'domain', and 'username' respectively.
+         my $end      =
- 	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
+             $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
-             @{$classlist->{$_}};
+         my $start    =
+             $classlist->{$student}->[&Apache::loncoursedata::CL_START()];
+         my $id       =
+             $classlist->{$student}->[&Apache::loncoursedata::CL_ID()];
+         my $section  =
+             $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
+         my $fullname =
+             $classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
+         my $status   =
+             $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
  	# filter students according to status selected
- 	if ($filterlist && $ENV{'form.Status'} ne 'Any') {
+ 	if ($filterlist && $env{'form.Status'} ne 'Any') {
- 	    if ($ENV{'form.Status'} ne $status) {
+ 	    if ($env{'form.Status'} ne $status) {
- 		delete ($classlist->{$_});
+ 		delete ($classlist->{$student});
  		next;
  	    }
  	}
- 	$section = ($section ne '' ? $section : 'no');
+ 	$section = ($section ne '' ? $section : 'none');
  	if (&canview($section)) {
- 	    if ($getsec eq 'all' || $getsec eq $section) {
+ 	    if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
  		$sections{$section}++;
- 		$fullnames{$_}=$fullname;
+ 		$fullnames{$student}=$fullname;
  	    } else {
- 		delete($classlist->{$_});
+ 		delete($classlist->{$student});
  	    }
  	} else {
- 	    delete($classlist->{$_});
+ 	    delete($classlist->{$student});
  	}
      }
      my %seen = ();
- Line 307  sub canview {
+ Line 431  sub canview {
  #--- Retrieve the grade status of a student for all the parts
  sub student_gradeStatus {
      my ($url,$symb,$udom,$uname,$partlist) = @_;
-     my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+     my %record     = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
      my %partstatus = ();
      foreach (@$partlist) {
  	my ($status,undef)   = split(/_/,$record{"resource.$_.solved"},2);
- Line 334  sub jscriptNform {
+ Line 458  sub jscriptNform {
      $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\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="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
- 	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\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="'.$env{'form.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 344  sub jscriptNform {
+ Line 468  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 357  sub most_similar {
+ Line 508  sub most_similar {
      $uessay=~s/\W+/ /gs;
+ # ignore empty submissions (occuring when only files are sent)
+     unless ($uessay=~/\w+/) { return ''; }
  # these will be returned. Do not care if not at least 50 percent similar
      my $limit=0.6;
      my $sname='';
- Line 397  sub most_similar {
+ Line 552  sub most_similar {
  sub verifyreceipt {
      my $request  = shift;
-     my $courseid = $ENV{'request.course.id'};
+     my $courseid = $env{'request.course.id'};
-     my $receipt  = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
+     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
- 	$ENV{'form.receipt'};
+ 	$env{'form.receipt'};
      $receipt     =~ s/[^\-\d]//g;
-     my $url      = $ENV{'form.url'};
+     my $url      = $env{'form.url'};
-     my $symb     = $ENV{'form.symb'};
+     my $symb     = $env{'form.symb'};
      unless ($symb) {
  	$symb    = &Apache::lonnet::symbread($url);
      }
      my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
  	$receipt.'</h3></font>'."\n".
- 	'<font size=+1><b>Resource: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
+ 	'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br><br>'."\n";
      my ($string,$contents,$matches) = ('','',0);
      my (undef,undef,$fullname) = &getclasslist('all','0');
-     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+     my $receiptparts=0;
+     if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+     my $parts=['0'];
+     if ($receiptparts) { ($parts)=&response_type($url,$symb); }
+     foreach (sort
+ 	     {
+ 		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ 		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ 		 }
+ 		 return $a cmp $b;
+ 	     } (keys(%$fullname))) {
  	my ($uname,$udom)=split(/\:/);
- 	if ($receipt eq
+ 	foreach my $part (@$parts) {
- 	    &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
+ 	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
- 	    $contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
+ 		$contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
- 		'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
+ 		    '<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;'.$uname.'&nbsp;</td>'.
- 		'<td>&nbsp;'.$udom.'&nbsp;</td></tr>'."\n";
+ 		    '<td>&nbsp;'.$udom.'&nbsp;</td>';
+ 		if ($receiptparts) {
- 	    $matches++;
+ 		    $contents.='<td>&nbsp;'.$part.'&nbsp;</td>';
+ 		}
+ 		$contents.='</tr>'."\n";
+ 		$matches++;
+ 	    }
  	}
      }
      if ($matches == 0) {
- Line 437  sub verifyreceipt {
+ Line 607  sub verifyreceipt {
  	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
  	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
  	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
- 	    '<td><b>&nbsp;Domain&nbsp;</b></td></tr>'."\n".
+ 	    '<td><b>&nbsp;Domain&nbsp;</b></td>';
- 	    $contents.
+ 	if ($receiptparts) {
+ 	    $string.='<td>&nbsp;Problem Part&nbsp;</td>';
+ 	}
+ 	$string.='</tr>'."\n".$contents.
  	    '</table></td></tr></table>'."\n";
      }
      return $string.&show_grading_menu_form($symb,$url);
- Line 452  sub listStudents {
+ Line 625  sub listStudents {
      my ($request) = shift;
      my ($symb,$url) = &get_symb_and_url($request);
-     my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
+     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
-     my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
+     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
-     my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
-     my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
+     my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
-     my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
+     my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
-     $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
+     $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
- 	&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
+ 	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
      my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
  	' Submissions for a Student or a Group of Students</font></h3>';
-     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
-     $result.=$table;
      $request->print(<<LISTJAVASCRIPT);
  <script type="text/javascript" language="javascript">
- Line 503  LISTJAVASCRIPT
+ Line 675  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' : '';
      my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
-     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
+     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
- 	'&nbsp;<b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+ 	"\n".$table.
- 	'<input type="radio" name="vProb" value="yes" /> one student '."\n".
+ 	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
- 	'<input type="radio" name="vProb" value="all" /> all students <br />'."\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".
  	'&nbsp;<b>Submissions: </b>'."\n";
-     if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
+     if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
- 	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
+ 	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
      }
-     my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
+     my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};
-     $ENV{'form.Status'} = $saveStatus;
+     $env{'form.Status'} = $saveStatus;
-     $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
+     $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
- 	'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+ 	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
- 	'<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
+ 	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
- 	'<input type="radio" name="lastSub" value="all" /> all details'."\n".
+ 	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".
  	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
  	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
- 	'<input type="hidden" name="handgrade"   value="'.$ENV{'form.handgrade'}.'" /><br />'."\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="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
- 	'<input type="hidden" name="saveState"   value="'.$ENV{'form.saveState'}.'" />'."\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="probTitle"   value="'.$env{'form.probTitle'}.'" />'."\n".
  	'<input type="hidden" name="url"  value="'.$url.'" />'."\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'})) {
+     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="'.$env{'form.Status'}.'" />'."\n";
      } else {
  	$gradeTable.='<b>Student Status:</b> '.
  	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
- Line 541  LISTJAVASCRIPT
+ Line 717  LISTJAVASCRIPT
      $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
  	'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
  	'<input type="hidden" name="command" value="processGroup" />'."\n";
+ # checkall buttons
+     $gradeTable.=&check_script('gradesub', 'stuinfo');
      $gradeTable.='<input type="button" '."\n".
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 	'value="Next->" />'."\n";
+ 	'value="Next->" /> <br />'."\n";
+     $gradeTable.=&check_buttons();
-     my (undef, undef, $fullname) = &getclasslist($getsec,'1');
+     $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';
+     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');
      $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">';
      my $loop = 0;
      while ($loop < 2) {
  	$gradeTable.='<td><b>&nbsp;No.</b>&nbsp;</td><td><b>&nbsp;Select&nbsp;</b></td>'.
- 	    '<td>'.&nameUserString('header').'</td>';
+ 	    '<td>'.&nameUserString('header').'&nbsp;Section/Group</td>';
- 	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 	if ($env{'form.showgrading'} eq 'yes'
+ 	    && $submitonly ne 'queued'
+ 	    && $submitonly ne 'all') {
  	    foreach (sort(@$partlist)) {
- 		$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+ 		my $display_part=&get_display_part((split(/_/))[0],$url,$symb);
+ 		$gradeTable.='<td><b>&nbsp;Part: '.$display_part.
+ 		    ' Status&nbsp;</b></td>';
  	    }
+ 	} elsif ($submitonly eq 'queued') {
+ 	    $gradeTable.='<td><b>&nbsp;'.&mt('Queue Status').'&nbsp;</b></td>';
  	}
  	$loop++;
  #	$gradeTable.='<td></td>' if ($loop%2 ==1);
- Line 563  LISTJAVASCRIPT
+ Line 749  LISTJAVASCRIPT
      $gradeTable.='</tr>'."\n";
      my $ctr = 0;
-     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+     foreach my $student (sort
+ 			 {
+ 			     if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ 				 return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ 			     }
+ 			     return $a cmp $b;
+ 			 }
+ 			 (keys(%$fullname))) {
  	my ($uname,$udom) = split(/:/,$student);
  	my %status = ();
- 	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 	if ($submitonly eq 'queued') {
+ 	    my %queue_status =
+ 		&Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
+ 							$udom,$uname);
+ 	    next if (!defined($queue_status{'gradingqueue'}));
+ 	    $status{'gradingqueue'} = $queue_status{'gradingqueue'};
+ 	}
+ 	if ($env{'form.showgrading'} eq 'yes'
+ 	    && $submitonly ne 'queued'
+ 	    && $submitonly ne 'all') {
  	    (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
- 	    my $statusflg = '';
+ 	    my $submitted = 0;
+ 	    my $graded = 0;
+ 	    my $incorrect = 0;
  	    foreach (keys(%status)) {
- 		$statusflg = 1 if ($status{$_} ne 'nothing');
+ 		$submitted = 1 if ($status{$_} ne 'nothing');
+ 		$graded = 1 if ($status{$_} =~ /^ungraded/);
+ 		$incorrect = 1 if ($status{$_} =~ /^incorrect/);
  		my ($foo,$partid,$foo1) = split(/\./,$_);
  		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
- 		    $statusflg = '';
+ 		    $submitted = 0;
+ 		    my ($part)=split(/\./,$partid);
  		    $gradeTable.='<input type="hidden" name="'.
- 			$student.':submitted_by" value="'.
+ 			$student.':'.$part.':submitted_by" value="'.
  			$status{'resource.'.$partid.'.submitted_by'}.'" />';
  		}
  	    }
- 	    next if ($statusflg eq '' && $submitonly eq 'yes');
+ 	    next if (!$submitted && ($submitonly eq 'yes' ||
+ 				     $submitonly eq 'incorrect' ||
+ 				     $submitonly eq 'graded'));
+ 	    next if (!$graded && ($submitonly eq 'graded'));
+ 	    next if (!$incorrect && $submitonly eq 'incorrect');
  	}
  	$ctr++;
+ 	my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
  	if ( $perm{'vgr'} eq 'F' ) {
  	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
  	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
- 		'<td align="center"><input type=checkbox name="stuinfo" value="'.
+                '<td align="center"><label><input type=checkbox name="stuinfo" value="'.
- 		$student.':'.$$fullname{$student}.'&nbsp;"></td>'."\n".
+                $student.':'.$$fullname{$student}.':::SECTION'.$section.
- 		'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
+ 	       ')&nbsp;" />&nbsp;&nbsp;</label></td>'."\n".'<td>'.
+ 	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
+ 	       '&nbsp;'.$section.'</td>'."\n";
- 	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
  		foreach (sort keys(%status)) {
  		    next if (/^resource.*?submitted_by$/);
- 		    $gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+ 		    $gradeTable.='<td align="center">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
  		}
  	    }
  #	    $gradeTable.='<td></td>' if ($ctr%2 ==1);
- Line 602  LISTJAVASCRIPT
+ Line 822  LISTJAVASCRIPT
      }
      if ($ctr%2 ==1) {
  	$gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
- 	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 	    if ($env{'form.showgrading'} eq 'yes'
+ 		&& $submitonly ne 'queued'
+ 		&& $submitonly ne 'all') {
  		foreach (@$partlist) {
  		    $gradeTable.='<td>&nbsp;</td>';
  		}
+ 	    } elsif ($submitonly eq 'queued') {
+ 		$gradeTable.='<td>&nbsp;</td>';
  	    }
  	$gradeTable.='</tr>';
      }
-     $gradeTable.='</table></td></tr></table>'.
+     $gradeTable.='</table></td></tr></table>'."\n".
  	'<input type="button" '.
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
  	'value="Next->" /></form>'."\n";
- Line 619  LISTJAVASCRIPT
+ Line 843  LISTJAVASCRIPT
  	if ($num_students eq 0) {
  	    $gradeTable='<br />&nbsp;<font color="red">There are no students currently enrolled.</font>';
  	} 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">'.
- 		'No submissions found for this resource for any students. ('.$num_students.
+ 		'No '.$submissions.' found for this resource for any students. ('.$num_students.
- 		' checked for submissions</font><br />';
+ 		' students checked for '.$submissions.')</font><br />';
  	}
      } elsif ($ctr == 1) {
  	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
- Line 632  LISTJAVASCRIPT
+ Line 860  LISTJAVASCRIPT
  }
  #---- Called from the listStudents routine
+ sub check_script {
+     my ($form, $type)=@_;
+     my $chkallscript='<script type="text/javascript">
+     function checkall() {
+         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+             ele = document.forms.'.$form.'.elements[i];
+             if (ele.name == "'.$type.'") {
+             document.forms.'.$form.'.elements[i].checked=true;
+                                        }
+         }
+     }
+     function checksec() {
+         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+             ele = document.forms.'.$form.'.elements[i];
+            string = document.forms.'.$form.'.chksec.value;
+            if
+           (ele.value.indexOf(":::SECTION"+string)>0) {
+               document.forms.'.$form.'.elements[i].checked=true;
+             }
+         }
+     }
+     function uncheckall() {
+         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+             ele = document.forms.'.$form.'.elements[i];
+             if (ele.name == "'.$type.'") {
+             document.forms.'.$form.'.elements[i].checked=false;
+                                        }
+         }
+     }
+ </script>'."\n";
+     return $chkallscript;
+ }
+ sub check_buttons {
+     my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
+     $buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" />&nbsp;';
+     $buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
+     $buttons.='<input type="text" size="5" name="chksec" />&nbsp;';
+     return $buttons;
+ }
  #     Displays the submissions for one student or a group of students
  sub processGroup {
      my ($request)  = shift;
      my $ctr        = 0;
-     my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
+     my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
- 		      : ($ENV{'form.stuinfo'}));
      my $total      = scalar(@stuchecked)-1;
      foreach (@stuchecked) {
  	my ($uname,$udom,$fullname) = split(/:/);
- 	$ENV{'form.student'}        = $uname;
+ 	$env{'form.student'}        = $uname;
- 	$ENV{'form.userdom'}        = $udom;
+ 	$env{'form.userdom'}        = $udom;
- 	$ENV{'form.fullname'}       = $fullname;
+ 	$env{'form.fullname'}       = $fullname;
  	&submission($request,$ctr,$total);
  	$ctr++;
      }
- Line 837  sub sub_page_kw_js {
+ Line 1110  sub sub_page_kw_js {
      my $request = shift;
      my $iconpath = $request->dir_config('lonIconsURL');
      &commonJSfunctions($request);
+     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+     $docopen=~s/^document\.//;
      $request->print(<<SUBJAVASCRIPT);
  <script type="text/javascript" language="javascript">
- Line 946  sub sub_page_kw_js {
+ Line 1221  sub sub_page_kw_js {
      var ypos = (screen.height-height)/2-30;
      ypos = (ypos < 0) ? '0' : ypos;
-     pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
+     pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
      pWin.focus();
      pDoc = pWin.document;
-     pDoc.open('text/html','replace');
+     pDoc.$docopen;
      pDoc.write("<html><head>");
      pDoc.write("<title>Message Central</title>");
- Line 1077  sub sub_page_kw_js {
+ Line 1352  sub sub_page_kw_js {
      var ypos = (screen.height-330)/2-30;
      ypos = (ypos < 0) ? '0' : ypos;
-     hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
+     hwdWin = window.open('', 'KeywordHighlightCentral', 'resizeable=yes,toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
      hwdWin.focus();
      var hDoc = hwdWin.document;
-     hDoc.open('text/html','replace');
+     hDoc.$docopen;
      hDoc.write("<html><head>");
      hDoc.write("<title>Highlight Central</title>");
- Line 1139  SUBJAVASCRIPT
+ Line 1414  SUBJAVASCRIPT
  #--- 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 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>');
      $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,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>'.$partid.' <b>Points: </b></td><td>'."\n";
+ 	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
      my $ctr = 0;
      $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
      while ($ctr<=$wgt) {
- 	$result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ 	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
  	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
  	    $ctr.')" value="'.$ctr.'" '.
- 	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+ 	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";
  	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
  	$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 1174  sub gradeBox {
+ Line 1451  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') {
- Line 1189  sub gradeBox {
+ Line 1465  sub gradeBox {
      $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="'.
- 	$$record{'resource.'.$partid.'.solved'}.'" />'."\n";
+ 	$$record{'resource.'.$partid.'.solved'}.'" />'."\n".
+         '<input type="hidden" name="totaltries'.$counter.'_'.$partid.'" value="'.
+         $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
+         '<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 ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb);
+     my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
+     my (@respids);
+     foreach my $part_resp (sort(keys(%$handgrade))) {
+         my ($part,$resp) = split(/_/,$part_resp);
+         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) {
+ 	    my ($file_disp) = ($file =~ m|.+/(.+)$|);
+ 	    $result.=&mt('Return commented version of [_1] to student.',
+ 			 '<span class="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 />';
+ 	    $file_counter++;
+ 	}
+     }
+     return $result;
+ }
  sub show_problem {
-     my ($request,$symb,$uname,$udom,$removeform,$viewon) = @_;
+     my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
-     my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+     my $rendered;
- 						      $ENV{'request.course.id'});
+     if ($mode eq 'both' or $mode eq 'text') {
+ 	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ 					     $env{'request.course.id'});
+     }
      if ($removeform) {
  	$rendered=~s|<form(.*?)>||g;
  	$rendered=~s|</form>||g;
  	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
      }
-     my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+     my $companswer;
- 							   $ENV{'request.course.id'});
+     if ($mode eq 'both' or $mode eq 'answer') {
+ 	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ 						    $env{'request.course.id'});
+     }
      if ($removeform) {
  	$companswer=~s|<form(.*?)>||g;
  	$companswer=~s|</form>||g;
- 	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+ 	$companswer=~s|name="submit"|name="would_have_been_submit"|g;
      }
      my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
      $result.='<table border="0" width="100%">';
-     $result.='<tr><td bgcolor="#e6ffff"><b> View of the problem - '.$ENV{'form.fullname'}.
+     if ($viewon) {
- 	'</b></td></tr>' if ($viewon);
+ 	$result.='<tr><td bgcolor="#e6ffff"><b> ';
-     $result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+ 	if ($mode eq 'both' or $mode eq 'text') {
-     $result.='<b>Correct answer:</b><br />'.$companswer;
+ 	    $result.='View of the problem - ';
+ 	} else {
+ 	    $result.='Correct answer: ';
+ 	}
+ 	$result.=$env{'form.fullname'}.'</b></td></tr>';
+     }
+     if ($mode eq 'both') {
+ 	$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+ 	$result.='<b>Correct answer:</b><br />'.$companswer;
+     } elsif ($mode eq 'text') {
+ 	$result.='<tr><td bgcolor="#ffffff">'.$rendered;
+     } elsif ($mode eq 'answer') {
+ 	$result.='<tr><td bgcolor="#ffffff">'.$companswer;
+     }
      $result.='</td></tr></table>';
      $result.='</td></tr></table><br />';
      return $result;
- Line 1225  sub show_problem {
+ Line 1554  sub show_problem {
  sub submission {
      my ($request,$counter,$total) = @_;
-     (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+     (my $url=$env{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-     my ($uname,$udom)     = ($ENV{'form.student'},$ENV{'form.userdom'});
+     my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});
-     $udom = ($udom eq '' ? $ENV{'user.domain'} : $udom); #has form.userdom changed for a student?
+     $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'});
+     my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
-     $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
+     $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
-     my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
      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.('.
- 			$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
+ 			$uname.'@'.$udom.' in section '.$usec.' in course id '.
+ 			$env{'request.course.id'}.')</font>');
  	$request->print(&show_grading_menu_form($symb,$url));
  	return;
      }
-     $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'});
+     if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
-     my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+     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').
  	'/check.gif" height="16" border="0" />';
      # header info
      if ($counter == 0) {
  	&sub_page_js($request);
- 	&sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
+ 	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
- 	$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
+ 	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
- 	    &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
+ 	    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
  	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
- 			'<font size=+1>&nbsp;<b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+ 			'<font size=+1>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");
- 	if ($ENV{'form.handgrade'} eq 'no') {
+ 	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 '.
  		$checkIcon.' symbol.'."\n";
  	    $request->print($checkMark);
- Line 1264  sub submission {
+ Line 1596  sub submission {
  	# option to display problem, only once else it cause problems
          # with the form later since the problem has a form.
- 	if ($ENV{'form.vProb'} eq 'yes' or !$ENV{'form.vProb'}) {
+ 	if ($env{'form.vProb'} eq 'yes' or $env{'form.vAns'} eq 'yes') {
- 	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1));
+ 	    my $mode;
+ 	    if ($env{'form.vProb'} eq 'yes' && $env{'form.vAns'} eq 'yes') {
+ 		$mode='both';
+ 	    } elsif ($env{'form.vProb'} eq 'yes') {
+ 		$mode='text';
+ 	    } elsif ($env{'form.vAns'} eq 'yes') {
+ 		$mode='answer';
+ 	    }
+ 	    $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 = ();
- 	if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {
+ 	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
  	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
- 					     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 					     $env{'course.'.$env{'request.course.id'}.'.domain'},
- 					     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ 					     $env{'course.'.$env{'request.course.id'}.'.num'});
- 	    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ 	    my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
- 	    $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+ 	    $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
- 	    $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+ 	    $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
- 	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+ 	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
- 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
+ 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
- 	    $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ?
+ 	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ?
- 		$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
+ 		$keyhash{$symb.'_subject'} : $env{'form.probTitle'};
- 	    $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
+ 	    $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
  	}
- 	my $overRideScore = $ENV{'form.overRideScore'} eq '' ? 'no' : $ENV{'form.overRideScore'};
+ 	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
- 	$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="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
- 			'<input type="hidden" name="Status"     value="'.$ENV{'form.Status'}.'" />'."\n".
+ 			'<input type="hidden" name="Status"     value="'.$env{'form.Status'}.'" />'."\n".
  			'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
- 			'<input type="hidden" name="probTitle"  value="'.$ENV{'form.probTitle'}.'" />'."\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="url"        value="'.$url.'" />'."\n".
- 			'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\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="vProb"      value="'.$env{'form.vProb'}.'" />'."\n".
- 			'<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
+ 			'<input type="hidden" name="vAns"       value="'.$env{'form.vAns'}.'" />'."\n".
- 			'<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
+ 			'<input type="hidden" name="lastSub"    value="'.$env{'form.lastSub'}.'" />'."\n".
- 			'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
+ 			'<input type="hidden" name="section"    value="'.$env{'form.section'}.'">'."\n".
- 			'<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\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="NCT"'.
- 			' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+ 			' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
- 	if ($ENV{'form.handgrade'} eq 'yes') {
+ 	if ($env{'form.handgrade'} eq 'yes') {
- 	    $request->print('<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".
+ 	    $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
- 			    '<input type="hidden" name="kwclr"    value="'.$ENV{'form.kwclr'}.'" />'."\n".
+ 			    '<input type="hidden" name="kwclr"    value="'.$env{'form.kwclr'}.'" />'."\n".
- 			    '<input type="hidden" name="kwsize"   value="'.$ENV{'form.kwsize'}.'" />'."\n".
+ 			    '<input type="hidden" name="kwsize"   value="'.$env{'form.kwsize'}.'" />'."\n".
- 			    '<input type="hidden" name="kwstyle"  value="'.$ENV{'form.kwstyle'}.'" />'."\n".
+ 			    '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n".
- 			    '<input type="hidden" name="msgsub"   value="'.$ENV{'form.msgsub'}.'" />'."\n".
+ 			    '<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".
  			    '<input type="hidden" name="shownSub" value="0" />'."\n".
- 			    '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n");
+ 			    '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
+ 	    foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+ 		$request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
+ 	    }
  	}
  	my ($cts,$prnmsg) = (1,'');
- 	while ($cts <= $ENV{'form.savemsgN'}) {
+ 	while ($cts <= $env{'form.savemsgN'}) {
  	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
  		(!exists($keyhash{$symb.'_savemsg'.$cts}) ?
- 		 &Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
+ 		 &Apache::lonfeedback::clear_out_html($env{'form.savemsg'.$cts}) :
  		 &Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
  		'" />'."\n".
  		'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
- Line 1328  sub submission {
+ Line 1672  sub submission {
  	}
  	$request->print($prnmsg);
- 	if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+ 	if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
  #
  # Print out the keyword options line
  #
- Line 1350  KEYWORDS
+ Line 1694  KEYWORDS
          }
      }
-     if ($ENV{'form.vProb'} eq 'all') {
+     if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
  	$request->print('<br /><br /><br />') if ($counter > 0);
- 	$request->print(&show_problem($request,$symb,$uname,$udom,1,1));
+ 	my $mode;
+ 	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
+ 	    $mode='both';
+ 	} elsif ($env{'form.vProb'} eq 'all' ) {
+ 	    $mode='text';
+ 	} elsif ($env{'form.vAns'} eq 'all') {
+ 	    $mode='answer';
+ 	}
+ 	$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) = &response_type($url,$symb);
+     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
+     my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
      # Display student info
      $request->print(($counter == 0 ? '' : '<br />'));
      my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\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.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";
      $result.='<input type="hidden" name="name'.$counter.
- 	'" value="'.$ENV{'form.fullname'}.'" />'."\n";
+ 	'" value="'.$env{'form.fullname'}.'" />'."\n";
      # If any part of the problem is an essay-response (handgraded), then check for collaborators
      my @col_fullnames;
      my ($classlist,$fullname);
-     if ($ENV{'form.handgrade'} eq 'yes') {
+     if ($env{'form.handgrade'} eq 'yes') {
  	($classlist,undef,$fullname) = &getclasslist('all','0');
  	for (keys (%$handgrade)) {
  	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.
- Line 1403  KEYWORDS
+ Line 1755  KEYWORDS
  		    $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
  		}
                  $result.='<br />'."\n";
+ 		my ($part)=split(/\./,$_);
  		$result.='<input type="hidden" name="collaborator'.$counter.
- 		    '" value="'.(join ':',@goodcollaborators).'" />'."\n";
+ 		    '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
+ 		    "\n";
  	    }
  	    if (scalar(@badcollaborators) > 0) {
  		$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
- Line 1429  KEYWORDS
+ Line 1783  KEYWORDS
      #                  (for multi-response type part)
      #             (3) Last submission plus the parts info
      #             (4) The whole record for this student
-     if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
+     if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
- 	if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) {
+ 	my ($string,$timestamp)= &get_last_submission(\%record);
- 	    my $submitby=''.
+ 	my $lastsubonly=''.
- 		'<b>Collaborative submission by: </b>'.
+ 	    ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
- 		'<a href="javascript:viewSubmitter(\''.
+ 	     $$timestamp)."</td></tr>\n";
- 		$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
+ 	if ($$timestamp eq '') {
- 		'\')"; TARGET=_self>'.
+ 	    $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
- 		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
- 	    $request->print($submitby);
  	} else {
- 	    my ($string,$timestamp)= &get_last_submission (\%record);
+ 	    my %seenparts;
- 	    my $lastsubonly=''.
+ 	    for my $part (sort keys(%$handgrade)) {
- 		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+ 		my ($partid,$respid) = split(/_/,$part);
- 		 $$timestamp)."</td></tr>\n";
+ 		my $display_part=&get_display_part($partid,$url,$symb);
- 	    if ($$timestamp eq '') {
+ 		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
- 		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
+ 		    if (exists($seenparts{$partid})) { next; }
- 	    } else {
+ 		    $seenparts{$partid}=1;
- 		for my $part (sort keys(%$handgrade)) {
+ 		    my $submitby='<b>Part:</b> '.$display_part.
- 		    my ($responsetype,$foo) = split(/:/,$$handgrade{$part});
+ 			' <b>Collaborative submission by:</b> '.
- 		    my ($partid,$respid) = split(/_/,$part);
+ 			'<a href="javascript:viewSubmitter(\''.
- 		    if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
+ 			$env{"form.$uname:$udom:$partid:submitted_by"}.
- 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ 			'\')"; TARGET=_self>'.
- 			    $partid.'</b> <font color="#999999">( ID '.$respid.
+ 			$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
- 			    ' )</font>&nbsp; &nbsp;'.
+ 		    $request->print($submitby);
- 			    '<font color="red">Nothing submitted - no attempts</font><br /><br />';
+ 		    next;
-  		    } else {
+ 		}
- 			foreach (@$string) {
+ 		my $responsetype = $responseType->{$partid}->{$respid};
- 			    my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
+ 		if (!exists($record{"resource.$partid.$respid.submission"})) {
- 			    if ($part eq ($partid.'_'.$respid)) {
+ 		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
- 				my ($ressub,$subval) = split(/:/,$_,2);
+ 			$display_part.' <font color="#999999">( ID '.$respid.
-                             # Similarity check
+ 			' )</font>&nbsp; &nbsp;'.
- 				my $similar='';
+ 			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
- 				my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
+ 		    next;
- 				if ($osim) {
+ 		}
- 				    $osim=int($osim*100.0);
+ 		foreach (@$string) {
- 				    $similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
+ 		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
- 					'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
+ 		    if ($part ne ($partid.'_'.$respid)) { next; }
- 					'</font></h3><blockquote><i>'.
+ 		    my ($ressub,$subval) = split(/:/,$_,2);
- 					&keywords_highlight($oessay).'</i></blockquote><hr />';
+ 		    # Similarity check
- 				}
+ 		    my $similar='';
- 				$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ 		    if($env{'form.checkPlag'}){
- 				    $partid.'</b> <font color="#999999">( ID '.$respid.
+ 			my ($oname,$odom,$ocrsid,$oessay,$osim)=
- 				    ' )</font>&nbsp; &nbsp;'.
+ 			    &most_similar($uname,$udom,$subval);
- 				    ($record{"resource.$partid.$respid.uploadedurl"}?
+ 			if ($osim) {
- 				     '<a href="'.
+ 			    $osim=int($osim*100.0);
- 				     &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
+ 			    $similar="<hr /><h3><font color=\"#FF0000\">Essay".
- 				     '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> '.
+ 				" is $osim% similar to an essay by ".
- 				     '<font color="red" size="1">Like all files provided by users, '.
+ 				&Apache::loncommon::plainname($oname,$odom).
- 				     'this file may contain virusses</font><br />':'').
+ 				'</font></h3><blockquote><i>'.
- 				     '<b>Submitted Answer: </b>'.
+ 				&keywords_highlight($oessay).
- 				     &cleanRecord($subval,$responsetype,$symb).
+ 				'</i></blockquote><hr />';
- 				      '<br /><br />'.$similar."\n"
+ 			}
- 				     if ($ENV{'form.lastSub'} eq 'lastonly' ||
+ 		    }
- 					 ($ENV{'form.lastSub'} eq 'hdgrade' &&
+ 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
- 					  $$handgrade{$part} =~ /:yes$/));
+ 		    if ($env{'form.lastSub'} eq 'lastonly' ||
+ 			($env{'form.lastSub'} eq 'hdgrade' &&
+ 			 $$handgrade{$part} eq 'yes')) {
+ 			my $display_part=&get_display_part($partid,$url,$symb);
+ 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+ 			    $display_part.' <font color="#999999">( ID '.$respid.
+ 			    ' )</font>&nbsp; &nbsp;';
+ 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
+ 			if (@$files) {
+ 			    $lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+ 			    my $file_counter = 0;
+ 			    foreach my $file (@$files) {
+ 			        $file_counter ++;
+ 				&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 />';
  			}
+ 			$lastsubonly.='<b>Submitted Answer: </b>'.
+ 			    &cleanRecord($subval,$responsetype,$symb,$partid,
+ 					 $respid,\%record,$order);
+ 			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
  		    }
  		}
  	    }
- 	    $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
- 	    $request->print($lastsubonly);
  	}
-     } elsif ($ENV{'form.lastSub'} eq 'datesub') {
+ 	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
+ 	$request->print($lastsubonly);
+     } elsif ($env{'form.lastSub'} eq 'datesub') {
  	my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
- 	$request->print(&displaySubByDates(\$symb,\%record,$parts,$responseType,$checkIcon));
+ 	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
-     } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
+     } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
  	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- 								 $ENV{'request.course.id'},
+ 								 $env{'request.course.id'},
  								 $last,'.submission',
  								 'Apache::grades::keywords_highlight'));
      }
- Line 1506  KEYWORDS
+ Line 1877  KEYWORDS
  	.$udom.'" />'."\n");
      # return if view submission with no grading option
-     if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
+     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));
- 	$toGrade.='</td></tr></table></td></tr></table></form>'."\n";
+ 	$toGrade.='</td></tr></table></td></tr></table>'."\n";
- 	$toGrade.=&show_grading_menu_form($symb,$url)
+ 	if (($env{'form.command'} eq 'submission') ||
- 	    if (($ENV{'form.command'} eq 'submission') ||
+ 	    ($env{'form.command'} eq 'processGroup' && $counter == $total)) {
- 		($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+ 	    $toGrade.='</form>'.&show_grading_menu_form($symb,$url)
- 	$request = print($toGrade);
+ 	}
+ 	$request->print($toGrade);
  	return;
+     } else {
+ 	$request->print('</td></tr></table></td></tr></table>'."\n");
      }
      # essay grading message center
-     if ($ENV{'form.handgrade'} eq 'yes') {
+     if ($env{'form.handgrade'} eq 'yes') {
- 	my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+ 	my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
  	my $msgfor = $givenn.' '.$lastname;
  	if (scalar(@col_fullnames) > 0) {
  	    my $lastone = pop @col_fullnames;
- Line 1531  KEYWORDS
+ Line 1905  KEYWORDS
  	    '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
  	$result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
  	    ',\''.$msgfor.'\')"; TARGET=_self>'.
- 	    'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> &nbsp;'.
+ 	    &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.
+ 	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.
  	    '<img src="'.$request->dir_config('lonIconsURL').
  	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
- 	    '<br />&nbsp;(Message will be sent when you click on Save & Next below.)'."\n"
+ 	    '<br />&nbsp;('.
- 	    if ($ENV{'form.handgrade'} eq 'yes');
+ 	    &mt('Message will be sent when you click on Save & Next below.').")\n";
  	$request->print($result);
      }
+     if ($perm{'vgr'}) {
+ 	$request->print('<br />'.
+ 	    &Apache::loncommon::track_student_link(&mt('View recent activity'),
+ 						   $uname,$udom,'check'));
+     }
+     if ($perm{'opa'}) {
+ 	$request->print('<br />'.
+ 	    &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
+ 					 $uname,$udom,$symb,'check'));
+     }
      my %seen = ();
      my @partlist;
      my @gradePartRespid;
-     for (sort keys(%$handgrade)) {
+     for my $part_resp (sort(keys(%$handgrade))) {
- 	my ($partid,$respid) = split(/_/);
+ 	my ($partid,$respid) = split(/_/, $part_resp);
  	next if ($seen{$partid} > 0);
  	$seen{$partid}++;
- 	next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
+ 	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(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 1574  KEYWORDS
+ Line 1958  KEYWORDS
  	    '<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');
+ 	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
  	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
  	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
  	$endform.='<input type="button" value="Previous" '.
- Line 1618  sub get_last_submission {
+ Line 2002  sub get_last_submission {
  #--- High light keywords, with style choosen by user.
  sub keywords_highlight {
      my $string    = shift;
-     my $size      = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
+     my $size      = $env{'form.kwsize'} eq '0' ? '' : 'size='.$env{'form.kwsize'};
-     my $styleon   = $ENV{'form.kwstyle'} eq ''  ? '' : $ENV{'form.kwstyle'};
+     my $styleon   = $env{'form.kwstyle'} eq ''  ? '' : $env{'form.kwstyle'};
      (my $styleoff = $styleon) =~ s/\</\<\//;
-     my @keylist   = split(/[,\s+]/,$ENV{'form.keywords'});
+     my @keylist   = split(/[,\s+]/,$env{'form.keywords'});
      foreach (@keylist) {
- 	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
+ 	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
      }
      return $string;
  }
- Line 1631  sub keywords_highlight {
+ Line 2015  sub keywords_highlight {
  #--- Called from submission routine
  sub processHandGrade {
      my ($request) = shift;
-     my $url    = $ENV{'form.url'};
+     my $url    = $env{'form.url'};
-     my $symb   = $ENV{'form.symb'};
+     my $symb   = $env{'form.symb'};
-     my $button = $ENV{'form.gradeOpt'};
+     my $button = $env{'form.gradeOpt'};
-     my $ngrade = $ENV{'form.NCT'};
+     my $ngrade = $env{'form.NCT'};
-     my $ntstu  = $ENV{'form.NTSTU'};
+     my $ntstu  = $env{'form.NTSTU'};
+     my $cdom   = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cnum   = $env{'course.'.$env{'request.course.id'}.'.num'};
      if ($button eq 'Save & Next') {
  	my $ctr = 0;
  	while ($ctr < $ngrade) {
- 	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+ 	    my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
  	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
  	    if ($errorflag eq 'no_score') {
  		$ctr++;
- Line 1650  sub processHandGrade {
+ Line 2037  sub processHandGrade {
  		$ctr++;
  		next;
  	    }
- 	    my $includemsg = $ENV{'form.includemsg'.$ctr};
+ 	    my $includemsg = $env{'form.includemsg'.$ctr};
  	    my ($subject,$message,$msgstatus) = ('','','');
  	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
- 		$subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+ 		$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
+ 		unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
  		my (@msgnum) = split(/,/,$includemsg);
  		foreach (@msgnum) {
- 		    $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
+ 		    $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
  		}
  		$message =&Apache::lonfeedback::clear_out_html($message);
- 		$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
+ 		if ($env{'form.withgrades'.$ctr}) {
- 		$message.=" for <a href=\"".
+ 		    $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
+ 		    $message.=" for <a href=\"".
  		    &Apache::lonnet::clutter($url).
- 		    "?symb=$symb\">$ENV{'form.probTitle'}</a>";
+ 		    "?symb=$symb\">$env{'form.probTitle'}</a>";
+ 		}
  		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
- 							       $ENV{'form.msgsub'},$message);
+ 							       $subject.' ['.
- 	    }
+ 							       &Apache::lonnet::declutter($url).']',$message);
- 	    if ($ENV{'form.collaborator'.$ctr}) {
+ 		$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
- 		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
+ 				$msgstatus);
- 		foreach (@collaborators) {
+ 	    }
- 		    my ($errorflag,$pts,$wgt) =
+ 	    if ($env{'form.collaborator'.$ctr}) {
- 			&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
+ 		my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
- 		    if ($errorflag eq 'not_allowed') {
+ 		foreach my $collabstr (@collabstrs) {
- 			$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+ 		    my ($part,@collaborators) = split(/:/,$collabstr);
- 			next;
+ 		    foreach my $collaborator (@collaborators) {
- 		    } else {
+ 			my ($errorflag,$pts,$wgt) =
- 			if ($message ne '') {
+ 			    &saveHandGrade($request,$url,$symb,$collaborator,$udom,$ctr,
- 			    $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
+ 					   $env{'form.unamedom'.$ctr},$part);
- 									   $ENV{'form.msgsub'},
+ 			if ($errorflag eq 'not_allowed') {
- 									   $message);
+ 			    $request->print("<font color=\"red\">Not allowed to modify grades for $collaborator:$udom</font>");
+ 			    next;
+ 			} else {
+ 			    if ($message ne '') {
+ 				$msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$env{'form.msgsub'},$message);
+ 			    }
  			}
  		    }
  		}
- Line 1687  sub processHandGrade {
+ Line 2082  sub processHandGrade {
  	}
      }
-     if ($ENV{'form.handgrade'} eq 'yes') {
+     if ($env{'form.handgrade'} eq 'yes') {
  	# Keywords sorted in alphabatical order
- 	my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ 	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
  	my %keyhash = ();
- 	$ENV{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
+ 	$env{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
- 	$ENV{'form.keywords'}           =~ s/^\s+|\s+$//;
+ 	$env{'form.keywords'}           =~ s/^\s+|\s+$//;
- 	my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
+ 	my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
- 	$ENV{'form.keywords'} = join(' ',@keywords);
+ 	$env{'form.keywords'} = join(' ',@keywords);
- 	$keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
+ 	$keyhash{$symb.'_keywords'}     = $env{'form.keywords'};
- 	$keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
+ 	$keyhash{$symb.'_subject'}      = $env{'form.msgsub'};
- 	$keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
+ 	$keyhash{$loginuser.'_kwclr'}   = $env{'form.kwclr'};
- 	$keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
+ 	$keyhash{$loginuser.'_kwsize'}  = $env{'form.kwsize'};
- 	$keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+ 	$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};
  	# message center - Order of message gets changed. Blank line is eliminated.
- 	# New messages are saved in ENV for the next student.
+ 	# New messages are saved in env for the next student.
  	# All messages are saved in nohist_handgrade.db
  	my ($ctr,$idx) = (1,1);
- 	while ($ctr <= $ENV{'form.savemsgN'}) {
+ 	while ($ctr <= $env{'form.savemsgN'}) {
- 	    if ($ENV{'form.savemsg'.$ctr} ne '') {
+ 	    if ($env{'form.savemsg'.$ctr} ne '') {
- 		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+ 		$keyhash{$symb.'_savemsg'.$idx} = $env{'form.savemsg'.$ctr};
  		$idx++;
  	    }
  	    $ctr++;
  	}
  	$ctr = 0;
  	while ($ctr < $ngrade) {
- 	    if ($ENV{'form.newmsg'.$ctr} ne '') {
+ 	    if ($env{'form.newmsg'.$ctr} ne '') {
- 		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ 		$keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr};
- 		$ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ 		$env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr};
  		$idx++;
  	    }
  	    $ctr++;
  	}
- 	$ENV{'form.savemsgN'} = --$idx;
+ 	$env{'form.savemsgN'} = --$idx;
- 	$keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+ 	$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
  	my $putresult = &Apache::lonnet::put
- 	    ('nohist_handgrade',\%keyhash,
+ 	    ('nohist_handgrade',\%keyhash,$cdom,$cnum);
- 	     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- 	     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
      }
      # Called by Save & Refresh from Highlight Attribute Window
-     my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
+     my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
-     if ($ENV{'form.refresh'} eq 'on') {
+     if ($env{'form.refresh'} eq 'on') {
  	my ($ctr,$total) = (0,0);
  	while ($ctr < $ngrade) {
- 	    $total++ if  $ENV{'form.unamedom'.$ctr} ne '';
+ 	    $total++ if  $env{'form.unamedom'.$ctr} ne '';
  	    $ctr++;
  	}
- 	$ENV{'form.NTSTU'}=$ngrade;
+ 	$env{'form.NTSTU'}=$ngrade;
  	$ctr = 0;
  	while ($ctr < $total) {
- 	    my $processUser = $ENV{'form.unamedom'.$ctr};
+ 	    my $processUser = $env{'form.unamedom'.$ctr};
- 	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+ 	    ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
- 	    $ENV{'form.fullname'} = $$fullname{$processUser};
+ 	    $env{'form.fullname'} = $$fullname{$processUser};
  	    &submission($request,$ctr,$total-1);
  	    $ctr++;
  	}
- Line 1750  sub processHandGrade {
+ Line 2143  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($url);
- 	my $processUser = $ENV{'form.unamedom'.$ENV{'form.studentNo'}};
+ 	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
- 	($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+ 	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
- 	$ENV{'form.fullname'} = $$fullname{$processUser};
+ 	$env{'form.fullname'} = $$fullname{$processUser};
  	&submission($request,0,0);
  	return '';
      }
      # Get the next/previous one or group of students
-     my $firststu = $ENV{'form.unamedom0'};
+     my $firststu = $env{'form.unamedom0'};
-     my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
+     my $laststu = $env{'form.unamedom'.($ngrade-1)};
      my $ctr = 2;
      while ($laststu eq '') {
- 	$laststu  = $ENV{'form.unamedom'.($ngrade-$ctr)};
+ 	$laststu  = $env{'form.unamedom'.($ngrade-$ctr)};
  	$ctr++;
  	$laststu = $firststu if ($ctr > $ngrade);
      }
      my (@parsedlist,@nextlist);
      my ($nextflg) = 0;
-     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+     foreach (sort
+ 	     {
+ 		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ 		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ 		 }
+ 		 return $a cmp $b;
+ 	     } (keys(%$fullname))) {
  	if ($nextflg == 1 && $button =~ /Next$/) {
  	    push @parsedlist,$_;
  	}
- Line 1782  sub processHandGrade {
+ Line 2181  sub processHandGrade {
      }
      $ctr = 0;
      @parsedlist = reverse @parsedlist if ($button eq 'Previous');
+     my ($partlist) = &response_type($url);
      foreach my $student (@parsedlist) {
+ 	my $submitonly=$env{'form.submitonly'};
  	my ($uname,$udom) = split(/:/,$student);
- 	if ($ENV{'form.submitonly'} eq 'yes') {
- 	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ 	if ($submitonly eq 'queued') {
- 	    my $statusflg = '';
+ 	    my %queue_status =
- 	    foreach (split(/:/,$ENV{'form.gradePartRespid'})){
+ 		&Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
- 		$statusflg = 1 if (exists ($record{'resource.'.$_.'.submission'}));
+ 							$udom,$uname);
+ 	    next if (!defined($queue_status{'gradingqueue'}));
+ 	}
+ 	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 $submitted = 0;
+ 	    my $ungraded = 0;
+ 	    my $incorrect = 0;
+ 	    foreach (keys(%status)) {
+ 		$submitted = 1 if ($status{$_} ne 'nothing');
+ 		$ungraded = 1 if ($status{$_} =~ /^ungraded/);
+ 		$incorrect = 1 if ($status{$_} =~ /^incorrect/);
+ 		my ($foo,$partid,$foo1) = split(/\./,$_);
+ 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+ 		    $submitted = 0;
+ 		}
  	    }
- 	    next if ($statusflg eq '');
+ 	    next if (!$submitted && ($submitonly eq 'yes' ||
+ 				     $submitonly eq 'incorrect' ||
+ 				     $submitonly eq 'graded'));
+ 	    next if (!$ungraded && ($submitonly eq 'graded'));
+ 	    next if (!$incorrect && $submitonly eq 'incorrect');
  	}
  	push @nextlist,$student if ($ctr < $ntstu);
  	last if ($ctr == $ntstu);
- Line 1802  sub processHandGrade {
+ Line 2224  sub processHandGrade {
      foreach (sort @nextlist) {
  	my ($uname,$udom,$submitter) = split(/:/);
- 	$ENV{'form.student'}  = $uname;
+ 	$env{'form.student'}  = $uname;
- 	$ENV{'form.userdom'}  = $udom;
+ 	$env{'form.userdom'}  = $udom;
- 	$ENV{'form.fullname'} = $$fullname{$_};
+ 	$env{'form.fullname'} = $$fullname{$_};
  	&submission($request,$ctr,$total);
  	$ctr++;
      }
- Line 1812  sub processHandGrade {
+ Line 2234  sub processHandGrade {
  	my $the_end = '<h3><font color="red">LON-CAPA User Message</font></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,$url);
  	$request->print($the_end);
      }
      return '';
- Line 1820  sub processHandGrade {
+ Line 2242  sub processHandGrade {
  #---- Save the score and award for each student, if changed
  sub saveHandGrade {
-     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
+     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
+     my @v_flag;
      my $usec = &Apache::lonnet::getsection($domain,$stuname,
- 					   $ENV{'request.course.id'});
+ 					   $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) = ('','');
-     foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
+     my %aggregate = ();
- 	my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+     my $aggregateflag = 0;
+     my @parts = split(/:/,$env{'form.partlist'.$newflg});
+     foreach my $new_part (@parts) {
+ 	#collaborator 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') {
- 	    if ($record{'resource.'.$_.'.solved'} ne 'excused') {
+ 	    if ($record{'resource.'.$new_part.'.solved'} ne 'excused') {
- 		$newrecord{'resource.'.$_.'.solved'} = 'excused';
+ 		$newrecord{'resource.'.$new_part.'.solved'} = 'excused';
- 		if (exists($record{'resource.'.$_.'.awarded'})) {
+ 		if (exists($record{'resource.'.$new_part.'.awarded'})) {
- 		    $newrecord{'resource.'.$_.'.awarded'} = '';
+ 		    $newrecord{'resource.'.$new_part.'.awarded'} = '';
  		}
- 	    $newrecord{'resource.'.$_.'.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.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
+ 		 && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
- 	    $newrecord{'resource.'.$_.'.tries'} = 0;
+ 	    foreach my $key (keys (%record)) {
- 	    $newrecord{'resource.'.$_.'.solved'} = '';
+ 		if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
- 	    $newrecord{'resource.'.$_.'.award'} = '';
+ 	    }
- 	    $newrecord{'resource.'.$_.'.awarded'} = 0;
+ 	    $newrecord{'resource.'.$new_part.'.regrader'}=
- 	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ 		"$env{'user.name'}:$env{'user.domain'}";
+             my $totaltries = $record{'resource.'.$part.'.tries'};
+             my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+ 					       [$new_part]);
+             my $aggtries =$totaltries;
+             if ($last_resets{$new_part}) {
+                 $aggtries = &get_num_tries(\%record,$last_resets{$new_part},
+ 					   $new_part);
+             }
+             my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
+             if ($aggtries > 0) {
+                 &decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                 $aggregateflag = 1;
+             }
  	} elsif ($dropMenu eq '') {
- 	    $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
+ 	    $pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ?
- 		    $ENV{'form.GD_BOX'.$newflg.'_'.$_} :
+ 		    $env{'form.GD_BOX'.$newflg.'_'.$new_part} :
- 		    $ENV{'form.RADVAL'.$newflg.'_'.$_});
+ 		    $env{'form.RADVAL'.$newflg.'_'.$new_part});
- 	    return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '');
+ 	    if ($pts eq '' && $env{'form.GD_SEL'.$newflg.'_'.$new_part} eq '') {
- 	    $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
+ 		next;
- 		$ENV{'form.WGT'.$newflg.'_'.$_};
+ 	    }
+ 	    $wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 :
+ 		$env{'form.WGT'.$newflg.'_'.$new_part};
  	    my $partial= $pts/$wgt;
- 	    next if ($partial eq $record{'resource.'.$_.'.awarded'}); #do not update score for part if not changed.
+ 	    if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
- 	    $newrecord{'resource.'.$_.'.awarded'}  = $partial
+ 		#do not update score for part if not changed.
- 		if ($record{'resource.'.$_.'.awarded'} ne $partial);
+ 		next;
- 	    my $reckey = 'resource.'.$_.'.solved';
- 	    if ($partial == 0) {
- 		$newrecord{$reckey} = 'incorrect_by_override'
- 		    if ($record{$reckey} ne 'incorrect_by_override');
  	    } else {
- 		$newrecord{$reckey} = 'correct_by_override'
+ 	        push @parts_graded, $new_part;
- 		    if ($record{$reckey} ne 'correct_by_override');
+ 	    }
+ 	    if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
+ 		$newrecord{'resource.'.$new_part.'.awarded'}  = $partial;
  	    }
- 	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter
+ 	    my $reckey = 'resource.'.$new_part.'.solved';
- 		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
+ 	    if ($partial == 0) {
- 	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ 		if ($record{$reckey} ne 'incorrect_by_override') {
+ 		    $newrecord{$reckey} = 'incorrect_by_override';
+ 		}
+ 	    } else {
+ 		if ($record{$reckey} ne 'correct_by_override') {
+ 		    $newrecord{$reckey} = 'correct_by_override';
+ 		}
+ 	    }
+ 	    if ($submitter &&
+ 		($record{'resource.'.$new_part.'.submitted_by'} ne $submitter)) {
+ 		$newrecord{'resource.'.$new_part.'.submitted_by'} = $submitter;
+ 	    }
+ 	    $newrecord{'resource.'.$new_part.'.regrader'}=
+ 		"$env{'user.name'}:$env{'user.domain'}";
+ 	}
+ 	my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
+ 	foreach my $part_resp (sort(keys(%$handgrade))) {
+ 	    my ($part_id, $resp_id) = split(/_/,$part_resp);
+ 	    &Apache::lonnet::logthis('form.'.$newflg.'_'.$part_resp.'_returndoc1');
+ 	    &Apache::lonnet::logthis("new part is $new_part and partid is $part_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;
+                 while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
+                     my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
+                     $newrecord{"resource.$new_part.$resp_id.handback"} = $env{'form.returndocorig'.$file_counter};
+                     $request->print("<br />".$fname." will be the uploaded file name");
+                     $request->print("<font color=\"red\">Will upload document</font>".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
+                     $file_counter++;
+                 }
+             }
+         }
+ 	# 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' ||
+ 	        $dropMenu eq 'reset status')
+ 	   {
+ 	    push (@v_flag,$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 (scalar(@v_flag)) {
+             &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
+         }
  	&Apache::lonnet::cstore(\%newrecord,$symb,
- 				$ENV{'request.course.id'},$domain,$stuname);
+ 				$env{'request.course.id'},$domain,$stuname);
+ 	my @ungraded_parts;
+ 	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,
+ 			      $cdom,$cnum);
+     }
+     return ('',$pts,$wgt);
+ }
+ 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 '',$pts,$wgt;
+     return (\@files);
+ }
+ # ----------- Provides number of tries since last reset.
+ sub get_num_tries {
+     my ($record,$last_reset,$part) = @_;
+     my $timestamp = '';
+     my $num_tries = 0;
+     if ($$record{'version'}) {
+         for (my $version=$$record{'version'};$version>=1;$version--) {
+             if (exists($$record{$version.':resource.'.$part.'.solved'})) {
+                 $timestamp = $$record{$version.':timestamp'};
+                 if ($timestamp > $last_reset) {
+                     $num_tries ++;
+                 } else {
+                     last;
+                 }
+             }
+         }
+     }
+     return $num_tries;
+ }
+ # ----------- Determine decrements required in aggregate totals
+ sub decrement_aggs {
+     my ($symb,$part,$aggregate,$aggtries,$totaltries,$solvedstatus) = @_;
+     my %decrement = (
+                         attempts => 0,
+                         users => 0,
+                         correct => 0
+                     );
+     $decrement{'attempts'} = $aggtries;
+     if ($solvedstatus =~ /^correct/) {
+         $decrement{'correct'} = 1;
+     }
+     if ($aggtries == $totaltries) {
+         $decrement{'users'} = 1;
+     }
+     foreach my $type (keys (%decrement)) {
+         $$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
+     }
+     return;
+ }
+ # ----------- Determine timestamps for last reset of aggregate totals for parts
+ sub get_last_resets {
+     my ($symb,$courseid,$partids) =@_;
+     my %last_resets;
+     my $cdom = $env{'course.'.$courseid.'.domain'};
+     my $cname = $env{'course.'.$courseid.'.num'};
+     my @keys;
+     foreach my $part (@{$partids}) {
+ 	push(@keys,"$symb\0$part\0resettime");
+     }
+     my %results=&Apache::lonnet::get('nohist_resourcetracker',\@keys,
+ 				     $cdom,$cname);
+     foreach my $part (@{$partids}) {
+ 	$last_resets{$part}=$results{"$symb\0$part\0resettime"};
+     }
+     return %last_resets;
+ }
+ # ----------- Handles creating versions for portfolio files as answers
+ sub version_portfiles {
+     my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
+     my $version_parts = join('|',@$v_flag);
+     my $parts = join('|', @$parts_graded);
+     my $portfolio_root = &Apache::loncommon::propath($domain,
+ 						 $stu_name).
+ 						'/userfiles/portfolio';
+     foreach my $key (keys(%$record)) {
+         my $new_portfiles;
+         if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
+             my @v_portfiles;
+             my @portfiles = split(/,/,$$record{$key});
+             foreach my $file (@portfiles) {
+                 &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,$stu_name,$portfolio_root);
+                 $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+                 my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
+                 if ($new_answer ne 'problem getting file') {
+                     push(@v_portfiles, $directory.$new_answer);
+                     &Apache::lonnet::mark_as_readonly($domain,$stu_name,
+                         ['/portfolio'.$directory.$new_answer],
+                         [$symb,$env{'request.course.id'},'graded']);
+                 }
+             }
+             $$record{$key} = join(',',@v_portfiles);
+         }
+     }
+     return 'ok';
+ }
+ 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') {
+         &Apache::lonnet::logthis('problem getting file '.$file_name);
+         $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 {
+     my ($file)=@_;
+     my @file_parts = split(/\./, $file);
+     my ($name,$version,$ext);
+     if (@file_parts > 1) {
+ 	$ext=pop(@file_parts);
+ 	if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
+ 	    $version=pop(@file_parts);
+ 	}
+ 	$name=join('.',@file_parts);
+     } else {
+ 	$name=join('.',@file_parts);
+     }
+     return($name,$version,$ext);
  }
  #--------------------------------------------------------------------------------------
- Line 1925  sub viewgrades_js {
+ Line 2595  sub viewgrades_js {
  	}
  	for (i=0;i<document.classgrade.total.value;i++) {
  	    var user = document.classgrade["ctr"+i].value;
+ 	    user = user.replace(new RegExp(':', 'g'),"_");
  	    var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
  	    var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
  	    var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- Line 1941  sub viewgrades_js {
+ Line 2612  sub viewgrades_js {
      function writeRadText(partid,weight) {
  	var selval   = document.classgrade["SELVAL_"+partid];
  	var radioButton = document.classgrade["RADVAL_"+partid];
+         var override = document.classgrade["FORCE_"+partid].checked;
  	var textbox = document.classgrade["TEXTVAL_"+partid];
  	if (selval[1].selected || selval[2].selected) {
  	    for (var i=0; i<radioButton.length; i++) {
- Line 1951  sub viewgrades_js {
+ Line 2623  sub viewgrades_js {
  	    for (i=0;i<document.classgrade.total.value;i++) {
  		var user = document.classgrade["ctr"+i].value;
+ 		user = user.replace(new RegExp(':', 'g'),"_");
  		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
  		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
  		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- 		if (saveval != "correct") {
+ 		if ((saveval != "correct") || override) {
  		    scorename.value = "";
  		    if (selval[1].selected) {
  			selname[1].selected = true;
- Line 1968  sub viewgrades_js {
+ Line 2641  sub viewgrades_js {
  	} else {
  	    for (i=0;i<document.classgrade.total.value;i++) {
  		var user = document.classgrade["ctr"+i].value;
+ 		user = user.replace(new RegExp(':', 'g'),"_");
  		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
  		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
  		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- 		if (saveval != "correct") {
+ 		if ((saveval != "correct") || override) {
  		    scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
  		    selname[0].selected = true;
  		}
- Line 2008  sub viewgrades_js {
+ Line 2682  sub viewgrades_js {
  	    if (selval[2].selected) {
  		document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
  	    }
- 	}
+         }
      }
      function resetEntry(numpart) {
- Line 2026  sub viewgrades_js {
+ Line 2700  sub viewgrades_js {
  	    for (i=0;i<document.classgrade.total.value;i++) {
  		var user = document.classgrade["ctr"+i].value;
+ 		user = user.replace(new RegExp(':', 'g'),"_");
  		var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
  		resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
  		var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
- Line 2050  sub viewgrades {
+ Line 2725  sub viewgrades {
      my ($request) = shift;
      &viewgrades_js($request);
-     my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});
+     my ($symb,$url) = ($env{'form.symb'},$env{'form.url'});
-     my $result='<h3><font color="#339933">Manual Grading</font></h3>';
+     #need to make sure we have the correct data for later EXT calls,
+     #thus invalidate the cache
+     &Apache::lonnet::devalidatecourseresdata(
+                  $env{'course.'.$env{'request.course.id'}.'.num'},
+                  $env{'course.'.$env{'request.course.id'}.'.domain'});
+     &Apache::lonnet::clear_EXT_cache_status();
-     $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
+     my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
+     $result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";
      #view individual student submission form - called using Javascript viewOneStudent
      $result.=&jscriptNform($url,$symb);
- Line 2063  sub viewgrades {
+ Line 2744  sub viewgrades {
  	'<input type="hidden" name="symb"    value="'.$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".
+ 	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
- 	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\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="'.$env{'form.Status'}.'" />'."\n".
- 	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+ 	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
      my $sectionClass;
-     if ($ENV{'form.section'} eq 'all') {
+     if ($env{'form.section'} eq 'all') {
  	$sectionClass='Class </h3>';
-     } elsif ($ENV{'form.section'} eq 'no') {
+     } elsif ($env{'form.section'} eq 'none') {
  	$sectionClass='Students in no Section </h3>';
      } else {
- 	$sectionClass='Students in Section '.$ENV{'form.section'}.'</h3>';
+ 	$sectionClass='Students in Section '.$env{'form.section'}.'</h3>';
      }
      $result.='<h3>Assign Common Grade To '.$sectionClass;
      $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
- Line 2090  sub viewgrades {
+ Line 2771  sub viewgrades {
  	my ($partid,$respid) = split (/_/,$_,2);
  	next if $seen{$partid};
  	$seen{$partid}++;
- 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+ 	my $handgrade=$$handgrade{$_};
  	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
  	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
- Line 2098  sub viewgrades {
+ Line 2779  sub viewgrades {
  	    $ctsparts.'" value="'.$partid.'" />'."\n";
  	$result.='<input type="hidden" name="weight_'.
  	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
- 	$result.='<tr><td><b>Part  '.$partid.'&nbsp; &nbsp;Point:</b> </td><td>';
+ 	my $display_part=&get_display_part($partid,$url,$symb);
+ 	$result.='<tr><td><b>Part:</b> '.$display_part.'&nbsp; &nbsp;<b>Point:</b> </td><td>';
  	$result.='<table border="0"><tr>';
  	my $ctr = 0;
  	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
- 	    $result.= '<td><input type="radio" name="RADVAL_'.$partid.'" '.
+ 	    $result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
  		'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
- 		','.$ctr.')" />'.$ctr."</td>\n";
+ 		','.$ctr.')" />'.$ctr."</label></td>\n";
  	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
  	    $ctr++;
  	}
- Line 2118  sub viewgrades {
+ Line 2800  sub viewgrades {
  		$weight{$partid}.')"> '.
  	    '<option selected="on"> </option>'.
  	    '<option>excused</option>'.
- 	    '<option>reset status</option></select></td></tr>'."\n";
+ 	    '<option>reset status</option></select></td>'.
+             '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
  	$ctsparts++;
      }
      $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
- Line 2132  sub viewgrades {
+ Line 2815  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));
+     my (@parts) = sort(&getpartlist($url,$symb));
+     my @partids = ();
      foreach my $part (@parts) {
  	my $display=&Apache::lonnet::metadata($url,$part.'.display');
  	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
  	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);
  	if ($display =~ /^Partial Credit Factor/) {
- 	    my ($partid) = &split_part_type($part);
+ 	    $result.='<td><b>Score Part:</b> '.$display_part.
- 	    $result.='<td><b>Score Part '.$partid.'<br />(weight = '.
+ 		' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
- 		$weight{$partid}.')</b></td>'."\n";
  	    next;
+ 	} else {
+ 	    $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
  	}
  	$display =~ s|Problem Status|Grade Status<br />|;
- 	$result.='<td><b>'.$display.'</b></td>'."\n";
+ 	$result.='<td><b>'.$display.'</td>'."\n";
      }
      $result.='</tr>';
+     my %last_resets =
+ 	&get_last_resets($symb,$env{'request.course.id'},\@partids);
      #get info for each student
      #list all the students - with points and grade status
-     my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
+     my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
      my $ctr = 0;
-     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+     foreach (sort
- 	my $uname = $_;
+ 	     {
- 	$uname=~s/:/_/;
+ 		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
- 	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
+ 		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ 		 }
+ 		 return $a cmp $b;
+ 	     } (keys(%$fullname))) {
  	$ctr++;
- 	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+ 	$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},
- 				   $_,$$fullname{$_},\@parts,\%weight,$ctr);
+ 				   $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
      }
      $result.='</table></td></tr></table>';
      $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
- Line 2166  sub viewgrades {
+ Line 2860  sub viewgrades {
  	'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'}.
+ 	$result='<font color="red">There are no students in section "'.$env{'form.section'}.
- 	    '" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
+ 	    '" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
      }
      $result.=&show_grading_menu_form($symb,$url);
      return $result;
- Line 2175  sub viewgrades {
+ Line 2869  sub viewgrades {
  #--- call by previous routine to display each student
  sub viewstudentgrade {
-     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
+     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
      my ($uname,$udom) = split(/:/,$student);
-     $student=~s/:/_/;
      my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
-     my $result='<tr bgcolor="#ffffdd"><td align="right">'.$ctr.'&nbsp;</td><td>&nbsp;'.
+     my %aggregates = ();
+     my $result='<tr bgcolor="#ffffdd"><td align="right">'.
+ 	'<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> '.
- 	'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+ 	'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+     $student=~s/:/_/; # colon doen't work in javascript for names
      foreach my $apart (@$parts) {
  	my ($part,$type) = &split_part_type($apart);
  	my $score=$record{"resource.$part.$type"};
+         $result.='<td align="center">';
+         my ($aggtries,$totaltries);
+         unless (exists($aggregates{$part})) {
+ 	    $totaltries = $record{'resource.'.$part.'.tries'};
+ 	    $aggtries = $totaltries;
+             if ($$last_resets{$part}) {
+                 $aggtries = &get_num_tries(\%record,$$last_resets{$part},
+ 					   $part);
+             }
+             $result.='<input type="hidden" name="'.
+                 'GD_'.$student.'_'.$part.'_aggtries" value="'.$aggtries.'" />'."\n";
+             $result.='<input type="hidden" name="'.
+                 'GD_'.$student.'_'.$part.'_totaltries" value="'.$totaltries.'" />'."\n";
+             $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.='<td align="middle"><input type="text" name="'.
+ 	    $result.='<input type="text" name="'.
  		'GD_'.$student.'_'.$part.'_awarded" '.
  		'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
  		'\')" value="'.$pts.'" size="4" /></td>'."\n";
- Line 2199  sub viewstudentgrade {
+ Line 2912  sub viewstudentgrade {
  	    $status = 'nothing' if ($status eq '');
  	    $result.='<input type="hidden" name="'.'GD_'.$student.'_'.
  		$part.'_solved_s" value="'.$status.'" />'."\n";
- 	    $result.='<td align="middle">&nbsp;<select name="'.
+ 	    $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>'
- Line 2210  sub viewstudentgrade {
+ Line 2923  sub viewstudentgrade {
  	    $result.='<input type="hidden" name="'.
  		'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
  		    "\n";
- 	    $result.='<td align="middle"><input type="text" name="'.
+ 	    $result.='<input type="text" name="'.
  		'GD_'.$student.'_'.$part.'_'.$type.'" '.
  		'value="'.$score.'" size="4" /></td>'."\n";
  	}
- Line 2224  sub viewstudentgrade {
+ Line 2937  sub viewstudentgrade {
  sub editgrades {
      my ($request) = @_;
-     my $symb=$ENV{'form.symb'};
+     my $symb=$env{'form.symb'};
-     my $url =$ENV{'form.url'};
+     my $url =$env{'form.url'};
      my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
-     $title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
+     $title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";
-     $title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
+     $title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";
      my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
      $result.= '<table border="0"><tr bgcolor="#deffff">'.
- Line 2242  sub editgrades {
+ Line 2955  sub editgrades {
  		    'ungraded' =>'ungraded_attempted',
  		    'nothing'  => '',
  		    );
-     my ($classlist,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+     my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
      my (@partid);
      my %weight = ();
      my %columns = ();
      my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
-     my (@parts) = sort(&getpartlist($url));
+     my (@parts) = sort(&getpartlist($url,$symb));
      my $header;
-     while ($ctr < $ENV{'form.totalparts'}) {
+     while ($ctr < $env{'form.totalparts'}) {
- 	my $partid = $ENV{'form.partid_'.$ctr};
+ 	my $partid = $env{'form.partid_'.$ctr};
  	push @partid,$partid;
- 	$weight{$partid} = $ENV{'form.weight_'.$partid};
+ 	$weight{$partid} = $env{'form.weight_'.$partid};
  	$ctr++;
      }
      foreach my $partid (@partid) {
- Line 2274  sub editgrades {
+ Line 2987  sub editgrades {
  	}
      }
      foreach my $partid (@partid) {
+ 	my $display_part=&get_display_part($partid,$url,$symb);
  	$result .= '<td colspan="'.$columns{$partid}.
- 	    '" align="center"><b>Part '.$partid.
+ 	    '" align="center"><b>Part:</b> '.$display_part.
- 	    '</b> (Weight = '.$weight{$partid}.')</td>';
+ 	    ' (Weight = '.$weight{$partid}.')</td>';
      }
      $result .= '</tr><tr bgcolor="#deffff">';
- Line 2284  sub editgrades {
+ Line 2998  sub editgrades {
      $result .= '</tr>'."\n";
      my $noupdate;
      my ($updateCtr,$noupdateCtr) = (1,1);
-     for ($i=0; $i<$ENV{'form.total'}; $i++) {
+     for ($i=0; $i<$env{'form.total'}; $i++) {
  	my $line;
- 	my $user = $ENV{'form.ctr'.$i};
+ 	my $user = $env{'form.ctr'.$i};
- 	my $usercolon = $user;
+ 	my ($uname,$udom)=split(/:/,$user);
- 	$usercolon =~s/_/:/;
- 	my ($uname,$udom)=split(/_/,$user);
  	my %newrecord;
  	my $updateflag = 0;
- 	$line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';
+ 	$line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
  	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>";
  	    next;
  	}
+         my %aggregate = ();
+         my $aggregateflag = 0;
+ 	$user=~s/:/_/; # colon doen't work in javascript for names
  	foreach (@partid) {
- 	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
+ 	    my $old_aw    = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};
  	    my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
  	    my $old_part  = $old_aw eq '' ? '' : $old_part_pcr;
- 	    my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ 	    my $old_score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ 	    my $awarded   = $env{'form.GD_'.$user.'_'.$_.'_awarded'};
- 	    my $awarded   = $ENV{'form.GD_'.$user.'_'.$_.'_awarded'};
  	    my $pcr       = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);
  	    my $partial   = $awarded eq '' ? '' : $pcr;
  	    my $score;
  	    if ($partial eq '') {
- 		$score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ 		$score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
  	    } elsif ($partial > 0) {
  		$score = 'correct_by_override';
  	    } elsif ($partial == 0) {
  		$score = 'incorrect_by_override';
  	    }
- 	    my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+ 	    my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};
  	    $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
+ 	    $newrecord{'resource.'.$_.'.regrader'}=
+ 		"$env{'user.name'}:$env{'user.domain'}";
  	    if ($dropMenu eq 'reset status' &&
  		$old_score ne '') { # ignore if no previous attempts => nothing to reset
- 		$newrecord{'resource.'.$_.'.tries'} = 0;
+ 		$newrecord{'resource.'.$_.'.tries'} = '';
  		$newrecord{'resource.'.$_.'.solved'} = '';
  		$newrecord{'resource.'.$_.'.award'} = '';
- 		$newrecord{'resource.'.$_.'.awarded'} = 0;
+ 		$newrecord{'resource.'.$_.'.awarded'} = '';
- 		$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
  		$updateflag = 1;
+                 if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {
+                     my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};
+                     my $totaltries = $env{'form.GD_'.$user.'_'.$_.'_totaltries'};
+                     my $solvedstatus = $env{'form.GD_'.$user.'_'.$_.'_solved_s'};
+                     &decrement_aggs($symb,$_,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                     $aggregateflag = 1;
+                 }
+ 	    } elsif (!($old_part eq $partial && $old_score eq $score)) {
+ 		$updateflag = 1;
+ 		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
+ 		$newrecord{'resource.'.$_.'.solved'}   = $score;
+ 		$rec_update++;
  	    }
  	    $line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
  		'<td align="center">'.$awarded.
  		($score eq 'excused' ? $score : '').'&nbsp;</td>';
- 	    if (!($old_part eq $partial && $old_score eq $score)) {
- 		$updateflag = 1;
- 		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
- 		$newrecord{'resource.'.$_.'.solved'}   = $score;
- 		$rec_update++;
- 	    }
  	    my $partid=$_;
  	    foreach my $stores (@parts) {
  		my ($part,$type) = &split_part_type($stores);
  		if ($part !~ m/^\Q$partid\E/) { next;}
  		if ($type eq 'awarded' || $type eq 'solved') { next; }
- 		my $old_aw    = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
+ 		my $old_aw    = $env{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
- 		my $awarded   = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
+ 		my $awarded   = $env{'form.GD_'.$user.'_'.$part.'_'.$type};
  		if ($awarded ne '' && $awarded ne $old_aw) {
  		    $newrecord{'resource.'.$part.'.'.$type}= $awarded;
- 		    $newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ 		    $newrecord{'resource.'.$part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
  		    $updateflag=1;
  		}
  		$line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
- Line 2357  sub editgrades {
+ Line 3078  sub editgrades {
  	    }
  	}
  	$line.='</tr>'."\n";
+ 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
  	if ($updateflag) {
  	    $count++;
- 	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
+ 	    &Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},
  				    $udom,$uname);
+ 	    if (&Apache::bridgetask::in_queue('gradingqueue',$symb,$cdom,
+ 					      $cnum,$udom,$uname)) {
+ 		# need to figure out if should be in queue.
+ 		my %record =
+ 		    &Apache::lonnet::restore($symb,$env{'request.course.id'},
+ 					     $udom,$uname);
+ 		my $all_graded = 1;
+ 		my $none_graded = 1;
+ 		foreach my $part (@parts) {
+ 		    if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
+ 			$all_graded = 0;
+ 		    } else {
+ 			$none_graded = 0;
+ 		    }
+ 		}
+ 		if ($all_graded || $none_graded) {
+ 		    &Apache::bridgetask::remove_from_queue('gradingqueue',
+ 							   $symb,$cdom,$cnum,
+ 							   $udom,$uname);
+ 		}
+ 	    }
  	    $result.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$updateCtr.'&nbsp;</td>'.$line;
  	    $updateCtr++;
  	} else {
  	    $noupdate.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$noupdateCtr.'&nbsp;</td>'.$line;
  	    $noupdateCtr++;
  	}
+         if ($aggregateflag) {
+             &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+ 				  $cdom,$cnum);
+         }
      }
      if ($noupdate) {
  #	my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
  	my $numcols=scalar(@partid)*4+2;
- 	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr>'.$noupdate;
+ 	$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);
      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 />';
+ 	'<b>Total number of students = '.$env{'form.total'}.'</b><br />';
      return $title.$msg.$result;
  }
- Line 2400  sub split_part_type {
+ Line 3153  sub split_part_type {
  #
  #--- Javascript to handle csv upload
  sub csvupload_javascript_reverse_associate {
+     my $error1=&mt('You need to specify the username or ID');
+     my $error2=&mt('You need to specify at least one grading field');
    return(<<ENDPICK);
    function verify(vf) {
      var foundsomething=0;
      var founduname=0;
-     var founddomain=0;
+     var foundID=0;
      for (i=0;i<=vf.nfields.value;i++) {
        tw=eval('vf.f'+i+'.selectedIndex');
-       if (i==0 && tw!=0) { founduname=1; }
+       if (i==0 && tw!=0) { foundID=1; }
-       if (i==1 && tw!=0) { founddomain=1; }
+       if (i==1 && tw!=0) { founduname=1; }
-       if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }
+       if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
      }
-     if (founduname==0 || founddomain==0) {
+     if (founduname==0 && foundID==0) {
-       alert('You need to specify at both the username and domain');
+ 	alert('$error1');
-       return;
+ 	return;
      }
      if (foundsomething==0) {
-       alert('You need to specify at least one grading field');
+ 	alert('$error2');
-       return;
+ 	return;
      }
      vf.submit();
    }
- Line 2438  ENDPICK
+ Line 3193  ENDPICK
  }
  sub csvupload_javascript_forward_associate {
+     my $error1=&mt('You need to specify the username or ID');
+     my $error2=&mt('You need to specify at least one grading field');
    return(<<ENDPICK);
    function verify(vf) {
      var foundsomething=0;
      var founduname=0;
-     var founddomain=0;
+     var foundID=0;
      for (i=0;i<=vf.nfields.value;i++) {
        tw=eval('vf.f'+i+'.selectedIndex');
-       if (tw==1) { founduname=1; }
+       if (tw==1) { foundID=1; }
-       if (tw==2) { founddomain=1; }
+       if (tw==2) { founduname=1; }
-       if (tw>2) { foundsomething=1; }
+       if (tw>3) { foundsomething=1; }
      }
-     if (founduname==0 || founddomain==0) {
+     if (founduname==0 && foundID==0) {
-       alert('You need to specify at both the username and domain');
+ 	alert('$error1');
-       return;
+ 	return;
      }
      if (foundsomething==0) {
-       alert('You need to specify at least one grading field');
+ 	alert('$error2');
-       return;
+ 	return;
      }
      vf.submit();
    }
- Line 2475  ENDPICK
+ Line 3232  ENDPICK
  sub csvuploadmap_header {
      my ($request,$symb,$url,$datatoken,$distotal)= @_;
      my $javascript;
-     if ($ENV{'form.upfile_associate'} eq 'reverse') {
+     if ($env{'form.upfile_associate'} eq 'reverse') {
  	$javascript=&csvupload_javascript_reverse_associate();
      } else {
  	$javascript=&csvupload_javascript_forward_associate();
      }
-     my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
+     my ($result) = &showResourceInfo($url,$env{'form.probTitle'});
+     my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
+     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 Grades</font></h3>
- Line 2493  Total number of records found in file: $
+ Line 3251  Total number of records found in file: $
  Enter as many fields as you can. The system will inform you and bring you back
  to this page if the data selected is insufficient to run your class.<hr />
  <input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+ <label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
  <input type="hidden" name="associate"  value="" />
  <input type="hidden" name="phase"      value="three" />
  <input type="hidden" name="datatoken"  value="$datatoken" />
- <input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
+ <input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
- <input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
+ <input type="hidden" name="upfiletype" value="$env{'form.upfiletype'}" />
  <input type="hidden" name="upfile_associate"
-                                        value="$ENV{'form.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="saveState"  value="$env{'form.saveState'}" />
- <input type="hidden" name="probTitle"  value="$ENV{'form.probTitle'}" />
+ <input type="hidden" name="probTitle"  value="$env{'form.probTitle'}" />
- <input type="hidden" name="command"    value="csvuploadassign" />
+ <input type="hidden" name="command"    value="csvuploadoptions" />
  <hr />
  <script type="text/javascript" language="Javascript">
  $javascript
- Line 2515  ENDPICK
+ Line 3274  ENDPICK
  }
  sub csvupload_fields {
-     my ($url) = @_;
+     my ($url,$symb) = @_;
-     my (@parts) = &getpartlist($url);
+     my (@parts) = &getpartlist($url,$symb);
-     my @fields=(['username','Student Username'],['domain','Student Domain']);
+     my @fields=(['ID','Student ID'],
+ 		['username','Student Username'],
+ 		['domain','Student Domain']);
      foreach my $part (sort(@parts)) {
  	my @datum;
  	my $display=&Apache::lonnet::metadata($url,$part.'.display');
  	my $name=$part;
  	if  (!$display) { $display = $name; }
  	@datum=($name,$display);
+ 	if ($name=~/^stores_(.*)_awarded/) {
+ 	    push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
+ 	}
  	push(@fields,\@datum);
      }
      return (@fields);
- Line 2540  sub csvuploadmap_footer {
+ Line 3304  sub csvuploadmap_footer {
  ENDPICK
  }
- sub upcsvScores_form {
+ sub checkforfile_js {
-     my ($request) = shift;
-     my ($symb,$url)=&get_symb_and_url($request);
-     if (!$symb) {return '';}
      my $result =<<CSVFORMJS;
  <script type="text/javascript" language="javascript">
      function checkUpload(formname) {
- Line 2555  sub upcsvScores_form {
+ Line 3316  sub upcsvScores_form {
      }
      </script>
  CSVFORMJS
-     $ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+     return $result;
-     my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ }
+ sub upcsvScores_form {
+     my ($request) = shift;
+     my ($symb,$url)=&get_symb_and_url($request);
+     if (!$symb) {return '';}
+     my $result=&checkforfile_js();
+     $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+     my ($table) = &showResourceInfo($url,$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";
- Line 2564  CSVFORMJS
+ Line 3333  CSVFORMJS
  	'.</b></td></tr>'."\n";
      $result.='<tr bgcolor=#ffffe6><td>'."\n";
      my $upfile_select=&Apache::loncommon::upfile_select_html();
+     my $ignore=&mt('Ignore First Line');
      $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="probTitle" value="$env{'form.probTitle'}" />
- <input type="hidden" name="saveState"  value="$ENV{'form.saveState'}" />
+ <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
  $upfile_select
  <br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
+ <label><input type="checkbox" name="noFirstLine" />$ignore</label>
  </form>
  ENDUPFORM
      $result.='</td></tr></table>'."\n";
- Line 2589  sub csvuploadmap {
+ Line 3359  sub csvuploadmap {
      if (!$symb) {return '';}
      my $datatoken;
-     if (!$ENV{'form.datatoken'}) {
+     if (!$env{'form.datatoken'}) {
  	$datatoken=&Apache::loncommon::upfile_store($request);
      } else {
- 	$datatoken=$ENV{'form.datatoken'};
+ 	$datatoken=$env{'form.datatoken'};
  	&Apache::loncommon::load_tmp_file($request);
      }
      my @records=&Apache::loncommon::upfile_record_sep();
+     if ($env{'form.noFirstLine'}) { shift(@records); }
      &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
      my ($i,$keyfields);
      if (@records) {
- 	my @fields=&csvupload_fields($url);
+ 	my @fields=&csvupload_fields($url,$symb);
- 	if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ 	if ($env{'form.upfile_associate'} eq 'reverse') {
  	    &Apache::loncommon::csv_print_samples($request,\@records);
  	    $i=&Apache::loncommon::csv_print_select_table($request,\@records,
  							  \@fields);
- Line 2611  sub csvuploadmap {
+ Line 3382  sub csvuploadmap {
  	    unshift(@fields,['none','']);
  	    $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
  							    \@fields);
- 	    my %sone=&Apache::loncommon::record_sep($records[0]);
+             foreach my $rec (@records) {
- 	    $keyfields=join(',',sort(keys(%sone)));
+                 my %temp = &Apache::loncommon::record_sep($rec);
+                 if (%temp) {
+                     $keyfields=join(',',sort(keys(%temp)));
+                     last;
+                 }
+             }
  	}
      }
      &csvuploadmap_footer($request,$i,$keyfields);
- Line 2621  sub csvuploadmap {
+ Line 3397  sub csvuploadmap {
      return '';
  }
- sub csvuploadassign {
+ sub csvuploadoptions {
      my ($request)= @_;
      my ($symb,$url)=&get_symb_and_url($request);
-     if (!$symb) {return '';}
+     my $checked=(($env{'form.noFirstLine'})?'1':'0');
-     &Apache::loncommon::load_tmp_file($request);
+     my $ignore=&mt('Ignore First Line');
-     my @gradedata = &Apache::loncommon::upfile_record_sep();
+     $request->print(<<ENDPICK);
-     my @keyfields = split(/\,/,$ENV{'form.keyfields'});
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-     my %fields=();
+ <h3><font color="#339933">Uploading Class Grade Options</font></h3>
-     for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
+ <input type="hidden" name="command"    value="csvuploadassign" />
- 	if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ <!--
- 	    if ($ENV{'form.f'.$i} ne 'none') {
+ <p>
- 		$fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+ <label>
+    <input type="checkbox" name="show_full_results" />
+    Show a table of all changes
+ </label>
+ </p>
+ -->
+ <p>
+ <label>
+    <input type="checkbox" name="overwite_scores" checked="checked" />
+    Overwrite any existing score
+ </label>
+ </p>
+ ENDPICK
+     my %fields=&get_fields();
+     if (!defined($fields{'domain'})) {
+ 	my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
+ 	$request->print("\n<p> Users are in domain: ".$domform."</p>\n");
+     }
+     foreach my $key (sort(keys(%env))) {
+ 	if ($key !~ /^form\.(.*)$/) { next; }
+ 	my $cleankey=$1;
+ 	if ($cleankey eq 'command') { next; }
+ 	$request->print('<input type="hidden" name="'.$cleankey.
+ 			'"  value="'.$env{$key}.'" />'."\n");
+     }
+     # FIXME do a check for any duplicated user ids...
+     # 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));
+     return '';
+ }
+ sub get_fields {
+     my %fields;
+     my @keyfields = split(/\,/,$env{'form.keyfields'});
+     for (my $i=0; $i<=$env{'form.nfields'}; $i++) {
+ 	if ($env{'form.upfile_associate'} eq 'reverse') {
+ 	    if ($env{'form.f'.$i} ne 'none') {
+ 		$fields{$keyfields[$i]}=$env{'form.f'.$i};
  	    }
  	} else {
- 	    if ($ENV{'form.f'.$i} ne 'none') {
+ 	    if ($env{'form.f'.$i} ne 'none') {
- 		$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+ 		$fields{$env{'form.f'.$i}}=$keyfields[$i];
  	    }
  	}
      }
+     return %fields;
+ }
+ sub csvuploadassign {
+     my ($request)= @_;
+     my ($symb,$url)=&get_symb_and_url($request);
+     if (!$symb) {return '';}
+     &Apache::loncommon::load_tmp_file($request);
+     my @gradedata = &Apache::loncommon::upfile_record_sep();
+     if ($env{'form.noFirstLine'}) { shift(@gradedata); }
+     my %fields=&get_fields();
      $request->print('<h3>Assigning Grades</h3>');
-     my $courseid=$ENV{'request.course.id'};
+     my $courseid=$env{'request.course.id'};
      my ($classlist) = &getclasslist('all',0);
      my @notallowed;
      my @skipped;
      my $countdone=0;
      foreach my $grade (@gradedata) {
  	my %entries=&Apache::loncommon::record_sep($grade);
+ 	my $domain;
+ 	if ($entries{$fields{'domain'}}) {
+ 	    $domain=$entries{$fields{'domain'}};
+ 	} else {
+ 	    $domain=$env{'form.default_domain'};
+ 	}
+ 	$domain=~s/\s//g;
  	my $username=$entries{$fields{'username'}};
- 	my $domain=$entries{$fields{'domain'}};
+ 	$username=~s/\s//g;
+ 	if (!$username) {
+ 	    my $id=$entries{$fields{'ID'}};
+ 	    $id=~s/\s//g;
+ 	    my %ids=&Apache::lonnet::idget($domain,$id);
+ 	    $username=$ids{$id};
+ 	}
  	if (!exists($$classlist{"$username:$domain"})) {
- 	    push(@skipped,"$username:$domain");
+ 	    my $id=$entries{$fields{'ID'}};
+ 	    $id=~s/\s//g;
+ 	    if ($id) {
+ 		push(@skipped,"$id:$domain");
+ 	    } else {
+ 		push(@skipped,"$username:$domain");
+ 	    }
  	    next;
  	}
  	my $usec=$classlist->{"$username:$domain"}[5];
- Line 2659  sub csvuploadassign {
+ Line 3504  sub csvuploadassign {
  	    push(@notallowed,"$username:$domain");
  	    next;
  	}
+ 	my %points;
  	my %grades;
  	foreach my $dest (keys(%fields)) {
- 	    if ($dest eq 'username' || $dest eq 'domain') { next; }
+ 	    if ($dest eq 'ID' || $dest eq 'username' ||
- 	    if ($entries{$fields{$dest}} eq '') { next; }
+ 		$dest eq 'domain') { next; }
- 	    my $store_key=$dest;
+ 	    if ($entries{$fields{$dest}} =~ /^\s*$/) { next; }
- 	    $store_key=~s/^stores/resource/;
+ 	    if ($dest=~/stores_(.*)_points/) {
- 	    $store_key=~s/_/\./g;
+ 		my $part=$1;
- 	    $grades{$store_key}=$entries{$fields{$dest}};
+ 		my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
- 	}
+ 					      $symb,$domain,$username);
- 	$grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ 		$entries{$fields{$dest}}=~s/\s//g;
- 	&Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
+ 		my $pcr=$entries{$fields{$dest}} / $wgt;
- 				$domain,$username);
+ 		my $award='correct_by_override';
- 	$request->print('.');
+ 		$grades{"resource.$part.awarded"}=$pcr;
+ 		$grades{"resource.$part.solved"}=$award;
+ 		$points{$part}=1;
+ 	    } else {
+ 		if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
+ 		if ($dest=~/stores_(.*)_solved/)  { if ($points{$1}) {next;} }
+ 		my $store_key=$dest;
+ 		$store_key=~s/^stores/resource/;
+ 		$store_key=~s/_/\./g;
+ 		$grades{$store_key}=$entries{$fields{$dest}};
+ 	    }
+ 	}
+ 	if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
+ 	$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);
+ 	if ($result eq 'ok') {
+ 	    $request->print('.');
+ 	} else {
+ 	    $request->print("<p>
+                               <font color='red'>
+                                  Failed to store student $username\@$domain.
+                                  Message when trying to store was ($result)
+                               </font>
+                              </p>" );
+ 	}
  	$request->rflush();
  	$countdone++;
      }
- Line 2716  function checkPickOne(formname) {
+ Line 3589  function checkPickOne(formname) {
  LISTJAVASCRIPT
      &commonJSfunctions($request);
      my ($symb,$url) = &get_symb_and_url($request);
-     my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
+     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
-     my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
+     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
-     my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
      my $result='<h3><font color="#339933">&nbsp;'.
  	'Manual Grading by Page or Sequence</font></h3>';
- Line 2726  LISTJAVASCRIPT
+ Line 3599  LISTJAVASCRIPT
      $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 ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/);
+     my ($curpage) =&Apache::lonnet::decode_symb($symb);
+ #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
+ #    my $type=($curpage =~ /\.(page|sequence)/);
      my $ctr=0;
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- Line 2746  LISTJAVASCRIPT
+ Line 3621  LISTJAVASCRIPT
      $result.='<input type="hidden" name="page" />'."\n".
  	'<input type="hidden" name="title" />'."\n";
-     $result.='&nbsp;<b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+     $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
- 	'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
+ 	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
      $result.='&nbsp;<b>Submission Details: </b>'.
- 	'<input type="radio" name="lastSub" value="none" /> none'."\n".
+ 	'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
- 	'<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".
+ 	'<label><input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions</label>'."\n".
- 	'<input type="radio" name="lastSub" value="all" /> all details'."\n";
+ 	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";
      $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
- 	'<input type="hidden" name="Status"  value="'.$ENV{'form.Status'}.'" />'."\n".
+ 	'<input type="hidden" name="Status"  value="'.$env{'form.Status'}.'" />'."\n".
  	'<input type="hidden" name="command" value="displayPage" />'."\n".
  	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
  	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
- 	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."<br />\n";
+ 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
      $result.='&nbsp;<input type="button" '.
  	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
- Line 2776  LISTJAVASCRIPT
+ Line 3651  LISTJAVASCRIPT
      my (undef,undef,$fullname) = &getclasslist($getsec,'1');
      my $ptr = 1;
-     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+     foreach my $student (sort
+ 			 {
+ 			     if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ 				 return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ 			     }
+ 			     return $a cmp $b;
+ 			 } (keys(%$fullname))) {
  	my ($uname,$udom) = split(/:/,$student);
  	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
  	$studentTable.='<td align="right">'.$ptr.'&nbsp;</td>';
- 	$studentTable.='<td>&nbsp;<input type="radio" name="student" value="'.$student.'" /> '
+ 	$studentTable.='<td>&nbsp;<label><input type="radio" name="student" value="'.$student.'" /> '
- 	    .&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n";
+ 	    .&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
  	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
  	$ptr++;
      }
- Line 2798  LISTJAVASCRIPT
+ Line 3679  LISTJAVASCRIPT
  sub getSymbMap {
      my ($request) = @_;
-     my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
+     my $navmap = Apache::lonnavmaps::navmap->new();
- 						  $ENV{'request.course.fn'}.'_parms.db');
- #    $navmap->init();
      my %symbx = ();
      my @titles = ();
      my $minder = 0;
      # Gather every sequence that has problems.
-     my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
+     my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },
+,0,1);
      for my $sequence ($navmap->getById('0.0'), @sequences) {
  	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
  	    my $title = $minder.'.'.$sequence->compTitle();
- Line 2816  sub getSymbMap {
+ Line 3696  sub getSymbMap {
  	    $minder++;
  	}
      }
-     $navmap->untieHashes();
      return \@titles,\%symbx;
  }
- Line 2827  sub displayPage {
+ Line 3705  sub displayPage {
      my ($request) = shift;
      my ($symb,$url) = &get_symb_and_url($request);
-     my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
+     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
-     my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
+     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
-     my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
-     my $pageTitle = $ENV{'form.page'};
+     my $pageTitle = $env{'form.page'};
      my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
-     my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+     my ($uname,$udom) = split(/:/,$env{'form.student'});
-     my $usec=$classlist->{$ENV{'form.student'}}[5];
+     my $usec=$classlist->{$env{'form.student'}}[5];
+     #need to make sure we have the correct data for later EXT calls,
+     #thus invalidate the cache
+     &Apache::lonnet::devalidatecourseresdata(
+                  $env{'course.'.$env{'request.course.id'}.'.num'},
+                  $env{'course.'.$env{'request.course.id'}.'.domain'});
+     &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('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
  	$request->print(&show_grading_menu_form($symb,$url));
  	return;
      }
-     my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
+     my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
-     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
+     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
  	'</h3>'."\n";
      &sub_page_js($request);
      $request->print($result);
-     my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
+     my $navmap = Apache::lonnavmaps::navmap->new();
- 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
+     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
-     my ($mapUrl, $id, $resUrl) = split(/___/, $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(&show_grading_menu_form($symb,$url));
+ 	return;
+     }
      my $iterator = $navmap->getIterator($map->map_start(),
  					$map->map_finish());
      my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
  	'<input type="hidden" name="command" value="gradeByPage" />'."\n".
- 	'<input type="hidden" name="fullname" value="'.$$fullname{$ENV{'form.student'}}.'" />'."\n".
+ 	'<input type="hidden" name="fullname" value="'.$$fullname{$env{'form.student'}}.'" />'."\n".
- 	'<input type="hidden" name="student" value="'.$ENV{'form.student'}.'" />'."\n".
+ 	'<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="title"   value="'.$env{'form.title'}.'" />'."\n".
  	'<input type="hidden" name="url"     value="'.$url.'" />'."\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";
+ 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
      my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
  	'/check.gif" height="16" border="0" />';
- Line 2872  sub displayPage {
+ Line 3761  sub displayPage {
  	'<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">'.
  	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
- 	'<td><b>&nbsp;'.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+ 	'<td><b>&nbsp;'.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
-     my ($depth,$question) = (1,1);
+     my ($depth,$question,$prob) = (1,1,1);
      $iterator->next(); # skip the first BEGIN_MAP
      my $curRes = $iterator->next(); # for "current resource"
      while ($depth > 0) {
          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
          if($curRes == $iterator->END_MAP) { $depth--; }
-         if (ref($curRes) && $curRes->is_problem()) {
+         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
  	    my $parts = $curRes->parts();
              my $title = $curRes->compTitle();
  	    my $symbx = $curRes->symb();
- 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+ 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
  		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
  	    $studentTable.='<td valign="top">';
- 	    if ($ENV{'form.vProb'} eq 'yes') {
+ 	    if ($env{'form.vProb'} eq 'yes' ) {
- 		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1);
+ 		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
+ 					     undef,'both');
  	    } 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'});
  		$companswer =~ s|<form(.*?)>||g;
  		$companswer =~ s|</form>||g;
  #		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
- Line 2902  sub displayPage {
+ Line 3792  sub displayPage {
  		$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);
+ 	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
- 	    if ($ENV{'form.lastSub'} eq 'datesub') {
+ 	    if ($env{'form.lastSub'} eq 'datesub') {
  		if ($record{'version'} eq '') {
  		    $studentTable.='<br />&nbsp;<font color="red">No recorded submission for this problem</font><br />';
  		} else {
  		    my %responseType = ();
  		    foreach my $partid (@{$parts}) {
- 			$responseType{$partid} = $curRes->responseType($partid);
+ 			my @responseIds =$curRes->responseIds($partid);
+ 			my @responseType =$curRes->responseType($partid);
+ 			my %responseIds;
+ 			for (my $i=0;$i<=$#responseIds;$i++) {
+ 			    $responseIds{$responseIds[$i]}=$responseType[$i];
+ 			}
+ 			$responseType{$partid} = \%responseIds;
  		    }
- 		    $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
+ 		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
  		}
- 	    } elsif ($ENV{'form.lastSub'} eq 'all') {
+ 	    } elsif ($env{'form.lastSub'} eq 'all') {
- 		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+ 		my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
  		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
- 									$ENV{'request.course.id'},
+ 									$env{'request.course.id'},
  									'','.submission');
  	    }
- Line 2927  sub displayPage {
+ Line 3824  sub displayPage {
  		    $studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
  		    $question++;
  		}
+ 		$prob++;
  	    }
  	    $studentTable.='</td></tr>';
- Line 2934  sub displayPage {
+ Line 3832  sub displayPage {
          $curRes = $iterator->next();
      }
-     $navmap->untieHashes();
      $studentTable.='</td></tr></table></td></tr></table>'."\n".
  	'<input type="button" value="Save" '.
  	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
- Line 2947  sub displayPage {
+ Line 3843  sub displayPage {
  }
  sub displaySubByDates {
-     my ($symbx,$record,$parts,$responseType,$checkIcon) = @_;
+     my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
+     my $isCODE=0;
+     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">'.
  	'<td><b>Date/Time</b></td>'.
+ 	($isCODE?'<td><b>CODE</b></td>':'').
  	'<td><b>Submission</b></td>'.
  	'<td><b>Status&nbsp;</b></td></tr>';
      my ($version);
      my %mark;
+     my %orders;
      $mark{'correct_by_student'} = $checkIcon;
-     return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />'
+     if (!exists($$record{'1:timestamp'})) {
- 	if (!exists($$record{'1:timestamp'}));
+ 	return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />';
+     }
      for ($version=1;$version<=$$record{'version'};$version++) {
  	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
  	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+ 	if ($isCODE) {
+ 	    $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
+ 	}
  	my @versionKeys = split(/\:/,$$record{$version.':keys'});
  	my @displaySub = ();
  	foreach my $partid (@{$parts}) {
- 	    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
+ 	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
  #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
- 	    $displaySub[0].=(exists $$record{$version.':'.$matchKey[0]}) ?
+ 	    my $display_part=&get_display_part($partid,undef,$symb);
- 		'<b>Part&nbsp;'.$partid.'&nbsp;'.
+ 	    foreach my $matchKey (@matchKey) {
- 		($$record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
+ 		if (exists($$record{$version.':'.$matchKey}) &&
- 		 'Trial&nbsp;'.$$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
+ 		    $$record{$version.':'.$matchKey} ne '') {
- 		 &cleanRecord($$record{$version.':'.$matchKey[0]},$$responseType{$partid},$$symbx).'<br />' : '';
+ 		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
- 	    $displaySub[1].=(exists $$record{"$version:resource.$partid.award"}) ?
+ 		    $displaySub[0].='<b>Part:</b>&nbsp;'.$display_part.'&nbsp;';
- 		'<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
+ 		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
- 		lc($$record{"$version:resource.$partid.award"}).' '.
+ 			$responseId.')</font>&nbsp;<b>';
- 		$mark{$$record{"$version:resource.$partid.solved"}}.'<br />' : '';
+ 		    if ($$record{"$version:resource.$partid.tries"} eq '') {
- 	    $displaySub[2].=(exists $$record{"$version:resource.$partid.regrader"}) ?
+ 			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
- 		$$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
+ 		    } else {
- 	}
+ 			$displaySub[0].='Trial&nbsp;'.
- 	$displaySub[2].=(exists $$record{"$version:resource.regrader"}) ?
+ 			    $$record{"$version:resource.$partid.tries"};
- 	    $$record{"$version:resource.regrader"} : ''; # needed because old essay regrader has not parts info
+ 		    }
- 	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1].
+ 		    my $responseType=$responseType->{$partid}->{$responseId};
- 	    ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).'&nbsp;</td></tr>';
+ 		    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 />';
+ 		}
+ 	    }
+ 	    if (exists $$record{"$version:resource.$partid.award"}) {
+ 		$displaySub[1].='<b>Part:</b>&nbsp;'.$display_part.' &nbsp;'.
+ 		    lc($$record{"$version:resource.$partid.award"}).' '.
+ 		    $mark{$$record{"$version:resource.$partid.solved"}}.
+ 		    '<br />';
+ 	    }
+ 	    if (exists $$record{"$version:resource.$partid.regrader"}) {
+ 		$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+ 		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+ 	    }
+ 	}
+ 	# needed because old essay regrader has not parts info
+ 	if (exists $$record{"$version:resource.regrader"}) {
+ 	    $displaySub[2].=$$record{"$version:resource.regrader"};
+ 	}
+ 	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1];
+ 	if ($displaySub[2]) {
+ 	    $studentTable.='Manually graded by '.$displaySub[2];
+ 	}
+ 	$studentTable.='&nbsp;</td></tr>';
      }
      $studentTable.='</table></td></tr></table>';
      return $studentTable;
- Line 2990  sub displaySubByDates {
+ Line 3923  sub displaySubByDates {
  sub updateGradeByPage {
      my ($request) = shift;
-     my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
+     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
-     my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
+     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
-     my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
-     my $pageTitle = $ENV{'form.page'};
+     my $pageTitle = $env{'form.page'};
      my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
-     my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+     my ($uname,$udom) = split(/:/,$env{'form.student'});
-     my $usec=$classlist->{$ENV{'form.student'}}[5];
+     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('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
- 	$request->print(&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}));
+ 	$request->print(&show_grading_menu_form($env{'form.symb'},$env{'form.url'}));
  	return;
      }
-     my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
+     my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
-     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
+     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
  	'</h3>'."\n";
      $request->print($result);
-     my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
+     my $navmap = Apache::lonnavmaps::navmap->new();
- 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
+     my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
-     my ($mapUrl, $id, $resUrl) = split(/___/, $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>');
+ 	my ($symb,$url)=&get_symb_and_url($request);
+ 	$request->print(&show_grading_menu_form($symb,$url));
+ 	return;
+     }
      my $iterator = $navmap->getIterator($map->map_start(),
  					$map->map_finish());
- Line 3025  sub updateGradeByPage {
+ Line 3962  sub updateGradeByPage {
      $iterator->next(); # skip the first BEGIN_MAP
      my $curRes = $iterator->next(); # for "current resource"
-     my ($depth,$question,$changeflag)= (1,1,0);
+     my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
      while ($depth > 0) {
          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
          if($curRes == $iterator->END_MAP) { $depth--; }
- Line 3034  sub updateGradeByPage {
+ Line 3971  sub updateGradeByPage {
  	    my $parts = $curRes->parts();
              my $title = $curRes->compTitle();
  	    my $symbx = $curRes->symb();
- 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+ 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
  		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
  	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
  	    my %newrecord=();
  	    my @displayPts=();
+             my %aggregate = ();
+             my $aggregateflag = 0;
  	    foreach my $partid (@{$parts}) {
- 		my $newpts = $ENV{'form.GD_BOX'.$question.'_'.$partid};
+ 		my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
- 		my $oldpts = $ENV{'form.oldpts'.$question.'_'.$partid};
+ 		my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
- 		my $wgt = $ENV{'form.WGT'.$question.'_'.$partid} != 0 ?
+ 		my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ?
- 		    $ENV{'form.WGT'.$question.'_'.$partid} : 1;
+ 		    $env{'form.WGT'.$question.'_'.$partid} : 1;
  		my $partial = $newpts/$wgt;
  		my $score;
  		if ($partial > 0) {
- Line 3053  sub updateGradeByPage {
+ Line 3992  sub updateGradeByPage {
  		} elsif ($newpts ne '') { #empty is taken as 0
  		    $score = 'incorrect_by_override';
  		}
- 		my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};
+ 		my $dropMenu = $env{'form.GD_SEL'.$question.'_'.$partid};
  		if ($dropMenu eq 'excused') {
  		    $partial = '';
  		    $score = 'excused';
  		} elsif ($dropMenu eq 'reset status'
- 			 && $ENV{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
+ 			 && $env{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
  		    $newrecord{'resource.'.$partid.'.tries'} = 0;
  		    $newrecord{'resource.'.$partid.'.solved'} = '';
  		    $newrecord{'resource.'.$partid.'.award'} = '';
  		    $newrecord{'resource.'.$partid.'.awarded'} = 0;
- 		    $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}";
+ 		    $newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}";
  		    $changeflag++;
  		    $newpts = '';
+                     my $aggtries =  $env{'form.aggtries'.$question.'_'.$partid};
+                     my $totaltries = $env{'form.totaltries'.$question.'_'.$partid};
+                     my $solvedstatus = $env{'form.solved'.$question.'_'.$partid};
+                     if ($aggtries > 0) {
+                         &decrement_aggs($symbx,$partid,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                         $aggregateflag = 1;
+                     }
  		}
+ 		my $display_part=&get_display_part($partid,undef,
- 		my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
+ 						   $curRes->symb());
- 		$displayPts[0].='&nbsp;<b>Part</b> '.$partid.' = '.
+ 		my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
+ 		$displayPts[0].='&nbsp;<b>Part:</b> '.$display_part.' = '.
  		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
  		    '&nbsp;<br>';
- 		$displayPts[1].='&nbsp;<b>Part</b> '.$partid.' = '.
+ 		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
  		     (($score eq 'excused') ? 'excused' : $newpts).
  		    '&nbsp;<br>';
- Line 3081  sub updateGradeByPage {
+ Line 4029  sub updateGradeByPage {
  		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
  		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
- 		$newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+ 		$newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}"
  		    if (scalar(keys(%newrecord)) > 0);
  		$changeflag++;
  	    }
  	    if (scalar(keys(%newrecord)) > 0) {
- 		&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
+ 		&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
  					$udom,$uname);
  	    }
+             if ($aggregateflag) {
+                 &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                       $env{'course.'.$env{'request.course.id'}.'.domain'},
+                       $env{'course.'.$env{'request.course.id'}.'.num'});
+             }
  	    $studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
  		'<td valign="top">'.$displayPts[1].'</td>'.
  		'</tr>';
+ 	    $prob++;
  	}
          $curRes = $iterator->next();
      }
-     $navmap->untieHashes();
      $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'},$env{'form.url'});
      my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
  		  'The scores were changed for '.
  		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
- Line 3124  sub defaultFormData {
+ Line 4076  sub defaultFormData {
      return '
        <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="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
-      '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+      '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
  }
  sub getSequenceDropDown {
      my ($request,$symb)=@_;
      my $result='<select name="selectpage">'."\n";
      my ($titles,$symbx) = &getSymbMap($request);
-     my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/);
+     my ($curpage)=&Apache::lonnet::decode_symb($symb);
      my $ctr=0;
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- Line 3145  sub getSequenceDropDown {
+ Line 4097  sub getSequenceDropDown {
      return $result;
  }
- sub scantron_uploads {
+ sub scantron_filenames {
-     if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
+     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-     my $result=	'<select name="scantron_selectfile">';
+     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
-     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::loncreatecourse::propath($cdom,$cname));
+ 				    &Apache::loncommon::propath($cdom,$cname));
-     foreach my $filename (@files) {
+     my @possiblenames;
+     foreach my $filename (sort(@files)) {
  	($filename)=split(/&/,$filename);
  	if ($filename!~/^scantron_orig_/) { next ; }
  	$filename=~s/^scantron_orig_//;
- 	$result.="<option>$filename</option>\n";
+ 	push(@possiblenames,$filename);
+     }
+     return @possiblenames;
+ }
+ 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.="</select>";
      return $result;
- Line 3165  sub scantron_uploads {
+ Line 4126  sub scantron_uploads {
  sub scantron_scantab {
      my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
      my $result='<select name="scantron_format">'."\n";
+     $result.='<option></option>'."\n";
      foreach my $line (<$fh>) {
  	my ($name,$descrip)=split(/:/,$line);
  	if ($name =~ /^\#/) { next; }
- Line 3175  sub scantron_scantab {
+ Line 4137  sub scantron_scantab {
      return $result;
  }
+ sub scantron_CODElist {
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
+     my $namechoice='<option></option>';
+     foreach my $name (sort {uc($a) cmp uc($b)} @names) {
+ 	if ($name =~ /^error: 2 /) { next; }
+ 	if ($name =~ /^type\0/) { next; }
+ 	$namechoice.='<option value="'.$name.'">'.$name.'</option>';
+     }
+     $namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';
+     return $namechoice;
+ }
+ sub scantron_CODEunique {
+     my $result='<nobr>
+                  <label><input type="radio" name="scantron_CODEunique"
+                         value="yes" checked="checked" /> Yes </label>
+                 </nobr>
+                 <nobr>
+                  <label><input type="radio" name="scantron_CODEunique"
+                         value="no" /> No </label>
+                 </nobr>';
+     return $result;
+ }
  sub scantron_selectphase {
-     my ($r) = @_;
+     my ($r,$file2grade) = @_;
      my ($symb,$url)=&get_symb_and_url($r);
      if (!$symb) {return '';}
      my $sequence_selector=&getSequenceDropDown($r,$symb);
      my $default_form_data=&defaultFormData($symb,$url);
      my $grading_menu_button=&show_grading_menu_form($symb,$url);
-     my $file_selector=&scantron_uploads();
+     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,
      $result.= <<SCANTRONFORM;
- <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
+     <table width="100%" border="0">
-   <input type="hidden" name="command" value="scantron_validate" />
-   $default_form_data
-   <table width="100%" border="0">
      <tr>
+      <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
        <td bgcolor="#777777">
+        <input type="hidden" name="command" value="scantron_warning" />
+         $default_form_data
          <table width="100%" border="0">
            <tr bgcolor="#e6ffff">
-             <td>
+             <td colspan="2">
-               &nbsp;<b>Specify file location and which Folder/Sequence to grade</b>
+               &nbsp;<b>Specify file and which Folder/Sequence to grade</b>
              </td>
            </tr>
            <tr bgcolor="#ffffe6">
-             <td>
+             <td> Sequence to grade: </td><td> $sequence_selector </td>
-                Sequence to grade: $sequence_selector
- 	    </td>
            </tr>
            <tr bgcolor="#ffffe6">
+             <td> Filename of scoring office file: </td><td> $file_selector </td>
+           </tr>
+           <tr bgcolor="#ffffe6">
+             <td> Format of data file: </td><td> $format_selector </td>
+           </tr>
+           <tr bgcolor="#ffffe6">
+             <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
+           </tr>
+           <tr bgcolor="#ffffe6">
+             <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
+           </tr>
+           <tr bgcolor="#ffffe6">
+ 	    <td> Options: </td>
              <td>
- 		Filename of scoring office file: $file_selector
+ 	       <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>
  	    </td>
            </tr>
            <tr bgcolor="#ffffe6">
+             <td colspan="2">
+               <input type="submit" value="Grading: Validate Scantron Records" />
+             </td>
+           </tr>
+         </table>
+        </td>
+      </form>
+     </tr>
+ SCANTRONFORM
+     $r->print($result);
+     if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
+         &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+         $r->print(<<SCANTRONFORM);
+     <tr>
+       <td bgcolor="#777777">
+         <table width="100%" border="0">
+           <tr bgcolor="#e6ffff">
              <td>
-               Format of data file: $format_selector
+               &nbsp;<b>Specify a Scantron data file to upload.</b>
- 	    </td>
+             </td>
            </tr>
            <tr bgcolor="#ffffe6">
              <td>
- <!-- FIXME this is lazy, a single parse of the set should let me know what this is -->
+ SCANTRONFORM
-               Last line to expect an answer on:
+     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
-                 <input type="text" name="scantron_maxbubble" />
+     my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
- 	    </td>
+     my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
+     $r->print(<<UPLOAD);
+               <script type="text/javascript" language="javascript">
+     function checkUpload(formname) {
+ 	if (formname.upfile.value == "") {
+ 	    alert("Please use the browse button to select a file from your local directory.");
+ 	    return false;
+ 	}
+ 	formname.submit();
+     }
+               </script>
+               <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+                 $default_form_data
+                 <input name='courseid' type='hidden' value='$cnum' />
+                 <input name='domainid' type='hidden' value='$cdom' />
+                 <input name='command' value='scantronupload_save' type='hidden' />
+                 File to upload:<input type="file" name="upfile" size="50" />
+                 <br />
+                 <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+               </form>
+ UPLOAD
+         $r->print(<<SCANTRONFORM);
+             </td>
            </tr>
          </table>
        </td>
      </tr>
+ SCANTRONFORM
+     }
+     $r->print(<<SCANTRONFORM);
+     <tr>
+       <form action='/adm/grades' name='scantron_download'>
+         <td bgcolor="#777777">
+           <input type="hidden" name="command" value="scantron_download" />
+           <table width="100%" border="0">
+             <tr bgcolor="#e6ffff">
+               <td colspan="2">
+                 &nbsp;<b>Download a scoring office file</b>
+               </td>
+             </tr>
+             <tr bgcolor="#ffffe6">
+               <td> Filename of scoring office file: </td><td> $file_selector </td>
+             </tr>
+             <tr bgcolor="#ffffe6">
+               <td colspan="2">
+                 <input type="submit" value="Download: Show List of Associated Files" />
+               </td>
+             </tr>
+           </table>
+         </td>
+       </form>
+     </tr>
+ SCANTRONFORM
+     $r->print(<<SCANTRONFORM);
    </table>
-   <input type="submit" value="Validate Scantron Records" />
- </form>
  $grading_menu_button
  SCANTRONFORM
-     return $result;
+     return
  }
  sub get_scantron_config {
- Line 3280  sub scantron_fixup_scanline {
+ Line 4352  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 to large');
+ 	    return ($line,1,'New value too large');
  	}
  	if (length($args->{'newid'}) < $$scantron_config{'IDlength'}) {
  	    $args->{'newid'}=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
- Line 3292  sub scantron_fixup_scanline {
+ Line 4364  sub scantron_fixup_scanline {
  	    &scan_data($scan_data,"$whichline.user",
  		       $args->{'username'}.':'.$args->{'domain'});
  	}
+     } elsif ($field eq 'CODE') {
+ 	if ($args->{'CODE_ignore_dup'}) {
+ 	    &scan_data($scan_data,"$whichline.CODE_ignore_dup",'1');
+ 	}
+ 	&scan_data($scan_data,"$whichline.useCODE",'1');
+ 	if ($args->{'CODE'} ne 'use_unfound') {
+ 	    if (length($args->{'CODE'}) > $$scantron_config{'CODElength'}) {
+ 		return ($line,1,'New CODE value too large');
+ 	    }
+ 	    if (length($args->{'CODE'}) < $$scantron_config{'CODElength'}) {
+ 		$args->{'CODE'}=sprintf('%-'.$$scantron_config{'CODElength'}.'s',$args->{'CODE'});
+ 	    }
+ 	    substr($line,$$scantron_config{'CODEstart'}-1,
+ 		   $$scantron_config{'CODElength'})=$args->{'CODE'};
+ 	}
      } elsif ($field eq 'answer') {
  	my $length=$scantron_config->{'Qlength'};
  	my $off=$scantron_config->{'Qoff'};
- Line 3301  sub scantron_fixup_scanline {
+ Line 4388  sub scantron_fixup_scanline {
  	    &scan_data($scan_data,
  		       "$whichline.no_bubble.".$args->{'question'},'1');
  	} else {
- 	    substr($answer,$args->{'response'},1)=$on;
+ 	    if ($on eq 'letter') {
+ 		my @alphabet=('A'..'Z');
+ 		$answer=$alphabet[$args->{'response'}];
+ 	    } elsif ($on eq 'number') {
+ 		$answer=$args->{'response'}+1;
+ 	    } else {
+ 		substr($answer,$args->{'response'},1)=$on;
+ 	    }
  	    &scan_data($scan_data,
  		       "$whichline.no_bubble.".$args->{'question'},undef,'1');
  	}
- Line 3313  sub scantron_fixup_scanline {
+ Line 4407  sub scantron_fixup_scanline {
  sub scan_data {
      my ($scan_data,$key,$value,$delete)=@_;
-     my $filename=$ENV{'form.scantron_selectfile'};
+     my $filename=$env{'form.scantron_selectfile'};
      if (defined($value)) {
  	$scan_data->{$filename.'_'.$key} = $value;
      }
- Line 3322  sub scan_data {
+ Line 4416  sub scan_data {
  }
  sub scantron_parse_scanline {
-     my ($line,$whichline,$scantron_config,$scan_data)=@_;
+     my ($line,$whichline,$scantron_config,$scan_data,$justHeader)=@_;
      my %record;
      my $questions=substr($line,$$scantron_config{'Qstart'}-1);
      my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
-     if ($$scantron_config{'CODElocation'} ne 0) {
+     if (!($$scantron_config{'CODElocation'} eq 0 ||
- 	if ($$scantron_config{'CODElocation'} < 0) {
+ 	  $$scantron_config{'CODElocation'} eq 'none')) {
- 	    $record{'scantron.CODE'}=substr($data,$$scantron_config{'CODEstart'}-1,
+ 	if ($$scantron_config{'CODElocation'} < 0 ||
+ 	    $$scantron_config{'CODElocation'} eq 'letter' ||
+ 	    $$scantron_config{'CODElocation'} eq 'number') {
+ 	    $record{'scantron.CODE'}=substr($data,
+ 					    $$scantron_config{'CODEstart'}-1,
  					    $$scantron_config{'CODElength'});
+ 	    if (&scan_data($scan_data,"$whichline.useCODE")) {
+ 		$record{'scantron.useCODE'}=1;
+ 	    }
+ 	    if (&scan_data($scan_data,"$whichline.CODE_ignore_dup")) {
+ 		$record{'scantron.CODE_ignore_dup'}=1;
+ 	    }
  	} else {
  	    #FIXME interpret first N questions
  	}
- Line 3345  sub scantron_parse_scanline {
+ Line 4449  sub scantron_parse_scanline {
      $record{'scantron.LastName'}=
  	substr($data,$$scantron_config{'LastName'}-1,
  	       $$scantron_config{'LastNamelength'});
+     if ($justHeader) { return \%record; }
      my @alphabet=('A'..'Z');
      my $questnum=0;
      while ($questions) {
- Line 3352  sub scantron_parse_scanline {
+ Line 4458  sub scantron_parse_scanline {
  	my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
  	substr($questions,0,$$scantron_config{'Qlength'})='';
  	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
- 	my @array=split($$scantron_config{'Qon'},$currentquest,-1);
+ 	if ($$scantron_config{'Qon'} eq 'letter') {
- 	if (length($array[0]) eq $$scantron_config{'Qlength'}) {
+ 	    if ($currentquest eq '?') {
- 	    $record{"scantron.$questnum.answer"}='';
+ 		push(@{$record{'scantron.doubleerror'}},$questnum);
- 	    if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ 		$record{"scantron.$questnum.answer"}='';
- 		push(@{$record{"scantron.missingerror"}},$questnum);
+ 	    } elsif (!$currentquest
+ 		     || $currentquest eq $$scantron_config{'Qoff'}
+ 		     || $currentquest !~ /^[A-Z]$/) {
+ 		$record{"scantron.$questnum.answer"}='';
+ 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ 		    push(@{$record{"scantron.missingerror"}},$questnum);
+ 		}
+ 	    } else {
+ 		$record{"scantron.$questnum.answer"}=$currentquest;
+ 	    }
+ 	} elsif ($$scantron_config{'Qon'} eq 'number') {
+ 	    if ($currentquest eq '?') {
+ 		push(@{$record{'scantron.doubleerror'}},$questnum);
+ 		$record{"scantron.$questnum.answer"}='';
+ 		} elsif (!$currentquest
+ 			 || $currentquest eq $$scantron_config{'Qoff'}
+ 			 || $currentquest !~ /^\d$/) {
+ 		$record{"scantron.$questnum.answer"}='';
+ 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ 		    push(@{$record{"scantron.missingerror"}},$questnum);
+ 		}
+ 	    } else {
+ 		$record{"scantron.$questnum.answer"}=
+ 		    $alphabet[$currentquest-1];
  	    }
  	} else {
- 	    $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
+ 	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
- 	}
+ 	    if (length($array[0]) eq $$scantron_config{'Qlength'}) {
- 	if (scalar(@array) gt 2) {
+ 		$record{"scantron.$questnum.answer"}='';
- 	    Apache->request->print("snippet is <pre>$currentquest</pre>");
+ 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
- 	    push(@{$record{'scantron.doubleerror'}},$questnum);
+ 		    push(@{$record{"scantron.missingerror"}},$questnum);
- 	    my @ans=@array;
+ 		}
- 	    my $i=length($ans[0]);shift(@ans);
+ 	    } else {
- 	    while ($#ans) {
+ 		$record{"scantron.$questnum.answer"}=
- 		$i+=length($ans[0])+1;
+ 		    $alphabet[length($array[0])];
- 		$record{"scantron.$questnum.answer"}.=$alphabet[$i];
+ 	    }
- 		shift(@ans);
+ 	    if (scalar(@array) gt 2) {
+ 		push(@{$record{'scantron.doubleerror'}},$questnum);
+ 		my @ans=@array;
+ 		my $i=length($ans[0]);shift(@ans);
+ 		while ($#ans) {
+ 		    $i+=length($ans[0])+1;
+ 		    $record{"scantron.$questnum.answer"}.=$alphabet[$i];
+ 		    shift(@ans);
+ 		}
  	    }
  	}
      }
- Line 3379  sub scantron_parse_scanline {
+ Line 4516  sub scantron_parse_scanline {
  sub scantron_add_delay {
      my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
-     Apache->request->print('add_delay_error '.$_[2] );
      push(@$delayqueue,
  	 {'line' => $scanline, 'emsg' => $errormessage,
  	  'ecode' => $errorcode }
- Line 3390  sub scantron_find_student {
+ Line 4526  sub scantron_find_student {
      my ($scantron_record,$scan_data,$idmap,$line)=@_;
      my $scanID=$$scantron_record{'scantron.ID'};
      if ($scanID =~ /^\s*$/) {
- 	return &scan_data($scan_data,"$line.user");
+  	return &scan_data($scan_data,"$line.user");
      }
      foreach my $id (keys(%$idmap)) {
- 	#Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
+  	if (lc($id) eq lc($scanID)) {
- 	if (lc($id) eq lc($scanID)) {
+  	    return $$idmap{$id};
- 	    #Apache->request->print('success');
+  	}
- 	    return $$idmap{$id};
- 	}
      }
      return undef;
  }
  sub scantron_filter {
      my ($curres)=@_;
-     if (ref($curres) && $curres->is_problem() && !$curres->randomout) {
+                         # randomout is dysfunctional at best for this purpose
+     if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {
  	return 1;
      }
      return 0;
- Line 3412  sub scantron_filter {
+ Line 4547  sub scantron_filter {
  sub scantron_process_corrections {
      my ($r) = @_;
-     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
      my $classlist=&Apache::loncoursedata::get_classlist();
-     my $which=$ENV{'form.scantron_line'};
+     my $which=$env{'form.scantron_line'};
-     my $line=&scantron_get_line($scanlines,$which);
+     my $line=&scantron_get_line($scanlines,$scan_data,$which);
      my ($skip,$err,$errmsg);
-     if ($ENV{'form.scantron_skip_record'}) {
+     if ($env{'form.scantron_skip_record'}) {
  	$skip=1;
-     } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
+     } elsif ($env{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
- 	my $newstudent=$ENV{'form.scantron_username'}.':'.
+ 	my $newstudent=$env{'form.scantron_username'}.':'.
- 	    $ENV{'form.scantron_domain'};
+ 	    $env{'form.scantron_domain'};
  	my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
  	($line,$err,$errmsg)=
  	    &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
  				     'ID',{'newid'=>$newid,
- 				    'username'=>$ENV{'form.scantron_username'},
+ 				    'username'=>$env{'form.scantron_username'},
- 				    'domain'=>$ENV{'form.scantron_domain'}});
+ 				    'domain'=>$env{'form.scantron_domain'}});
-     } elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
+     } elsif ($env{'form.scantron_corrections'} =~ /^(duplicate|incorrect)CODE$/) {
- 	foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
+ 	my $resolution=$env{'form.scantron_CODE_resolution'};
+ 	my $newCODE;
+ 	my %args;
+ 	if      ($resolution eq 'use_unfound') {
+ 	    $newCODE='use_unfound';
+ 	} elsif ($resolution eq 'use_found') {
+ 	    $newCODE=$env{'form.scantron_CODE_selectedvalue'};
+ 	} elsif ($resolution eq 'use_typed') {
+ 	    $newCODE=$env{'form.scantron_CODE_newvalue'};
+ 	} elsif ($resolution =~ /^use_closest_(\d+)/) {
+ 	    $newCODE=$env{"form.scantron_CODE_closest_$1"};
+ 	}
+ 	if ($env{'form.scantron_corrections'} eq 'duplicateCODE') {
+ 	    $args{'CODE_ignore_dup'}=1;
+ 	}
+ 	$args{'CODE'}=$newCODE;
+ 	($line,$err,$errmsg)=
+ 	    &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
+ 				     'CODE',\%args);
+     } elsif ($env{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
+ 	foreach my $question (split(',',$env{'form.scantron_questions'})) {
  	    ($line,$err,$errmsg)=
  		&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
  					 $which,'answer',
  					 { 'question'=>$question,
- 		       'response'=>$ENV{"form.scantron_correct_Q_$question"}});
+ 		       'response'=>$env{"form.scantron_correct_Q_$question"}});
  	    if ($err) { last; }
  	}
      }
      if ($err) {
- 	$r->print("Unable to accept last correction, an error occurred :$errmsg:");
+ 	$r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>");
      } else {
- 	&scantron_put_line($scanlines,$which,$line,$skip);
+ 	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
  	&scantron_putfile($scanlines,$scan_data);
      }
  }
+ 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 {
+     my ($scan_data,$i)=@_;
+     my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
+     delete($remembered{$i});
+     &scan_data($scan_data,'remember_skipping',join(':',%remembered));
+ }
+ sub should_be_skipped {
+     my ($scan_data,$i)=@_;
+     if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
+ 	# not redoing old skips
+ 	return 0;
+     }
+     my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
+     if (exists($remembered{$i})) { return 0; }
+     return 1;
+ }
+ sub remember_current_skipped {
+     my ($scanlines,$scan_data)=&scantron_getfile();
+     my %to_remember;
+     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ 	if ($scanlines->{'skipped'}[$i]) {
+ 	    $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);
+ }
+ 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.");
+     }
+ }
+ 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";
+     if ($scantron_config{'CODElocation'} &&
+ 	$scantron_config{'CODEstart'} &&
+ 	$scantron_config{'CODElength'}) {
+ 	$CODElist=$env{'form.scantron_CODElist'};
+ 	if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
+ 	$CODElist=
+ 	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
+ 	    $CODElist.'</tt></td></tr>';
+     }
+     return (<<STUFF);
+ <p>
+ <font color="red">Please double check the information
+                  below before clicking on '$button_text'</font>
+ </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>
+ <br />
+ STUFF
+ }
+ sub scantron_do_warning {
+     my ($r)=@_;
+     my ($symb,$url)=&get_symb_and_url($r);
+     if (!$symb) {return '';}
+     my $default_form_data=&defaultFormData($symb,$url);
+     $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>');
+ 	}
+ 	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>');
+ 	}
+ 	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>');
+ 	}
+     } else {
+ 	my $warning=&scantron_warning_screen('Grading: Validate Records');
+ 	$r->print(<<STUFF);
+ $warning
+ <input type="submit" name="submit" value="Grading: Validate Records" />
+ <input type="hidden" name="command" value="scantron_validate" />
+ STUFF
+     }
+     $r->print("</form><br />".&show_grading_menu_form($symb,$url)."</body></html>");
+     return '';
+ }
+ sub scantron_form_start {
+     my ($max_bubble)=@_;
+     my $result= <<SCANTRONFORM;
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+   <input type="hidden" name="selectpage" value="$env{'form.selectpage'}" />
+   <input type="hidden" name="scantron_format" value="$env{'form.scantron_format'}" />
+   <input type="hidden" name="scantron_selectfile" value="$env{'form.scantron_selectfile'}" />
+   <input type="hidden" name="scantron_maxbubble" value="$max_bubble" />
+   <input type="hidden" name="scantron_CODElist" value="$env{'form.scantron_CODElist'}" />
+   <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'}" />
+ SCANTRONFORM
+     return $result;
+ }
  sub scantron_validate_file {
      my ($r) = @_;
      my ($symb,$url)=&get_symb_and_url($r);
      if (!$symb) {return '';}
      my $default_form_data=&defaultFormData($symb,$url);
+     # do the detection of only doing skipped records first befroe we delete
+     # 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';
+     }
+     if ($env{'form.scantron_options_ignore'} eq 'ignore_corrections') {
+ 	&check_for_error($r,&scantron_remove_file('corrected'));
+ 	&check_for_error($r,&scantron_remove_file('skipped'));
+ 	&check_for_error($r,&scantron_remove_scan_data());
+ 	$env{'form.scantron_options_ignore'}='done';
+     }
-     if ($ENV{'form.scantron_corrections'}) {
+     if ($env{'form.scantron_corrections'}) {
  	&scantron_process_corrections($r);
      }
+     $r->print("<p>Gathering neccessary info.</p>");$r->rflush();
      #get the student pick code ready
      $r->print(&Apache::loncommon::studentbrowser_javascript());
-     my $result= <<SCANTRONFORM;
+     my $max_bubble=&scantron_get_maxbubble($r);
- <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+     my $result=&scantron_form_start($max_bubble).$default_form_data;
-   <input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />
-   <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />
-   <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />
-   <input type="hidden" name="scantron_maxbubble" value="$ENV{'form.scantron_maxbubble'}" />
-   $default_form_data
- SCANTRONFORM
      $r->print($result);
      my @validate_phases=( 'ID',
  			  'CODE',
  			  'doublebubble',
  			  'missingbubbles');
-     if (!$ENV{'form.validatepass'}) {
+     if (!$env{'form.validatepass'}) {
- 	$ENV{'form.valiadatepass'} = 0;
+ 	$env{'form.validatepass'} = 0;
      }
-     my $currentphase=$ENV{'form.valiadatepass'};
+     my $currentphase=$env{'form.validatepass'};
-     if ($ENV{'form.scantron_selectfile'}=~m-^/-) {
- 	#first pass copy file to classdir
-     }
      my $stop=0;
      while (!$stop && $currentphase < scalar(@validate_phases)) {
  	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
- Line 3493  SCANTRONFORM
+ Line 4780  SCANTRONFORM
  	}
      }
      if (!$stop) {
- 	$r->print("Validation process complete, click 'Submit' to start proccssing");
+ 	my $warning=&scantron_warning_screen('Start Grading');
- 	$r->print('<input type="hidden" name="command" value="scantron_process" />');
+ 	$r->print(<<STUFF);
+ Validation process complete.<br />
+ $warning
+ <input type="submit" name="submit" value="Start Grading" />
+ <input type="hidden" name="command" value="scantron_process" />
+ STUFF
      } else {
  	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
  	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
      }
-     $r->print('<input type="submit" name="submit" /></form></body></html>');
+     if ($stop) {
+ 	$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).
+ 	      "</body></html>");
      return '';
  }
+ sub scantron_remove_file {
+     my ($which)=@_;
+     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $file='scantron_';
+     if ($which eq 'corrected' || $which eq 'skipped') {
+ 	$file.=$which.'_';
+     } else {
+ 	return 'refused';
+     }
+     $file.=$env{'form.scantron_selectfile'};
+     return &Apache::lonnet::removeuserfile($cname,$cdom,$file);
+ }
+ sub scantron_remove_scan_data {
+     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+     my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);
+     my @todelete;
+     my $filename=$env{'form.scantron_selectfile'};
+     foreach my $key (@keys) {
+ 	if ($key=~/^\Q$filename\E_/) {
+ 	    if ($env{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&
+ 		$key=~/remember_skipping/) {
+ 		next;
+ 	    }
+ 	    push(@todelete,$key);
+ 	}
+     }
+     my $result;
+     if (@todelete) {
+ 	$result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+     }
+     return $result;
+ }
  sub scantron_getfile {
-     #FIXME really would prefer a scantron directory but tokenwrapper
+     #FIXME really would prefer a scantron directory
-     # doesn't allow access to subdirs of userfiles
+     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
-     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
      my $lines;
      $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
- 		       'scantron_orig_'.$ENV{'form.scantron_selectfile'});
+ 		       'scantron_orig_'.$env{'form.scantron_selectfile'});
-     if ($lines eq '-1') {
- 	#FIXME need to actually replicate file to course space
- 	#FIXME when replicating strip CRLF to LF or CR to LF
-     }
      my %scanlines;
      $scanlines{'orig'}=[(split("\n",$lines,-1))];
      my $temp=$scanlines{'orig'};
      $scanlines{'count'}=$#$temp;
      $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
- 		       'scantron_corrected_'.$ENV{'form.scantron_selectfile'});
+ 		       'scantron_corrected_'.$env{'form.scantron_selectfile'});
      if ($lines eq '-1') {
  	$scanlines{'corrected'}=[];
      } else {
  	$scanlines{'corrected'}=[(split("\n",$lines,-1))];
      }
      $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
- 		       'scantron_skipped_'.$ENV{'form.scantron_selectfile'});
+ 		       'scantron_skipped_'.$env{'form.scantron_selectfile'});
      if ($lines eq '-1') {
  	$scanlines{'skipped'}=[];
      } else {
  	$scanlines{'skipped'}=[(split("\n",$lines,-1))];
      }
-     my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname);
+     my @tmp=&Apache::lonnet::dump('nohist_scantrondata',$cdom,$cname);
      if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); }
      my %scan_data = @tmp;
      return (\%scanlines,\%scan_data);
- Line 3542  sub scantron_getfile {
+ Line 4873  sub scantron_getfile {
  sub lonnet_putfile {
      my ($contents,$filename)=@_;
-     my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
-     my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-     my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+     $env{'form.sillywaytopassafilearound'}=$contents;
-     $ENV{'form.sillywaytopassafilearound'}=$contents;
+     &Apache::lonnet::finishuserfileupload($docuname,$docudom,'sillywaytopassafilearound',$filename);
-     &Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);
  }
  sub scantron_putfile {
      my ($scanlines,$scan_data) = @_;
-     #FIXME really would prefer a scantron directory but tokenwrapper
+     #FIXME really would prefer a scantron directory
-     # doesn't allow access to subdirs of userfiles
+     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
-     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     if ($scanlines) {
-     my $prefix='scantron_';
+ 	my $prefix='scantron_';
  # no need to update orig, shouldn't change
  #   &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
- #		    $ENV{'form.scantron_selectfile'});
+ #		    $env{'form.scantron_selectfile'});
-     &lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
+ 	&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
- 		    $prefix.'corrected_'.
+ 			$prefix.'corrected_'.
- 		    $ENV{'form.scantron_selectfile'});
+ 			$env{'form.scantron_selectfile'});
-     &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
+ 	&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
- 		    $prefix.'skipped_'.
+ 			$prefix.'skipped_'.
- 		    $ENV{'form.scantron_selectfile'});
+ 			$env{'form.scantron_selectfile'});
-     &Apache::lonnet::put('scantrondata',$scan_data,$cdom,$cname);
+     }
+     &Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
  }
  sub scantron_get_line {
-     my ($scanlines,$i)=@_;
+     my ($scanlines,$scan_data,$i)=@_;
-     if ($scanlines->{'skipped'}[$i]) {return undef;}
+     if (&should_be_skipped($scan_data,$i)) { return undef; }
+     if ($scanlines->{'skipped'}[$i]) { return undef; }
      if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
      return $scanlines->{'orig'}[$i];
  }
+ sub get_todo_count {
+     my ($scanlines,$scan_data)=@_;
+     my $count=0;
+     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ 	if ($line=~/^[\s\cz]*$/) { next; }
+ 	$count++;
+     }
+     return $count;
+ }
  sub scantron_put_line {
-     my ($scanlines,$i,$newline,$skip)=@_;
+     my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
      if ($skip) {
  	$scanlines->{'skipped'}[$i]=$newline;
+ 	&allow_skipping($scan_data,$i);
  	return;
      }
      $scanlines->{'corrected'}[$i]=$newline;
- Line 3593  sub scantron_validate_ID {
+ Line 4937  sub scantron_validate_ID {
      my %idmap=&username_to_idmap($classlist);
      #get scantron line setup
-     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
      my %found=('ids'=>{},'usernames'=>{});
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- 	my $line=&scantron_get_line($scanlines,$i);
+ 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
- 	if (!$line) { next; }
+ 	if ($line=~/^[\s\cz]*$/) { next; }
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
  						 $scan_data);
  	my $id=$$scan_record{'scantron.ID'};
- #	$r->print("<p>Checking ID ".$$scan_record{'scantron.ID'}.
- #		  " on paper ID ".$$scan_record{'scantron.PaperID'}."</p>\n");
  	my $found;
  	foreach my $checkid (keys(%idmap)) {
- 	    if (lc($checkid) eq lc($id)) {
+ 	    if (lc($checkid) eq lc($id)) { $found=$checkid;last; }
- 		if ($checkid ne $id) {
- 		    #$r->print("<p>Using $checkid for encoded $id</p>\n");
- 		}
- 		$found=$checkid;last;
- 	    }
  	}
  	if ($found) {
  	    my $username=$idmap{$found};
  	    if ($found{'ids'}{$found}) {
  		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
  					 $line,'duplicateID',$found);
- 		return(1);
+ 		return(1,$currentphase);
  	    } elsif ($found{'usernames'}{$username}) {
  		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
  					 $line,'duplicateID',$username);
- 		return(1);
+ 		return(1,$currentphase);
  	    }
- 	    #FIXME store away line we prviously saw the ID on to use above
+ 	    #FIXME store away line we previously saw the ID on to use above
  	    $found{'ids'}{$found}++;
  	    $found{'usernames'}{$username}++;
  	} else {
- Line 3635  sub scantron_validate_ID {
+ Line 4972  sub scantron_validate_ID {
  		    &scantron_get_correction($r,$i,$scan_record,
  					     \%scantron_config,
  					     $line,'duplicateID',$username);
- 		    return(1);
+ 		    return(1,$currentphase);
  		} elsif (!defined($username)) {
  		    &scantron_get_correction($r,$i,$scan_record,
  					     \%scantron_config,
  					     $line,'incorrectID');
- 		    return(1);
+ 		    return(1,$currentphase);
  		}
  		$found{'usernames'}{$username}++;
  	    } else {
  		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
  					 $line,'incorrectID');
- 		return(1);
+ 		return(1,$currentphase);
  	    }
  	}
      }
- Line 3661  sub scantron_get_correction {
+ Line 4998  sub scantron_get_correction {
  #to show both the current line and the previous one and allow skipping
  #the previous one or the current one
-     $r->print("<p>This scantron record has an error ($error). ");
+     $r->print("<p><b>An error was detected ($error)</b>");
      if ( defined($$scan_record{'scantron.PaperID'}) ) {
- 	$r->print("The current PaperID is <tt>".
+ 	$r->print(" for PaperID <tt>".
  		  $$scan_record{'scantron.PaperID'}."</tt> \n");
      } else {
- 	$r->print("The current scanline is <pre>".
+ 	$r->print(" in scanline $i <pre>".
  		  $line."</pre> \n");
      }
+     my $message="<p>The ID on the form is  <tt>".
+ 	$$scan_record{'scantron.ID'}."</tt><br />\n".
+ 	"The name on the paper is ".
+ 	$$scan_record{'scantron.LastName'}.",".
+ 	$$scan_record{'scantron.FirstName'}."</p>";
      $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
      $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
      if ($error =~ /ID$/) {
- 	if ($error eq 'unknownID') {
+ 	if ($error eq 'incorrectID') {
  	    $r->print("The encoded ID is not in the classlist</p>\n");
  	} elsif ($error eq 'duplicateID') {
  	    $r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
  	}
- 	$r->print("<p>Original ID is <tt>".$$scan_record{'scantron.ID'}.
+ 	$r->print($message);
- 		  "</tt><br />\n");
+ 	$r->print("<p>How should I handle this? <br /> \n");
- 	$r->print("Name on paper is ".$$scan_record{'scantron.LastName'}.",".
+ 	$r->print("\n<ul><li> ");
- 		  $$scan_record{'scantron.FirstName'}."</p>");
- 	$r->print("<p>Please correct <br /> \n");
- 	$r->print("\n<ul><li> Pick a specific user -- username:<input type='text' name='scantron_username' value='' />");
- 	$r->print("\ndomain:".
- 		 &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
  	#FIXME it would be nice if this sent back the user ID and
  	#could do partial userID matches
  	$r->print(&Apache::loncommon::selectstudent_link('scantronupload',
- 				      'scantron_username','scantron_domain'));
+ 				       'scantron_username','scantron_domain'));
+ 	$r->print(": <input type='text' name='scantron_username' value='' />");
+ 	$r->print("\n@".
+ 		 &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));
  	$r->print('</li>');
+     } elsif ($error =~ /CODE$/) {
+ 	if ($error eq 'incorrectCODE') {
+ 	    $r->print("</p><p>The encoded CODE is not in the list of possible CODEs</p>\n");
+ 	} elsif ($error eq 'duplicateCODE') {
+ 	    $r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");
+ 	}
+ 	$r->print("<p>The CODE on the form is  <tt>'".
+ 		  $$scan_record{'scantron.CODE'}."'</tt><br />\n");
+ 	$r->print($message);
+ 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("\n<br /> ");
+ 	my $i=0;
+ 	if ($error eq 'incorrectCODE'
+ 	    && $$scan_record{'scantron.CODE'}=~/\S/ ) {
+ 	    my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});
+ 	    if ($closest > 0) {
+ 		foreach my $testcode (@{$closest}) {
+ 		    my $checked='';
+ 		    if (!$i) { $checked=' checked="on" '; }
+ 		    $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++;
+ 		}
+ 	    }
+ 	}
+ 	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
+ 	    my $checked; if (!$i) { $checked=' checked="on" '; }
+ 	    $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 />");
+ 	}
+ 	$r->print(<<ENDSCRIPT);
+ <script type="text/javascript">
+ function change_radio(field) {
+     var slct=document.scantronupload.scantron_CODE_resolution;
+     var i;
+     for (i=0;i<slct.length;i++) {
+         if (slct[i].value==field) { slct[i].checked=true; }
+     }
+ }
+ </script>
+ ENDSCRIPT
+ 	my $href="/adm/pickcode?".
+ 	   "form=".&Apache::lonnet::escape("scantronupload").
+ 	   "&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}).
+ 	   "&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}).
+ 	   "&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).
+ 	   "&scantron_selectfile=".&Apache::lonnet::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')\" />");
+ 	$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') {
- 	$r->print("<pre>$line</pre>");
+ 	$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
- 	$Apache::lonxml::debug=1;
- 	&Apache::lonhomework::showhashsubset($scan_record,'.');
- 	$Apache::lonxml::debug=0;
- 	$r->print("There have been multiple bubbles scanned for a single question\n");
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
  		  join(',',@{$arg}).'" />');
+ 	$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"};
- 	    $r->print("<p> For question $question, selected bubbles were ".
+ 	    &scantron_bubble_selector($r,$scan_config,$question,split('',$selected));
- 		      join(" ",split('',$selected,-1)).
-               " <br />Please pick which one should be used for grading<br />");
- 	    &scantron_bubble_selector($r,$scan_config,$question);
  	}
      } elsif ($error eq 'missingbubble') {
+ 	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ 	$r->print($message);
+ 	$r->print("<p>Please indicate which bubble should be used for grading</p>");
  	$r->print("Some questions have no scanned bubbles\n");
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
  		  join(',',@{$arg}).'" />');
  	foreach my $question (@{$arg}) {
  	    my $selected=$$scan_record{"scantron.$question.answer"};
- 	    $r->print("<p>Question $question, Please select a bubble to use ");
  	    &scantron_bubble_selector($r,$scan_config,$question);
  	}
      } else {
  	$r->print("\n<ul>");
      }
-     $r->print("<li>Skip this scanline saving it for later  ");
+     $r->print("\n</li></ul>");
-     $r->print("\n<input type='checkbox' name='scantron_skip_record' /> </li></ul>");
  }
  sub scantron_bubble_selector {
-     my ($r,$scan_config,$quest)=@_;
+     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 @alphabet=('A'..'Z');
+     $r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");
+     for (my $i=0;$i<$max+1;$i++) {
+ 	$r->print("\n".'<td align="center">');
+ 	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
+ 	else { $r->print('&nbsp;'); }
+ 	$r->print('</td>');
+     }
+     $r->print('</tr><tr>');
      for (my $i=0;$i<$max;$i++) {
- 	$r->print('<input type="radio" name="scantron_correct_Q_'.$quest.
+ 	$r->print("\n".
- 		  '" value="'.$i.'" />'.$alphabet[$i]);
+ 		  '<td><label><input type="radio" name="scantron_correct_Q_'.
+ 		  $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
+     }
+     $r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
+ 	      $quest.'" value="none" /> No bubble </label></td>');
+     $r->print('</tr></table>');
+ }
+ sub num_matches {
+     my ($orig,$code) = @_;
+     my @code=split(//,$code);
+     my @orig=split(//,$orig);
+     my $same=0;
+     for (my $i=0;$i<scalar(@code);$i++) {
+ 	if ($code[$i] eq $orig[$i]) { $same++; }
      }
-     $r->print('<input type="radio" name="scantron_correct_Q_'.$quest.
+     return $same;
- 	      '" value="none" /> Nothing');
+ }
-     $r->print('<br />');
+ sub scantron_get_closely_matching_CODEs {
+     my ($allcodes,$CODE)=@_;
+     my @CODEs;
+     foreach my $testcode (sort(keys(%{$allcodes}))) {
+ 	push(@{$CODEs[&num_matches($CODE,$testcode)]},$testcode);
+     }
+     return ($#CODEs,$CODEs[-1]);
+ }
+ sub get_codes {
+     my ($old_name, $cdom, $cnum) = @_;
+     if (!$old_name) {
+ 	$old_name=$env{'form.scantron_CODElist'};
+     }
+     if (!$cdom) {
+ 	$cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+     }
+     if (!$cnum) {
+ 	$cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
+     }
+     my %result=&Apache::lonnet::get('CODEs',[$old_name,"type\0$old_name"],
+ 				    $cdom,$cnum);
+     my %allcodes;
+     if ($result{"type\0$old_name"} eq 'number') {
+ 	%allcodes=map {($_,1)} split(',',$result{$old_name});
+     } else {
+ 	%allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
+     }
+     return %allcodes;
  }
  sub scantron_validate_CODE {
      my ($r,$currentphase) = @_;
-     #FIXME doesn't do anything yet
+     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
+     if ($scantron_config{'CODElocation'} &&
+ 	$scantron_config{'CODEstart'} &&
+ 	$scantron_config{'CODElength'}) {
+ 	if (!defined($env{'form.scantron_CODElist'})) {
+ 	    &FIXME_blow_up()
+ 	}
+     } else {
+ 	return (0,$currentphase+1);
+     }
+     my %usedCODEs;
+     my %allcodes=&get_codes();
+     my ($scanlines,$scan_data)=&scantron_getfile();
+     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ 	if ($line=~/^[\s\cz]*$/) { next; }
+ 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ 						 $scan_data);
+ 	my $CODE=$$scan_record{'scantron.CODE'};
+ 	my $error=0;
+ 	if (!&Apache::lonnet::validCODE($CODE)) {
+ 	    &scantron_get_correction($r,$i,$scan_record,
+ 				     \%scantron_config,
+ 				     $line,'incorrectCODE',\%allcodes);
+ 	    return(1,$currentphase);
+ 	}
+ 	if (%allcodes && !exists($allcodes{$CODE})
+ 	    && !$$scan_record{'scantron.useCODE'}) {
+ 	    &scantron_get_correction($r,$i,$scan_record,
+ 				     \%scantron_config,
+ 				     $line,'incorrectCODE',\%allcodes);
+ 	    return(1,$currentphase);
+ 	}
+ 	if (exists($usedCODEs{$CODE})
+ 	    && $env{'form.scantron_CODEunique'} eq 'yes'
+ 	    && !$$scan_record{'scantron.CODE_ignore_dup'}) {
+ 	    &scantron_get_correction($r,$i,$scan_record,
+ 				     \%scantron_config,
+ 				     $line,'duplicateCODE',$usedCODEs{$CODE});
+ 	    return(1,$currentphase);
+ 	}
+ 	push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
+     }
      return (0,$currentphase+1);
  }
- Line 3747  sub scantron_validate_doublebubble {
+ Line 5239  sub scantron_validate_doublebubble {
      my %idmap=&username_to_idmap($classlist);
      #get scantron line setup
-     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- 	my $line=&scantron_get_line($scanlines,$i);
+ 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
- 	if (!$line) { next; }
+ 	if ($line=~/^[\s\cz]*$/) { next; }
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
  						 $scan_data);
  	if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
- Line 3763  sub scantron_validate_doublebubble {
+ Line 5255  sub scantron_validate_doublebubble {
      return (0,$currentphase+1);
  }
+ sub scantron_get_maxbubble {
+     my ($r)=@_;
+     if (defined($env{'form.scantron_maxbubble'}) &&
+ 	$env{'form.scantron_maxbubble'}) {
+ 	return $env{'form.scantron_maxbubble'};
+     }
+     my $navmap=Apache::lonnavmaps::navmap->new();
+     my (undef,undef,$sequence)=
+ 	&Apache::lonnet::decode_symb($env{'form.selectpage'});
+     my $map=$navmap->getResourceByUrl($sequence);
+     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+     &Apache::lonnet::delenv('form.counter');
+     foreach my $resource (@resources) {
+ 	my $result=&Apache::lonnet::ssi($resource->src().'?symb='.&Apache::lonnet::escape($resource->symb()));
+     }
+     &Apache::lonnet::delenv('scantron\.');
+     my $envfile=$env{'user.environment'};
+     $envfile=~/\/([^\/]+)\.id$/;
+     $envfile=$1;
+     &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+ 					     $envfile);
+     $env{'form.scantron_maxbubble'}=$env{'form.counter'}-1;
+     return $env{'form.scantron_maxbubble'};
+ }
  sub scantron_validate_missingbubbles {
      my ($r,$currentphase) = @_;
      #get student info
- Line 3770  sub scantron_validate_missingbubbles {
+ Line 5287  sub scantron_validate_missingbubbles {
      my %idmap=&username_to_idmap($classlist);
      #get scantron line setup
-     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
-     my $max_bubble=$ENV{'form.scantron_maxbubble'};
+     my $max_bubble=&scantron_get_maxbubble();
      if (!$max_bubble) { $max_bubble=2**31; }
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- 	my $line=&scantron_get_line($scanlines,$i);
+ 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
- 	if (!$line) { next; }
+ 	if ($line=~/^[\s\cz]*$/) { next; }
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
  						 $scan_data);
  	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
- Line 3797  sub scantron_validate_missingbubbles {
+ Line 5314  sub scantron_validate_missingbubbles {
  sub scantron_process_students {
      my ($r) = @_;
-     my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
+     my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
      my ($symb,$url)=&get_symb_and_url($r);
      if (!$symb) {return '';}
      my $default_form_data=&defaultFormData($symb,$url);
-     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
      my $classlist=&Apache::loncoursedata::get_classlist();
      my %idmap=&username_to_idmap($classlist);
-     my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1);
+     my $navmap=Apache::lonnavmaps::navmap->new();
      my $map=$navmap->getResourceByUrl($sequence);
      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
  #    $r->print("geto ".scalar(@resources)."<br />");
- Line 3820  SCANTRONFORM
+ Line 5337  SCANTRONFORM
      my @delayqueue;
      my %completedstudents;
+     my $count=&get_todo_count($scanlines,$scan_data);
      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
- 				    'Scantron Progress',$scanlines->{'count'});
+  				    'Scantron Progress',$count,
+ 				    'inline',undef,'scantronupload');
      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
  					  'Processing first student');
      my $start=&Time::HiRes::time();
      my $i=-1;
+     my ($uname,$udom,$started);
      while ($i<$scanlines->{'count'}) {
- 	$i++;
+  	($uname,$udom)=('','');
- 	my $line=&scantron_get_line($scanlines,$i);
+  	$i++;
- 	$r->print('<pre>line is'.$line.'</pre>');
+  	my $line=&scantron_get_line($scanlines,$scan_data,$i);
- 	if (!defined($line)) {
+  	if ($line=~/^[\s\cz]*$/) { next; }
- 	    $r->print('skipping');
+ 	if ($started) {
- 	    next;
+ 	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 	}
+ 						     'last student');
- 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ 	}
- 						 $scan_data);
+ 	$started=1;
- 	my ($uname,$udom);
+  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
- 	unless ($uname=&scantron_find_student($scan_record,$scan_data,
+  						 $scan_data);
- 					      \%idmap,$i)) {
+  	unless ($uname=&scantron_find_student($scan_record,$scan_data,
- 	    &scantron_add_delay(\@delayqueue,$line,
+  					      \%idmap,$i)) {
- 				'Unable to find a student that matches',1);
+   	    &scantron_add_delay(\@delayqueue,$line,
- 	    next;
+  				'Unable to find a student that matches',1);
- 	}
+  	    next;
- 	if (exists $completedstudents{$uname}) {
+   	}
- 	    &scantron_add_delay(\@delayqueue,$line,
+  	if (exists $completedstudents{$uname}) {
- 				'Student '.$uname.' has multiple sheets',2);
+  	    &scantron_add_delay(\@delayqueue,$line,
- 	    next;
+  				'Student '.$uname.' has multiple sheets',2);
- 	}
+  	    next;
- 	$r->print('<pre>doing studnet'.$uname.'</pre>');
+  	}
- 	($uname,$udom)=split(/:/,$uname);
+   	($uname,$udom)=split(/:/,$uname);
- 	&Apache::lonnet::delenv('form.counter');
+   	&Apache::lonnet::delenv('form.counter');
- 	&Apache::lonnet::appenv(%$scan_record);
+   	&Apache::lonnet::appenv(%$scan_record);
- #    &Apache::lonhomework::showhash(%ENV);
- #    $Apache::lonxml::debug=1;
- #	&Apache::lonxml::debug("line is $line");
- 	    my $i=0;
+ 	my $i=0;
  	foreach my $resource (@resources) {
  	    $i++;
- 	    my $result=&Apache::lonnet::ssi($resource->src(),
+ 	    my %form=('submitted'     =>'scantron',
- 				 ('submitted'     =>'scantron',
+ 		      'grade_target'  =>'grade',
- 				  'grade_target'  =>'grade',
+ 		      'grade_username'=>$uname,
- 				  'grade_username'=>$uname,
+ 		      'grade_domain'  =>$udom,
- 				  'grade_domain'  =>$udom,
+ 		      'grade_courseid'=>$env{'request.course.id'},
- 				  'grade_courseid'=>$ENV{'request.course.id'},
+ 		      'grade_symb'    =>$resource->symb());
- 				  'grade_symb'    =>$resource->symb()));
+ 	    if (exists($scan_record->{'scantron.CODE'}) &&
- #	    my %score=&Apache::lonnet::restore($resource->symb(),
+ 		$scan_record->{'scantron.CODE'}) {
- #					       $ENV{'request.course.id'},
+ 		$form{'CODE'}=$scan_record->{'scantron.CODE'};
- #					       $udom,$uname);
+ 	    } else {
- #	    foreach my $part ($resource->{PARTS}) {
+ 		$form{'CODE'}='';
- #		if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
+ 	    }
- #		    $studentcorrect++;
+ 	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
- #		    $totalcorrect++;
+ 	    if ($result ne '') {
- #		} else {
+ 		&Apache::lonnet::logthis("scantron grading error -> $result");
- #		    $studentincorrect++;
+ 		&Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $env{'request.course.id'} url ".$resource->src());
- #		    $totalincorrect++;
+ 	    }
- #		}
+ 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
- #	    }
- #	    $r->print('<pre>'.
- #		      $resource->symb().'-'.
- #		      $resource->src().'-'.'</pre>result is'.$result);
- #	    &Apache::lonhomework::showhash(%score);
- 	#    if ($i eq 3) {last;}
  	}
  	$completedstudents{$uname}={'line'=>$line};
+ 	if (&Apache::loncommon::connection_aborted($r)) { last; }
      } continue {
  	&Apache::lonnet::delenv('form.counter');
  	&Apache::lonnet::delenv('scantron\.');
- 	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 						 'last student');
- 	#last;
- 	#FIXME
- 	#get iterator for $sequence
- 	#foreach question 'submit' the students answer to the server
- 	#   through grade target {
- 	#   generate data to pass back that includes grade recevied
- 	#}
      }
      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-     my $lasttime = &Time::HiRes::time()-$start;
+ #    my $lasttime = &Time::HiRes::time()-$start;
-     $r->print("<p>took $lasttime</p>");
+ #    $r->print("<p>took $lasttime</p>");
-     #$Apache::lonxml::debug=0;
+     $r->print("</form>");
-     foreach my $delay (@delayqueue) {
+     $r->print(&show_grading_menu_form($symb,$url));
- 	#FIXME
+     return '';
- 	#print out each delayed student with interface to select how
- 	#  to repair student provided info
- 	#Expected errors include
- 	#  1 bad/no stuid/username
- 	#  2 invalid bubblings
-     }
-     #FIXME
-     # if delay queue exists 2 submits one to process delayed students one
-     #     to ignore delayed students, possibly saving the delay queue for later
-     $navmap->untieHashes();
  }
  sub scantron_upload_scantron_data {
      my ($r)=@_;
-     $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
+     $r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));
      my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
- 							  'domainid');
+ 							  'domainid',
-     my $domsel=&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},
+ 							  'coursename');
+     my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
  						   'domainid');
+     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
      $r->print(<<UPLOAD);
  <script type="text/javascript" language="javascript">
      function checkUpload(formname) {
- Line 3938  sub scantron_upload_scantron_data {
+ Line 5431  sub scantron_upload_scantron_data {
  </script>
  <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
- Course: <input name='courseid' type='text' />
+ $default_form_data
- Domain: $domsel $select_link
+ <table>
- <br />
+ <tr><td>$select_link </td></tr>
+ <tr><td>Course ID:   </td><td><input name='courseid' type='text' />  </td></tr>
+ <tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
+ <tr><td>Domain:      </td><td>$domsel                                </td></tr>
+ <tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+ </table>
  <input name='command' value='scantronupload_save' type='hidden' />
- File to upload:<input type="file" name="upfile" size="50" />
- <br />
  <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
  </form>
  UPLOAD
- Line 3952  UPLOAD
+ Line 5448  UPLOAD
  sub scantron_upload_scantron_data_save {
      my($r)=@_;
-     $r->print("Doing upload to ".$ENV{'form.courseid'});
+     my ($symb,$url)=&get_symb_and_url($r,1);
-     my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
+     my $doanotherupload=
- 					 $ENV{'form.domainid'});
+ 	'<br /><form action="/adm/grades" method="post">'."\n".
-     my $fname='scantron_orig_'.$ENV{'form.upfile.filename'};
+ 	'<input type="hidden" name="command" value="scantronupload" />'."\n".
-     $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
+ 	'<input type="submit" name="submit" value="Do Another Upload" />'."\n".
- 						    $ENV{'form.domainid'},
+ 	'</form>'."\n";
- 						    $home,'upfile',$fname));
+     if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
+ 	!&Apache::lonnet::allowed('usc',
+ 			    $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));
+ 	} else {
+ 	    $r->print($doanotherupload);
+ 	}
+ 	return '';
+     }
+     my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
+     $r->print("Doing upload to ".$coursedata{'description'}." <br />");
+     my $fname=$env{'form.upfile.filename'};
+     #FIXME
+     #copied from lonnet::userfileupload()
+     #make that function able to target a specified course
+     # Replace Windows backslashes by forward slashes
+     $fname=~s/\\/\//g;
+     # Get rid of everything but the actual filename
+     $fname=~s/^.*\/([^\/]+)$/$1/;
+     # Replace spaces by underscores
+     $fname=~s/\s+/\_/g;
+     # Replace all other weird characters by nothing
+     $fname=~s/[^\w\.\-]//g;
+     # See if there is anything left
+     unless ($fname) { return 'error: no uploaded file'; }
+     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.");
+     } 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>");
+ 	} 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>");
+ 	}
+     }
+     if ($symb) {
+ 	$r->print(&scantron_selectphase($r,$uploadedfile));
+     } else {
+ 	$r->print($doanotherupload);
+     }
      return '';
  }
+ 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;
+ }
+ sub scantron_download_scantron_data {
+     my ($r)=@_;
+     my $default_form_data=&defaultFormData(&get_symb_and_url($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'};
+     if (! &valid_file($file)) {
+ 	$r->print(<<ERROR);
+ 	<p>
+ 	    The requested file name was invalid.
+         </p>
+ ERROR
+ 	$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+ 	return;
+     }
+     my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
+     my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file;
+     my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file;
+     &Apache::lonnet::allowuploaded('/adm/grades',$orig);
+     &Apache::lonnet::allowuploaded('/adm/grades',$corrected);
+     &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
+     $r->print(<<DOWNLOAD);
+     <p>
+ 	<a href="$orig">Original</a> file as uploaded by the scantron office.
+     </p>
+     <p>
+ 	<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
+     </p>
+     <p>
+ 	<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)));
+     return '';
+ }
  #-------- end of section for handling grading scantron forms -------
  #
  #-------------------------------------------------------------------
  #-------------------------- Menu interface -------------------------
  #
  #--- Show a Grading Menu button - Calls the next routine ---
- Line 3976  sub show_grading_menu_form {
+ Line 5558  sub show_grading_menu_form {
      my $result.='<br /><form action="/adm/grades" method="post">'."\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="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
  	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
  	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
  	'</form>'."\n";
- Line 3986  sub show_grading_menu_form {
+ Line 5568  sub show_grading_menu_form {
  # -- Retrieve choices for grading form
  sub savedState {
      my %savedState = ();
-     if ($ENV{'form.saveState'}) {
+     if ($env{'form.saveState'}) {
- 	foreach (split(/:/,$ENV{'form.saveState'})) {
+ 	foreach (split(/:/,$env{'form.saveState'})) {
  	    my ($key,$value) = split(/=/,$_,2);
  	    $savedState{$key} = $value;
  	}
- Line 4014  sub gradingmenu {
+ Line 5596  sub gradingmenu {
  	}
  	formname.command.value = cmd;
  	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
- 	    ":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+ 	    ":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) {
- Line 4065  GRADINGMENUJS
+ Line 5648  GRADINGMENUJS
      $result.='<table width="100%" border=0>';
      $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
- 	'&nbsp;Select Section: <select name="section">'."\n";
+ 	'&nbsp;'.&mt('Select Section').': <select name="section">'."\n";
      if (ref($sections)) {
- 	foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
+ 	foreach (sort (@$sections)) {
- 					 ($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
+ 	    $result.='<option value="'.$_.'" '.
+ 		($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
+ 	}
      }
-     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
+     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select> &nbsp; ';
-     $result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+     $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
-     if (ref($sections)) {
- 	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />'
- 	    if (grep /no/,@$sections);
-     }
      $result.='</td></tr>';
-     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+     $result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.
  	'<input type="radio" name="radioChoice" value="submission" '.
- 	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students'.
+ 	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
- 	'<br />&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;-->For students with '.
+ 	'</label> <select name="submitonly">'.
- 	'<input type="radio" name="submitonly" value="yes" '.
+ 	'<option value="yes" '.
- 	($saveSub eq 'yes' ? 'checked' : '').' /> submissions or '.
+ 	($saveSub eq 'yes' ? 'selected="on"' : '').'>'.&mt('with submissions').'</option>'.
- 	'<input type="radio" name="submitonly" value="all" '.
+ 	'<option value="queued" '.
- 	($saveSub eq 'all' ? 'checked' : '').' /> for all</td></tr>'."\n";
+ 	($saveSub eq 'queued' ? 'selected="on"' : '').'>'.&mt('in grading queue').'</option>'.
+ 	'<option value="graded" '.
+ 	($saveSub eq 'graded' ? 'selected="on"' : '').'>'.&mt('with ungraded submissions').'</option>'.
+ 	'<option value="incorrect" '.
+ 	($saveSub eq 'incorrect' ? 'selected="on"' : '').'>'.&mt('with incorrect submissions').'</option>'.
+ 	'<option value="all" '.
+ 	($saveSub eq 'all' ? 'selected="on"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
      $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- 	'<input type="radio" name="radioChoice" value="viewgrades" '.
+ 	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
  	($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
- 	'<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";
+ 	'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";
      $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
- 	'<input type="radio" name="radioChoice" value="pickStudentPage" '.
+ 	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
  	($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
- 	'The <b>complete</b> set/page/sequence: For one student</td></tr>'."\n";
+ 	'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
      $result.='<tr bgcolor="#ffffe6"><td><br />'.
  	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
- Line 4107  GRADINGMENUJS
+ Line 5694  GRADINGMENUJS
      $result.='<table width="100%" border=0>';
      $result.='<tr bgcolor="#ffffe6"><td>'.
- 	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="Upload" />'.
+ 	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
- 	' scores from file </td></tr>'."\n";
+ 	' '.&mt('scores from file').' </td></tr>'."\n";
      $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
  	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
- 	'" value="Grade" /> scantron forms</td></tr>'."\n";
+ 	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
-     if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
+     if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
  	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- 	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="Verify" />'.
+ 	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
- 	    ' submission Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
+ 	    ' '.&mt('receipt').': '.
+ 	    &Apache::lonnet::recprefix($env{'request.course.id'}).
  	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
  	    '</td></tr>'."\n";
      }
+     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ 	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
+ 	'" value="'.&mt('Manage').'" /> access times.</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();'.
+ 	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
      $result.='</form></td></tr></table>'."\n".
  	'</td></tr></table>'."\n".
- Line 4128  GRADINGMENUJS
+ Line 5722  GRADINGMENUJS
      return $result;
  }
+ sub reset_perm {
+     undef(%perm);
+ }
+ sub init_perm {
+     &reset_perm();
+     foreach my $test_perm ('vgr','mgr','opa') {
+ 	my $scope = $env{'request.course.id'};
+ 	if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) {
+ 	    $scope .= '/'.$env{'request.course.sec'};
+ 	    if ( $perm{$test_perm}=
+ 		 &Apache::lonnet::allowed($test_perm,$scope)) {
+ 		$perm{$test_perm.'_section'}=$env{'request.course.sec'};
+ 	    } else {
+ 		delete($perm{$test_perm});
+ 	    }
+ 	}
+     }
+ }
  sub handler {
      my $request=$_[0];
-     undef(%perm);
+     &reset_perm();
-     if ($ENV{'browser.mathml'}) {
+     if ($env{'browser.mathml'}) {
- 	$request->content_type('text/xml');
+ 	&Apache::loncommon::content_type($request,'text/xml');
      } else {
- 	$request->content_type('text/html');
+ 	&Apache::loncommon::content_type($request,'text/html');
      }
      $request->send_http_header;
      return '' if $request->header_only;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-     my $url=$ENV{'form.url'};
+     my $url=$env{'form.url'};
-     my $symb=$ENV{'form.symb'};
+     my $symb=$env{'form.symb'};
-     my $command=$ENV{'form.command'};
+     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'})=split(/___/,$symb);
+ 	($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
- 	$url = $ENV{'form.url'};
+ 	$url = $env{'form.url'};
      }
      &send_header($request);
      if ($url eq '' && $symb eq '' && $command eq '') {
- 	if ($ENV{'user.adv'}) {
+ 	if ($env{'user.adv'}) {
- 	    if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
+ 	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
- 		($ENV{'form.codethree'})) {
+ 		($env{'form.codethree'})) {
- 		my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
+ 		my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'.
- 		    $ENV{'form.codethree'};
+ 		    $env{'form.codethree'};
  		my ($tsymb,$tuname,$tudom,$tcrsid)=
  		    &Apache::lonnet::checkin($token);
  		if ($tsymb) {
- 		    my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+ 		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
  		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
  			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
  					  ('grade_username' => $tuname,
- Line 4176  sub handler {
+ Line 5796  sub handler {
  	    }
  	}
      } else {
- 	if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {
+ 	&init_perm();
- 	    if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
- 		$perm{'vgr_section'}=$ENV{'request.course.sec'};
- 	    } else {
- 		delete($perm{'vgr'});
- 	    }
- 	}
- 	if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
- 	    if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
- 		$perm{'mgr_section'}=$ENV{'request.course.sec'};
- 	    } else {
- 		delete($perm{'mgr'});
- 	    }
- 	}
  	if ($command eq 'submission' && $perm{'vgr'}) {
- 	    ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
+ 	    ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
  	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
  	    &pickStudentPage($request);
  	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
- Line 4216  sub handler {
+ Line 5823  sub handler {
  	    $request->print(&csvupload($request));
  	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
  	    $request->print(&csvuploadmap($request));
- 	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'}) {
+ 	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
- 	    if ($ENV{'form.associate'} ne 'Reverse Association') {
+ 	    if ($env{'form.associate'} ne 'Reverse Association') {
- 		$request->print(&csvuploadassign($request));
+ 		$request->print(&csvuploadoptions($request));
  	    } else {
- 		if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
+ 		if ( $env{'form.upfile_associate'} ne 'reverse' ) {
- 		    $ENV{'form.upfile_associate'} = 'reverse';
+ 		    $env{'form.upfile_associate'} = 'reverse';
  		} else {
- 		    $ENV{'form.upfile_associate'} = 'forward';
+ 		    $env{'form.upfile_associate'} = 'forward';
  		}
  		$request->print(&csvuploadmap($request));
  	    }
+ 	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
+ 	    $request->print(&csvuploadassign($request));
  	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
  	    $request->print(&scantron_selectphase($request));
+  	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
+  	    $request->print(&scantron_do_warning($request));
  	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
  	    $request->print(&scantron_validate_file($request));
  	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
  	    $request->print(&scantron_process_students($request));
- 	} elsif ($command eq 'scantronupload' &&
+  	} elsif ($command eq 'scantronupload' &&
- 		 &Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})) {
+  		 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
- 	    $request->print(&scantron_upload_scantron_data($request));
+ 		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
+  	    $request->print(&scantron_upload_scantron_data($request));
- 	} elsif ($command eq 'scantronupload_save' &&
+  	} elsif ($command eq 'scantronupload_save' &&
- 		 &Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})) {
+  		 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
- 	    $request->print(&scantron_upload_scantron_data_save($request));
+ 		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
+  	    $request->print(&scantron_upload_scantron_data_save($request));
+  	} elsif ($command eq 'scantron_download' &&
+ 		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+  	    $request->print(&scantron_download_scantron_data($request));
  	} elsif ($command) {
- 	    $request->print("Access Denied");
+ 	    $request->print("Access Denied ($command)");
  	}
      }
      &send_footer($request);
- Line 4262  sub send_header {
+ Line 5877  sub send_header {
  sub send_footer {
      my ($request)= @_;
-     $request->print('</body>');
+     $request->print('</body></html>');
-     $request->print(&Apache::lontexconvert::footer());
  }
 ;

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

Removed from v.1.130.2.1.2.9
changed lines
	Added in v.1.323