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.82 and 1.199

-version 1.82, 2003/04/01 05:21:48
+version 1.199, 2004/05/10 23:18:27
  Line 33
  # June-August H.K. Ng
  # Year 2003
  # February, March H.K. Ng
+ # July, H. K. Ng
  #
  package Apache::grades;
- Line 41  use Apache::style;
+ Line 42  use Apache::style;
  use Apache::lonxml;
  use Apache::lonnet;
  use Apache::loncommon;
+ use Apache::lonhtmlcommon;
  use Apache::lonnavmaps;
  use Apache::lonhomework;
  use Apache::loncoursedata;
  use Apache::lonmsg qw(:user_normal_msg);
  use Apache::Constants qw(:common);
+ use Apache::lonlocal;
+ use String::Similarity;
+ 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);
+ 		}
+ 	    }
  	}
      }
-     return @parts;
+     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 @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 $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 '') {
+ 	if (!$silent) {
+ 	    $request->print("Unable to handle ambiguous references:$url:.");
+ 	    return ();
+ 	}
+     }
      return ($symb,$url);
  }
- Line 90  sub get_fullname {
+ Line 120  sub get_fullname {
      return $fullname;
  }
+ #--- Format fullname, username:domain if different for display
+ #--- Use anywhere where the student names are listed
+ sub nameUserString {
+     my ($type,$fullname,$uname,$udom) = @_;
+     if ($type eq 'header') {
+ 	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>&nbsp;';
+     } else {
+ 	return '&nbsp;'.$fullname.'<font color="#999999">&nbsp;('.$uname.
+ 	    ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+     }
+ }
  #--- Get the partlist and the response type for a given problem. ---
  #--- Indicate if a response type is coded handgraded or not. ---
  sub response_type {
-     my ($url) = shift;
+     my ($url,$symb) = shift;
+     $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
      my $allkeys = &Apache::lonnet::metadata($url,'keys');
+     my %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);
- 	    $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+ 	    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} = ($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;
+ }
+ #--- Show resource title
+ #--- and parts and response type
+ sub showResourceInfo {
+     my ($url,$probTitle,$checkboxes) = @_;
+     my $col=3;
+     if ($checkboxes) { $col=4; }
+     my $result ='<table border="0">'.
+ 	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
+ 	$probTitle.'</font></td></tr>'."\n";
+     my ($partlist,$handgrade,$responseType) = &response_type($url);
+     my %resptype = ();
+     my $hdgrade='no';
+     my %partsseen;
+     for my $part_resID (sort keys(%$handgrade)) {
+ 	my $handgrade=$$handgrade{$part_resID};
+ 	my ($partID,$resID) = split(/_/,$part_resID);
+ 	my $responsetype = $responseType->{$partID}->{$resID};
+ 	$hdgrade = $handgrade if ($handgrade eq 'yes');
+ 	$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;
+ 	}
+ 	$result.='<td><b>Part </b>'.$partID.' <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,$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/rank/radiobutton/match/essay response types only.
+ sub cleanRecord {
+     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+     my $grayFont = '<font color="#999999">';
+     if ($response =~ /^(option|rank)$/) {
+ 	my %answer=&Apache::lonnet::str2hash($answer);
+ 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+ 	my ($toprow,$bottomrow);
+ 	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>';
+ 	}
+ 	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 'match') {
+ 	my %answer=&Apache::lonnet::str2hash($answer);
+ 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+ 	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
+ 	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'}.'.num'});
+ 	    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ 	    $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+ 	    $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+ 	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+ 	    $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.
+ 	}
+ 	$answer =~ s-\n-<br />-g;
+ 	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
+     }
+     return $answer;
+ }
+ #-- A couple of common js functions
+ sub commonJSfunctions {
+     my $request = shift;
+     $request->print(<<COMMONJSFUNCTIONS);
+ <script type="text/javascript" language="javascript">
+     function radioSelection(radioButton) {
+ 	var selection=null;
+ 	if (radioButton.length > 1) {
+ 	    for (var i=0; i<radioButton.length; i++) {
+ 		if (radioButton[i].checked) {
+ 		    return radioButton[i].value;
+ 		}
+ 	    }
+ 	} else {
+ 	    if (radioButton.checked) return radioButton.value;
+ 	}
+ 	return selection;
+     }
+     function pullDownSelection(selectOne) {
+ 	var selection="";
+ 	if (selectOne.length > 1) {
+ 	    for (var i=0; i<selectOne.length; i++) {
+ 		if (selectOne[i].selected) {
+ 		    return selectOne[i].value;
+ 		}
+ 	    }
+ 	} else {
+             // only one value it must be the selected one
+ 	    return selectOne.value;
+ 	}
+     }
+ </script>
+ COMMONJSFUNCTIONS
  }
  #--- Dumps the class list with usernames,list of sections,
  #--- section, ids and fullnames for each user.
  sub getclasslist {
      my ($getsec,$filterlist) = @_;
+     $getsec = $getsec eq '' ? 'all' : $getsec;
      my $classlist=&Apache::loncoursedata::get_classlist();
      # Bail out if we were unable to get the classlist
      return if (! defined($classlist));
- Line 125  sub getclasslist {
+ Line 354  sub getclasslist {
  	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
              @{$classlist->{$_}};
  	# 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->{$_});
  		next;
  	    }
  	}
  	$section = ($section ne '' ? $section : 'no');
- 	if ($getsec eq 'all' || $getsec eq $section) {
+ 	if (&canview($section)) {
-             $sections{$section}++;
+ 	    if ($getsec eq 'all' || $getsec eq $section) {
-             $fullnames{$_}=$fullname;
+ 		$sections{$section}++;
-         } else {
+ 		$fullnames{$_}=$fullname;
-             delete($classlist->{$_});
+ 	    } else {
-         }
+ 		delete($classlist->{$_});
+ 	    }
+ 	} else {
+ 	    delete($classlist->{$_});
+ 	}
      }
      my %seen = ();
      my @sections = sort(keys(%sections));
      return ($classlist,\@sections,\%fullnames);
  }
- #find user domain
+ sub canmodify {
- sub finduser {
+     my ($sec)=@_;
-     my ($name) = @_;
+     if ($perm{'mgr'}) {
-     my $domain = '';
+ 	if (!defined($perm{'mgr_section'})) {
-     if ( $Apache::grades::viewgrades eq 'F' ) {
+ 	    # can modify whole class
- 	my %classlist=&Apache::lonnet::dump('classlist',
+ 	    return 1;
- 					    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 	} else {
- 					    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ 	    if ($sec eq $perm{'mgr_section'}) {
- 	my (@fields) = grep /^$name:/, keys %classlist;
+ 		#can modify the requested section
- 	($name, $domain) = split(/:/,$fields[0]);
+ 		return 1;
- 	return ($name,$domain);
+ 	    } else {
-     } else {
+ 		# can't modify the request section
- 	return ($ENV{'user.name'},$ENV{'user.domain'});
+ 		return 0;
+ 	    }
+ 	}
      }
+     #can't modify
+     return 0;
  }
- #--- Prompts a user to enter a username.
+ sub canview {
- sub moreinfo {
+     my ($sec)=@_;
-     my ($request,$reason) = @_;
+     if ($perm{'vgr'}) {
-     $request->print("Unable to process request: $reason");
+ 	if (!defined($perm{'vgr_section'})) {
-     if ( $Apache::grades::viewgrades eq 'F' ) {
+ 	    # can modify whole class
- 	$request->print('<form action="/adm/grades" method="post">'."\n");
+ 	    return 1;
- 	if ($ENV{'form.url'}) {
+ 	} else {
- 	    $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+ 	    if ($sec eq $perm{'vgr_section'}) {
- 	}
+ 		#can modify the requested section
- 	if ($ENV{'form.symb'}) {
+ 		return 1;
- 	    $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ 	    } else {
- 	}
+ 		# can't modify the request section
- 	$request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
+ 		return 0;
- 	$request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
+ 	    }
- 	$request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
+ 	}
- 	$request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
- 	$request->print('</form>');
      }
-     return '';
+     #can't modify
+     return 0;
  }
  #--- Retrieve the grade status of a student for all the parts
- Line 187  sub student_gradeStatus {
+ Line 423  sub student_gradeStatus {
      my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
      my %partstatus = ();
      foreach (@$partlist) {
- 	my ($status,$foo)    = split(/_/,$record{"resource.$_.solved"},2);
+ 	my ($status,undef)   = split(/_/,$record{"resource.$_.solved"},2);
  	$status              = 'nothing' if ($status eq '');
  	$partstatus{$_}      = $status;
  	my $subkey           = "resource.$_.submitted_by";
- Line 213  sub jscriptNform {
+ Line 449  sub jscriptNform {
  	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
  	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
  	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
+ 	'<input type="hidden" name="Status"  value="'.$ENV{'form.Status'}.'" />'."\n".
  	'<input type="hidden" name="command" value="submission" />'."\n".
  	'<input type="hidden" name="student" value="" />'."\n".
  	'<input type="hidden" name="userdom" value="" />'."\n".
- Line 221  sub jscriptNform {
+ Line 458  sub jscriptNform {
  }
  #------------------ End of general use routines --------------------
+ #
+ # Find most similar essay
+ #
+ sub most_similar {
+     my ($uname,$udom,$uessay)=@_;
+ # ignore spaces and punctuation
+     $uessay=~s/\W+/ /gs;
+ # these will be returned. Do not care if not at least 50 percent similar
+     my $limit=0.6;
+     my $sname='';
+     my $sdom='';
+     my $scrsid='';
+     my $sessay='';
+ # go through all essays ...
+     foreach my $tkey (keys %oldessays) {
+ 	my ($tname,$tdom,$tcrsid)=split(/\./,$tkey);
+ # ... except the same student
+         if (($tname ne $uname) || ($tdom ne $udom)) {
+ 	    my $tessay=$oldessays{$tkey};
+             $tessay=~s/\W+/ /gs;
+ # String similarity gives up if not even limit
+             my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
+ # Found one
+             if ($tsimilar>$limit) {
+ 		$limit=$tsimilar;
+                 $sname=$tname;
+                 $sdom=$tdom;
+                 $scrsid=$tcrsid;
+                 $sessay=$oldessays{$tkey};
+             }
+         }
+     }
+     if ($limit>0.6) {
+        return ($sname,$sdom,$scrsid,$sessay,$limit);
+     } else {
+        return ('','','','',0);
+     }
+ }
  #-------------------------------------------------------------------
  #------------------------------------ Receipt Verification Routines
- Line 230  sub verifyreceipt {
+ Line 511  sub verifyreceipt {
      my $request  = shift;
      my $courseid = $ENV{'request.course.id'};
-     my $receipt  = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
+     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
  	$ENV{'form.receipt'};
      $receipt     =~ s/[^\-\d]//g;
      my $url      = $ENV{'form.url'};
- Line 241  sub verifyreceipt {
+ Line 522  sub verifyreceipt {
      my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
  	$receipt.'</h3></font>'."\n".
- 	'<font size=+1><b>Problem: </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');
+     my $receiptparts=0;
+     if ($ENV{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+     my $parts=['0'];
+     if ($receiptparts) { ($parts)=&response_type($url,$symb); }
      foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$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 269  sub verifyreceipt {
+ Line 559  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 289  sub listStudents {
+ Line 582  sub listStudents {
      my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
      my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
-     my $result;
+     my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
-     my ($partlist,$handgrade) = &response_type($url);
-     for (sort keys(%$handgrade)) {
- 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- 	$ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
- 	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
- 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-     }
-     $result.='</table>'."\n";
-     my $viewgrade = $ENV{'form.handgrade'} eq 'yes' ? 'View/Grade' : 'View';
      $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
  	&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
-     $result='<h3><font color="#339933">&nbsp;'.
+     my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
- 	$viewgrade.
+ 	' Submissions for a Student or a Group of Students</font></h3>';
- 	    ' Submissions for a Student or a Group of Students</font></h3>'.
- 	    '<table border="0"><tr><td colspan=3><font size=+1>'.
+     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'},($ENV{'form.showgrading'} eq 'yes'));
- 		    '<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>'.$result;
      $request->print(<<LISTJAVASCRIPT);
  <script type="text/javascript" language="javascript">
-   function checkSelect(checkBox) {
+     function checkSelect(checkBox) {
-     var ctr=0;
+ 	var ctr=0;
-     var sense="";
+ 	var sense="";
-     if (checkBox.length > 1) {
+ 	if (checkBox.length > 1) {
-        for (var i=0; i<checkBox.length; i++) {
+ 	    for (var i=0; i<checkBox.length; i++) {
- 	  if (checkBox[i].checked) {
+ 		if (checkBox[i].checked) {
- 	     ctr++;
+ 		    ctr++;
- 	  }
+ 		}
-        }
+ 	    }
-        sense = "a student or group of students";
+ 	    sense = "a student or group of students";
-     } else {
+ 	} else {
-        if (checkBox.checked) {
+ 	    if (checkBox.checked) {
- 	   ctr = 1;
+ 		ctr = 1;
-        }
+ 	    }
-        sense = "the student";
+ 	    sense = "the student";
-     }
+ 	}
-     if (ctr == 0) {
+ 	if (ctr == 0) {
-        alert("Please select "+sense+" before clicking on the $viewgrade button.");
+ 	    alert("Please select "+sense+" before clicking on the Next button.");
-        return false;
+ 	    return false;
+ 	}
+ 	document.gradesub.submit();
+     }
+     function reLoadList(formname) {
+ 	if (formname.saveStatusOld.value == pullDownSelection(formname.Status)) {return;}
+ 	formname.command.value = 'submission';
+ 	formname.submit();
      }
-     document.gradesub.submit();
-   }
  </script>
  LISTJAVASCRIPT
+     &commonJSfunctions($request);
      $request->print($result);
-     my $checkhdgrade = $ENV{'form.handgrade'} eq 'yes' ? 'checked' : '';
+     my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
-     my $checklastsub = $ENV{'form.handgrade'} eq 'yes' ? '' : 'checked';
+     my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
+     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
-     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
+ 	"\n".$table.
- 	'&nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+ 	'&nbsp;<b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
  	'<input type="radio" name="vProb" value="yes" /> one student '."\n".
  	'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".
+ 	'&nbsp;<b>View Answer: </b><input type="radio" name="vAns" value="no"  /> no '."\n".
+ 	'<input type="radio" name="vAns" value="yes" /> one student '."\n".
+ 	'<input type="radio" name="vAns" value="all" checked="on" /> all students <br />'."\n".
  	'&nbsp;<b>Submissions: </b>'."\n";
-     if ($ENV{'form.handgrade'} eq 'yes') {
+     if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
- 	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> handgrade only'."\n";
+ 	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
      }
-     $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
- 	'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+     my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
+     $ENV{'form.Status'} = $saveStatus;
+     $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only'."\n".
+ 	'<input type="radio" name="lastSub" value="last" /> last submission & parts info'."\n".
+ 	'<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
  	'<input type="radio" name="lastSub" value="all" /> all details'."\n".
  	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
  	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
- 	'<input type="hidden" name="response"    value="'.$ENV{'form.response'}.'" />'."\n".
  	'<input type="hidden" name="handgrade"   value="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
  	'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" /><br />'."\n".
  	'<input type="hidden" name="saveState"   value="'.$ENV{'form.saveState'}.'" />'."\n".
  	'<input type="hidden" name="probTitle"   value="'.$ENV{'form.probTitle'}.'" />'."\n".
  	'<input type="hidden" name="url"  value="'.$url.'" />'."\n".
  	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
- 	'To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
+ 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
- 	'click on the '.$viewgrade.' button. To view the submissions for a group of students, click'."\n".
- 	' on the check boxes for the group of students.<br />'."\n".
+     if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {
- 	'<input type="hidden" name="command" value="processGroup" />'."\n".
+ 	$gradeTable.='<input type="hidden" name="Status"   value="'.$ENV{'form.Status'}.'" />'."\n";
- 	'<input type="button" '."\n".
+     } else {
+ 	$gradeTable.='<b>Student Status:</b> '.
+ 	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+     }
+     $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";
+     $gradeTable.='<input type="button" '."\n".
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 	'value="'.$viewgrade.'" />'."\n";
+ 	'value="Next->" />'."\n";
+     $gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';
-     my (undef,undef,$fullname) = &getclasslist($getsec,$ENV{'form.showgrading'} eq 'yes' ? '1' : '0');
+     my (undef, undef, $fullname) = &getclasslist($getsec,'1');
      $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
- 	'<table border="0"><tr bgcolor="#e6ffff">'.
+ 	'<table border="0"><tr bgcolor="#e6ffff">';
- 	'<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Fullname&nbsp;</b></td>'.
+     my $loop = 0;
- 	'<td><b>&nbsp;Username&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>';
+     while ($loop < 2) {
-     foreach (sort(@$partlist)) {
+ 	$gradeTable.='<td><b>&nbsp;No.</b>&nbsp;</td><td><b>&nbsp;Select&nbsp;</b></td>'.
- 	$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+ 	    '<td>'.&nameUserString('header').'</td>';
+ 	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 	    foreach (sort(@$partlist)) {
+ 		$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+ 	    }
+ 	}
+ 	$loop++;
+ #	$gradeTable.='<td></td>' if ($loop%2 ==1);
      }
      $gradeTable.='</tr>'."\n";
      my $ctr = 0;
      foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
  	my ($uname,$udom) = split(/:/,$student);
- 	my (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+ 	my %status = ();
- 	my $statusflg = '';
+ 	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
- 	foreach (keys(%status)) {
+ 	    (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
- 	    $statusflg = 1 if ($status{$_} ne 'nothing');
+ 	    my $submitted = 0;
- 	    my ($foo,$partid,$foo1) = split(/\./,$_);
+ 	    my $graded = 0;
- 	    if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+ 	    foreach (keys(%status)) {
- 		$statusflg = '';
+ 		$submitted = 1 if ($status{$_} ne 'nothing');
- 		$gradeTable.='<input type="hidden" name="'.
+ 		$graded = 1 if ($status{$_} !~ /^correct/);
- 		    $student.':submitted_by" value="'.
- 		    $status{'resource.'.$partid.'.submitted_by'}.'" />';
+ 		my ($foo,$partid,$foo1) = split(/\./,$_);
+ 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+ 		    $submitted = 0;
+ 		    my ($part)=split(/\./,$partid);
+ 		    $gradeTable.='<input type="hidden" name="'.
+ 			$student.':'.$part.':submitted_by" value="'.
+ 			$status{'resource.'.$partid.'.submitted_by'}.'" />';
+ 		}
  	    }
+ 	    next if (!$submitted && ($submitonly eq 'yes' ||
+ 				     $submitonly eq 'incorrect' ||
+ 				     $submitonly eq 'graded'));
+ 	    next if (!$graded && ($submitonly eq 'graded' ||
+ 				  $submitonly eq 'incorrect'));
  	}
- 	next if ($statusflg eq '' && $submitonly eq 'yes');
  	$ctr++;
- 	if ( $Apache::grades::viewgrades eq 'F' ) {
+ 	if ( $perm{'vgr'} eq 'F' ) {
- 	    $gradeTable.='<tr bgcolor="#ffffe6">'.
+ 	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
+ 	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
  		'<td align="center"><input type=checkbox name="stuinfo" value="'.
- 		$student.':'.$$fullname{$student}.'"></td>'."\n".
+ 		$student.':'.$$fullname{$student}.'&nbsp;"></td>'."\n".
- 		'<td>&nbsp;'.$$fullname{$student}.'&nbsp;</td>'."\n".
+ 		'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
- 		'<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
- 		'<td align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
+ 	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 		foreach (sort keys(%status)) {
- 	    foreach (sort keys(%status)) {
+ 		    next if (/^resource.*?submitted_by$/);
- 		next if (/^resource.*?submitted_by$/);
+ 		    $gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
- 		$gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+ 		}
  	    }
- 	    $gradeTable.='</tr>'."\n";
+ #	    $gradeTable.='<td></td>' if ($ctr%2 ==1);
+ 	    $gradeTable.='</tr>'."\n" if ($ctr%2 ==0);
  	}
      }
+     if ($ctr%2 ==1) {
+ 	$gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
+ 	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ 		foreach (@$partlist) {
+ 		    $gradeTable.='<td>&nbsp;</td>';
+ 		}
+ 	    }
+ 	$gradeTable.='</tr>';
+     }
      $gradeTable.='</table></td></tr></table>'.
  	'<input type="button" '.
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 	'value="'.$viewgrade.'" /></form>'."\n";
+ 	'value="Next->" /></form>'."\n";
      if ($ctr == 0) {
- 	$gradeTable='<br />&nbsp;<font color="red">'.
+ 	my $num_students=(scalar(keys(%$fullname)));
- 	    'No submission found for this resource.</font><br />';
+ 	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'; }
+ 	    $gradeTable='<br />&nbsp;<font color="red">'.
+ 		'No '.$submissions.' found for this resource for any students. ('.$num_students.
+ 		' students checked for '.$submissions.')</font><br />';
+ 	}
      } elsif ($ctr == 1) {
  	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
      }
- Line 434  LISTJAVASCRIPT
+ Line 775  LISTJAVASCRIPT
  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) {
- Line 460  sub sub_page_js {
+ Line 800  sub sub_page_js {
      $request->print(<<SUBJAVASCRIPT);
  <script type="text/javascript" language="javascript">
      function updateRadio(formname,id,weight) {
- 	var gradeBox = eval("formname.GD_BOX"+id);
+ 	var gradeBox = formname["GD_BOX"+id];
- 	var radioButton = eval("formname.RADVAL"+id);
+ 	var radioButton = formname["RADVAL"+id];
- 	var oldpts = eval("formname.oldpts"+id+".value");
+ 	var oldpts = formname["oldpts"+id].value;
  	var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : oldpts;
  	gradeBox.value = pts;
  	var resetbox = false;
- Line 484  sub sub_page_js {
+ Line 824  sub sub_page_js {
  	    var resp = confirm("You entered a value ("+pts+
  			       ") greater than the weight for the part. Accept?");
  	    if (resp == false) {
- 		gradeBox.value = "";
+ 		gradeBox.value = oldpts;
  		return;
  	    }
  	}
- Line 496  sub sub_page_js {
+ Line 836  sub sub_page_js {
  	    }
  	}
  	updateSelect(formname,id);
- 	var stores = eval("formname.stores"+id);
+ 	formname["stores"+id].value = "0";
- 	stores.value = "0";
      }
      function writeBox(formname,id,pts) {
- 	var gradeBox = eval("formname.GD_BOX"+id);
+ 	var gradeBox = formname["GD_BOX"+id];
  	if (checkSolved(formname,id) == 'update') {
  	    gradeBox.value = pts;
  	} else {
- 	    var oldpts = eval("formname.oldpts"+id+".value");
+ 	    var oldpts = formname["oldpts"+id].value;
  	    gradeBox.value = oldpts;
- 	    var radioButton = eval("formname.RADVAL"+id);
+ 	    var radioButton = formname["RADVAL"+id];
  	    for (var i=0; i<radioButton.length; i++) {
  		radioButton[i].checked=false;
  		if (i == oldpts) {
- Line 515  sub sub_page_js {
+ Line 854  sub sub_page_js {
  		}
  	    }
  	}
- 	var stores = eval("formname.stores"+id);
+ 	formname["stores"+id].value = "0";
- 	stores.value = "0";
  	updateSelect(formname,id);
  	return;
      }
- Line 526  sub sub_page_js {
+ Line 864  sub sub_page_js {
  	    updateSelect(formname,id);
  	    return;
  	}
- 	gradeSelect = eval("formname.GD_SEL"+id);
+ 	gradeSelect = formname["GD_SEL"+id];
  	for (var i=0; i<gradeSelect.length; i++) {
  	    if (gradeSelect[i].selected) {
  		var selectx=i;
  	    }
  	}
- 	var stores = eval("formname.stores"+id);
+ 	var stores = formname["stores"+id];
  	if (selectx == stores.value) { return };
- 	var gradeBox = eval("formname.GD_BOX"+id);
+ 	var gradeBox = formname["GD_BOX"+id];
  	gradeBox.value = "";
- 	var radioButton = eval("formname.RADVAL"+id);
+ 	var radioButton = formname["RADVAL"+id];
  	for (var i=0; i<radioButton.length; i++) {
  	    radioButton[i].checked=false;
  	}
- Line 544  sub sub_page_js {
+ Line 882  sub sub_page_js {
      }
      function checkSolved(formname,id) {
- 	if (eval("formname.solved"+id+".value") == "correct_by_student") {
+ 	if (formname["solved"+id].value == "correct_by_student" && formname.overRideScore.value == 'no') {
- 	    alert("This problem has been graded correct by the computer. The score cannot be changed.");
+ 	    var reply = confirm("This problem has been graded correct by the computer. Do you want to change the score?");
- 	    return "noupdate";
+ 	    if (!reply) {return "noupdate";}
+ 	    formname.overRideScore.value = 'yes';
  	}
  	return "update";
      }
      function updateSelect(formname,id) {
- 	var gradeSelect = eval("formname.GD_SEL"+id);
+ 	formname["GD_SEL"+id][0].selected = true;
- 	gradeSelect[0].selected = true;
  	return;
      }
- //=========== Check that a point is assigned for all the parts (essay grading only) ============
+ //=========== Check that a point is assigned for all the parts  ============
      function checksubmit(formname,val,total,parttot) {
- 	document.SCORE.gradeOpt.value = val;
+ 	formname.gradeOpt.value = val;
  	if (val == "Save & Next") {
  	    for (i=0;i<=total;i++) {
  		for (j=0;j<parttot;j++) {
- 		    var partid = eval("formname.partid"+i+"_"+j+".value");
+ 		    var partid = formname["partid"+i+"_"+j].value;
- 		    var selopt = eval("formname.GD_SEL"+i+"_"+partid);
+ 		    if (formname["GD_SEL"+i+"_"+partid][0].selected) {
- 		    if (selopt[0].selected) {
+ 			var points = formname["GD_BOX"+i+"_"+partid].value;
- 			var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
  			if (points == "") {
- 			    var name = eval("formname.name"+i+".value");
+ 			    var name = formname["name"+i].value;
- 			    var resp = confirm("You did not assign a score for "+name+", part "+partid+". Continue?");
+ 			    var studentID = (name != '' ? name : formname["unamedom"+i].value);
+ 			    var resp = confirm("You did not assign a score for "+studentID+
+ 					       ", part "+partid+". Continue?");
  			    if (resp == false) {
- 				eval("formname.GD_BOX"+i+"_"+partid+".focus()");
+ 				formname["GD_BOX"+i+"_"+partid].focus();
  				return false;
  			    }
  			}
- Line 581  sub sub_page_js {
+ Line 920  sub sub_page_js {
  	    }
  	}
+ 	if (val == "Grade Student") {
+ 	    formname.showgrading.value = "yes";
+ 	    if (formname.Status.value == "") {
+ 		formname.Status.value = "Active";
+ 	    }
+ 	    formname.studentNo.value = total;
+ 	}
  	formname.submit();
      }
- Line 589  sub sub_page_js {
+ Line 935  sub sub_page_js {
  	noscore = new Array(100);
  	var ptr = 0;
  	for (i=1;i<total;i++) {
- 	    var partid = eval("formname.q_"+i+".value");
+ 	    var partid = formname["q_"+i].value;
- 	    var selopt = eval("formname.GD_SEL"+i+"_"+partid);
+ 	    if (formname["GD_SEL"+i+"_"+partid][0].selected) {
- 	    if (selopt[0].selected) {
+ 		var points = formname["GD_BOX"+i+"_"+partid].value;
- 		var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
+ 		var status = formname["solved"+i+"_"+partid].value;
- 		var status = eval("formname.solved"+i+"_"+partid+".value");
  		if (points == "" && status != "correct_by_student") {
  		    noscore[ptr] = i;
  		    ptr++;
- Line 629  SUBJAVASCRIPT
+ Line 974  SUBJAVASCRIPT
  sub sub_page_kw_js {
      my $request = shift;
      my $iconpath = $request->dir_config('lonIconsURL');
+     &commonJSfunctions($request);
      $request->print(<<SUBJAVASCRIPT);
  <script type="text/javascript" language="javascript">
  //===================== Show list of keywords ====================
-   function keywords(keyform) {
+   function keywords(formname) {
-     var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keyform.value);
+     var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);
      if (nret==null) return;
-     keyform.value = nret;
+     formname.keywords.value = nret;
-     document.SCORE.refresh.value = "on";
+     if (formname.keywords.value != "") {
-     if (document.SCORE.keywords.value != "") {
+ 	formname.refresh.value = "on";
- 	document.SCORE.submit();
+ 	formname.submit();
      }
      return;
    }
- Line 666  sub sub_page_kw_js {
+ Line 1012  sub sub_page_kw_js {
      }
      var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
      if (nret==null) return;
-     var curlist = document.SCORE.keywords.value;
+     document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
-     document.SCORE.keywords.value = curlist+" "+nret;
-     document.SCORE.refresh.value = "on";
      if (document.SCORE.keywords.value != "") {
+ 	document.SCORE.refresh.value = "on";
  	document.SCORE.submit();
      }
      return;
- Line 686  sub sub_page_kw_js {
+ Line 1031  sub sub_page_kw_js {
      var Nmsg  = msgform.savemsgN.value;
      savedMsgHeader(Nmsg,usrctr,fullname);
      var subject = msgform.msgsub.value;
-     var rtrchk  = eval("document.SCORE.includemsg"+usrctr);
+     var msgchk = document.SCORE["includemsg"+usrctr].value;
-     var msgchk = rtrchk.value;
      re = /msgsub/;
      var shwsel = "";
      if (re.test(msgchk)) { shwsel = "checked" }
-     displaySubject(subject,shwsel);
+     subject = (document.SCORE.shownSub.value == 0 ? checkEntities(subject) : subject);
+     displaySubject(checkEntities(subject),shwsel);
      for (var i=1; i<=Nmsg; i++) {
- 	var testpt = "savemsg"+i+",";
+ 	var testmsg = "savemsg"+i+",";
- 	re = /testpt/;
+ 	re = new RegExp(testmsg,"g");
  	shwsel = "";
  	if (re.test(msgchk)) { shwsel = "checked" }
- 	var message = eval("document.SCORE.savemsg"+i+".value");
+ 	var message = document.SCORE["savemsg"+i].value;
- 	displaySavedMsg(i,message,shwsel);
+ 	message = (document.SCORE["shownOnce"+i].value == 0 ? checkEntities(message) : message);
+ 	displaySavedMsg(i,message,shwsel); //I do not get it. w/o checkEntities on saved messages,
+ 	                                   //any &lt; is already converted to <, etc. However, only once!!
      }
-     newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+     newmsg = document.SCORE["newmsg"+usrctr].value;
      shwsel = "";
      re = /newmsg/;
      if (re.test(msgchk)) { shwsel = "checked" }
- Line 709  sub sub_page_kw_js {
+ Line 1056  sub sub_page_kw_js {
      return;
    }
- //  var pWin = null;
+   function checkEntities(strx) {
+     if (strx.length == 0) return strx;
+     var orgStr = ["&", "<", ">", '"'];
+     var newStr = ["&amp;", "&lt;", "&gt;", "&quot;"];
+     var counter = 0;
+     while (counter < 4) {
+ 	strx = strReplace(strx,orgStr[counter],newStr[counter]);
+ 	counter++;
+     }
+     return strx;
+   }
+   function strReplace(strx, orgStr, newStr) {
+     return strx.split(orgStr).join(newStr);
+   }
    function savedMsgHeader(Nmsg,usrctr,fullname) {
      var height = 70*Nmsg+250;
      var scrollbar = "no";
- Line 717  sub sub_page_kw_js {
+ Line 1079  sub sub_page_kw_js {
  	height = 600;
  	scrollbar = "yes";
      }
- //    if (window.pWin) window.pWin.close();
+     var xpos = (screen.width-600)/2;
-     pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
+     xpos = (xpos < 0) ? '0' : xpos;
+     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.focus();
      pDoc = pWin.document;
+     pDoc.open('text/html','replace');
      pDoc.write("<html><head>");
      pDoc.write("<title>Message Central</title>");
      pDoc.write("<script language=javascript>");
      pDoc.write("function checkInput() {");
-     pDoc.write("  opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
+     pDoc.write("  opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);");
      pDoc.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
      pDoc.write("  var usrctr = document.msgcenter.usrctr.value;");
-     pDoc.write("  var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
+     pDoc.write("  var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
-     pDoc.write("  newval.value = document.msgcenter.newmsg.value;");
+     pDoc.write("  newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");
      pDoc.write("  var msgchk = \\"\\";");
      pDoc.write("  if (document.msgcenter.subchk.checked) {");
- Line 738  sub sub_page_kw_js {
+ Line 1105  sub sub_page_kw_js {
      pDoc.write("  }");
      pDoc.write("  var includemsg = 0;");
      pDoc.write("  for (var i=1; i<=nmsg; i++) {");
-     pDoc.write("      var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
+     pDoc.write("      var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
-     pDoc.write("      var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
+     pDoc.write("      var frmmsg = document.msgcenter[\\"msg\\"+i];");
-     pDoc.write("      opnmsg.value = frmmsg.value;");
+     pDoc.write("      opnmsg.value = opener.checkEntities(frmmsg.value);");
-     pDoc.write("      var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
+     pDoc.write("      var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
+     pDoc.write("      showflg.value = \\"1\\";");
+     pDoc.write("      var chkbox = document.msgcenter[\\"msgn\\"+i];");
      pDoc.write("      if (chkbox.checked) {");
      pDoc.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
      pDoc.write("         includemsg = 1;");
- Line 751  sub sub_page_kw_js {
+ Line 1120  sub sub_page_kw_js {
      pDoc.write("     msgchk += \\"newmsg\\"+usrctr;");
      pDoc.write("     includemsg = 1;");
      pDoc.write("  }");
-     pDoc.write("  imgformname = eval(\\"opener.document.SCORE.mailicon\\"+usrctr);");
+     pDoc.write("  imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
-     pDoc.write("  if (includemsg) {");
+     pDoc.write("  imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
-     pDoc.write("     imgformname.src = \\"$iconpath/mailto.gif\\";");
+     pDoc.write("  var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
-     pDoc.write("  } else {");
-     pDoc.write("     imgformname.src = \\"$iconpath/mailbkgrd.gif\\";");
-     pDoc.write("  }");
-     pDoc.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
      pDoc.write("  includemsg.value = msgchk;");
      pDoc.write("  self.close()");
- Line 809  sub sub_page_kw_js {
+ Line 1174  sub sub_page_kw_js {
      pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
      pDoc.write("</form>");
      pDoc.write("</body></html>");
+     pDoc.close();
  }
  //====================== Script for keyword highlight options ==============
- Line 842  sub sub_page_kw_js {
+ Line 1208  sub sub_page_kw_js {
      return;
    }
- //  var hwdWin = null;
    function highlightCentral() {
  //    if (window.hwdWin) window.hwdWin.close();
-     hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');
+     var xpos = (screen.width-400)/2;
+     xpos = (xpos < 0) ? '0' : xpos;
+     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.focus();
      var hDoc = hwdWin.document;
+     hDoc.open('text/html','replace');
      hDoc.write("<html><head>");
      hDoc.write("<title>Highlight Central</title>");
      hDoc.write("<script language=javascript>");
      hDoc.write("function updateChoice(flag) {");
-     hDoc.write("  opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
+     hDoc.write("  opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);");
-     hDoc.write("  opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
+     hDoc.write("  opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
-     hDoc.write("  opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
+     hDoc.write("  opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
      hDoc.write("  opener.document.SCORE.refresh.value = \\"on\\";");
      hDoc.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
      hDoc.write("     opener.document.SCORE.submit();");
- Line 863  sub sub_page_kw_js {
+ Line 1234  sub sub_page_kw_js {
      hDoc.write("  self.close()");
      hDoc.write("}");
-     hDoc.write("function radioSelection(radioButton) {");
-     hDoc.write("    var selection=null;");
-     hDoc.write("    for (var i=0; i<radioButton.length; i++) {");
-     hDoc.write("        if (radioButton[i].checked) {");
-     hDoc.write("            selection=radioButton[i].value;");
-     hDoc.write("            return selection;");
-     hDoc.write("        }");
-     hDoc.write("    }");
-     hDoc.write("}");
      hDoc.write("<");
      hDoc.write("/script>");
- Line 906  sub sub_page_kw_js {
+ Line 1267  sub sub_page_kw_js {
      hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
      hDoc.write("</form>");
      hDoc.write("</body></html>");
+     hDoc.close();
    }
  </script>
- Line 933  sub gradeBox {
+ Line 1295  sub gradeBox {
      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><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."</nobr></td>\n";
  	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
  	$ctr++;
      }
- Line 955  sub gradeBox {
+ Line 1317  sub gradeBox {
  	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
      if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
  	$result.='<option> </option>'.
- 	    '<option selected="on">excused</option></select>'."\n";
+ 	    '<option selected="on">excused</option>';
      } else {
  	$result.='<option selected="on"> </option>'.
- 	    '<option>excused</option></select>'."\n";
+ 	    '<option>excused</option>';
      }
+     $result.='<option>reset status</option></select>'."\n";
      $result.="&nbsp&nbsp\n";
      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
  	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
- Line 970  sub gradeBox {
+ Line 1333  sub gradeBox {
  }
  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 1002  sub submission {
+ Line 1384  sub submission {
      (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
      my ($uname,$udom)     = ($ENV{'form.student'},$ENV{'form.userdom'});
-     ($uname,$udom)        = &finduser($uname) if $udom eq '';
+     $udom = ($udom eq '' ? $ENV{'user.domain'} : $udom); #has form.userdom changed for a student?
+     my $usec = &Apache::lonnet::getsection($udom,$uname,$ENV{'request.course.id'});
      $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
      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>');
+ 	$request->print(&show_grading_menu_form($symb,$url));
+ 	return;
+     }
+     if (!$ENV{'form.lastSub'}) { $ENV{'form.lastSub'} = 'datesub'; }
+     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);
+ 	&sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
  	$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
  	    &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
  	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
- 			'<font size=+1>&nbsp;<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+ 			'<font size=+1>&nbsp;<b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+ 	if ($ENV{'form.handgrade'} eq 'no') {
+ 	    my $checkMark='<br /><br />&nbsp;<b>Note:</b> Part(s) graded correct by the computer is marked with a '.
+ 		$checkIcon.' symbol.'."\n";
+ 	    $request->print($checkMark);
+ 	}
  	# 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 '') {
+ 	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'}.'.num'});
- Line 1041  sub submission {
+ Line 1451  sub submission {
  	    $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ?
  		$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
  	    $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
  	}
+ 	my $overRideScore = $ENV{'form.overRideScore'} eq '' ? 'no' : $ENV{'form.overRideScore'};
  	$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
  			'<input type="hidden" name="command"    value="handgrade" />'."\n".
  			'<input type="hidden" name="saveState"  value="'.$ENV{'form.saveState'}.'" />'."\n".
+ 			'<input type="hidden" name="Status"     value="'.$ENV{'form.Status'}.'" />'."\n".
+ 			'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
  			'<input type="hidden" name="probTitle"  value="'.$ENV{'form.probTitle'}.'" />'."\n".
  			'<input type="hidden" name="refresh"    value="off" />'."\n".
+ 			'<input type="hidden" name="studentNo"  value="" />'."\n".
+ 			'<input type="hidden" name="gradeOpt"   value="" />'."\n".
  			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
  			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
  			'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
  			'<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
+ 			'<input type="hidden" name="vAns"       value="'.$ENV{'form.vAns'}.'" />'."\n".
  			'<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
  			'<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
  			'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
- 			'<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
  			'<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
- 			'<input type="hidden" name="keywords"   value="'.$ENV{'form.keywords'}.'" />'."\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="kwstyle"    value="'.$ENV{'form.kwstyle'}.'" />'."\n".
- 			'<input type="hidden" name="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
- 			'<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
  			'<input type="hidden" name="NCT"'.
  			' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+ 	if ($ENV{'form.handgrade'} eq 'yes') {
+ 	    $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="kwsize"   value="'.$ENV{'form.kwsize'}.'" />'."\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="shownSub" value="0" />'."\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'}) {
  	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
- 		($keyhash{$symb.'_savemsg'.$cts} eq '' ?
+ 		(!exists($keyhash{$symb.'_savemsg'.$cts}) ?
  		 &Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
  		 &Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
- 		'" />'."\n";
+ 		'" />'."\n".
+ 		'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
  	    $cts++;
  	}
  	$request->print($prnmsg);
  	if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+ #
+ # Print out the keyword options line
+ #
  	    $request->print(<<KEYWORDS);
  &nbsp;<b>Keyword Options:</b>&nbsp;
- <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
+ <a href="javascript:keywords(document.SCORE)"; TARGET=_self>List</a>&nbsp; &nbsp;
  <a href="#" onMouseDown="javascript:getSel(); return false"
   CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
  <a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
  KEYWORDS
+ #
+ # Load the other essays for similarity check
+ #
+             my $essayurl=&Apache::lonnet::declutter($url);
+ 	    my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+ 	    $apath=&Apache::lonnet::escape($apath);
+ 	    $apath=~s/\W/\_/gs;
+ 	    %oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
          }
      }
-     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);
+     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>'.$ENV{'form.fullname'}.
+     $result.='<b>Fullname: </b>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<br />'."\n";
- 	'<font color="#999999">&nbsp; &nbsp;Username: '.$uname.'</font>'.
- 	'<font color="#999999">&nbsp; &nbsp;Domain: '.$udom.'</font><br />'."\n";
      $result.='<input type="hidden" name="name'.$counter.
  	'" value="'.$ENV{'form.fullname'}.'" />'."\n";
-     # If this is handgraded, then check for collaborators
+     # 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') {
- 	my @col_list;
  	($classlist,undef,$fullname) = &getclasslist('all','0');
  	for (keys (%$handgrade)) {
  	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.
- Line 1121  KEYWORDS
+ Line 1559  KEYWORDS
  	    next if ($ncol <= 0);
              s/\_/\./g;
              next if ($record{'resource.'.$_.'.collaborators'} eq '');
-             my (@colList) = split(/,?\s+/,
+             my @goodcollaborators = ();
-                                    $record{'resource.'.$_.'.collaborators'});
+             my @badcollaborators  = ();
-             my @collaborators = ();
+ 	    foreach (split(/,?\s+/,$record{'resource.'.$_.'.collaborators'})) {
- 	    foreach (@colList) { #pre-filter list - throw out submitter
+ 		$_ =~ s/[\$\^\(\)]//g;
+ 		next if ($_ eq '');
  		my ($co_name,$co_dom) = split /\@|:/,$_;
- 		$co_dom = $udom if (! defined($co_dom));
+ 		$co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
  		next if ($co_name eq $uname && $co_dom eq $udom);
- 		push @collaborators, $_;
+ 		# Doing this grep allows 'fuzzy' specification
+ 		my @Matches = grep /^$co_name:$co_dom$/i,keys %$classlist;
+ 		if (! scalar(@Matches)) {
+ 		    push @badcollaborators,$_;
+ 		} else {
+ 		    push @goodcollaborators, @Matches;
+ 		}
  	    }
-             my (@badcollaborators);
+             if (scalar(@goodcollaborators) != 0) {
-             if (scalar(@collaborators) != 0) {
                  $result.='<b>Collaborators: </b>';
-                 foreach my $collaborator (@collaborators) {
+                 foreach (@goodcollaborators) {
-                     my ($co_name,$co_dom) = split /\@|:/,$collaborator;
+ 		    my ($lastname,$givenn) = split(/,/,$$fullname{$_});
-                     $co_dom = $udom if (! defined($co_dom));
+ 		    push @col_fullnames, $givenn.' '.$lastname;
-                     # Doing this grep allows 'fuzzy' specification
+ 		    $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
-                     my @Matches = grep /^$co_name:$co_dom$/i,
+ 		}
-                     keys %$classlist;
- 		    if (! scalar(@Matches)) {
-                         push @badcollaborators,':'.$collaborator.':';
-                         next;
-                     }
-                     push @col_list, @Matches;
-                     foreach (@Matches) {
-                         my ($lastname,$givenn) = split(/,/,$$fullname{$_});
-                         push @col_fullnames, $givenn.' '.$lastname;
-                         $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
-                     }
-                 }
                  $result.='<br />'."\n";
-                 if (scalar(@badcollaborators) > 0) {
+ 		my ($part)=split(/\./,$_);
-                     $result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
+ 		$result.='<input type="hidden" name="collaborator'.$counter.
-                     $result.='This student has submitted ';
+ 		    '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
-                     if (scalar(@badcollaborators) == 1) {
+ 		    "\n";
-                         $result .= 'an invalid collaborator';
+ 	    }
-                     } else {
+ 	    if (scalar(@badcollaborators) > 0) {
-                         $result .= 'invalid collaborators';
+ 		$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
-                     }
+ 		$result.='This student has submitted ';
-                     $result .= ': '.join(', ',@badcollaborators);
+ 		$result.=(scalar(@badcollaborators) == 1) ? 'an invalid collaborator' : 'invalid collaborators';
- 		    $result .= '</td></tr></table>';
+ 		$result .= ': '.join(', ',@badcollaborators);
-                 }
+ 		$result .= '</td></tr></table>';
-                 if (scalar(@collaborators > $ncol)) {
+ 	    }
-                     $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
+ 	    if (scalar(@badcollaborators > $ncol)) {
-                     $result .= 'This student has submitted too many '.
+ 		$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
-                         'collaborators.  Maximum is '.$ncol;
+ 		$result .= 'This student has submitted too many '.
-                     $result .= '</td></tr></table>';
+ 		    'collaborators.  Maximum is '.$ncol.'.';
-                 }
+ 		$result .= '</td></tr></table>';
-                 $result.='<input type="hidden" name="collaborator'.$counter.
+ 	    }
-                     '" value="'.(join ':',@col_list).'" />'."\n";
-             }
  	}
      }
      $request->print($result."\n");
- Line 1182  KEYWORDS
+ Line 1612  KEYWORDS
      #             (3) Last submission plus the parts info
      #             (4) The whole record for this student
      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>';
+ 	} else {
- 	    $request->print($submitby);
+ 	    my %seenparts;
- 	} else {
+ 	    for my $part (sort keys(%$handgrade)) {
- 	    my ($string,$timestamp)=
+ 		my ($partid,$respid) = split(/_/,$part);
- 		&get_last_submission (%record);
+ 		if ($ENV{"form.$uname:$udom:$partid:submitted_by"}) {
- 	    my $lastsubonly=''.
+ 		    if (exists($seenparts{$partid})) { next; }
- 		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+ 		    $seenparts{$partid}=1;
- 		 $$timestamp).'';
+ 		    my $submitby='<b>Part '.$partid.
- 	    if ($$timestamp eq '') {
+ 			' Collaborative submission by: </b>'.
- 		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>'."\n";
+ 			'<a href="javascript:viewSubmitter(\''.
- 	    } else {
+ 			$ENV{"form.$uname:$udom:$partid:submitted_by"}.
- 		for my $part (sort keys(%$handgrade)) {
+ 			'\')"; TARGET=_self>'.
- 		    foreach (@$string) {
+ 			$$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
- 			my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/;
+ 		    $request->print($submitby);
- 			if ($part eq ($partid.'_'.$respid)) {
+ 		    next;
- 			    my ($ressub,$subval) = split(/:/,$_,2);
+ 		}
- 			    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ 		my $responsetype = $responseType->{$partid}->{$respid};
- 				$partid.'</b> <font color="#999999">( ID '.$respid.
+ 		if (!exists($record{"resource.$partid.$respid.submission"})) {
- 				' )</font>&nbsp; &nbsp;'.
+ 		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
-                                 ($record{"resource.$partid.$respid.uploadedurl"}?
+ 			$partid.'</b> <font color="#999999">( ID '.$respid.
-                                 '<a href="'.
+ 			' )</font>&nbsp; &nbsp;'.
-                                 &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
+ 			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
-    '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />':'').
+ 		    next;
-                                 '<b>Answer: </b>'.
+ 		}
- 				&keywords_highlight($subval).'</td></tr>'."\n"
+ 		foreach (@$string) {
- 				if ($ENV{'form.lastSub'} eq 'lastonly' ||
+ 		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
- 				    ($ENV{'form.lastSub'} eq 'hdgrade' &&
+ 		    if ($part ne ($partid.'_'.$respid)) { next; }
- 				     $$handgrade{$part} =~ /:yes$/));
+ 		    my ($ressub,$subval) = split(/:/,$_,2);
+ 		    # Similarity check
+ 		    my $similar='';
+ 		    if($ENV{'form.checkPlag'}){
+ 			my ($oname,$odom,$ocrsid,$oessay,$osim)=
+ 			    &most_similar($uname,$udom,$subval);
+ 			if ($osim) {
+ 			    $osim=int($osim*100.0);
+ 			    $similar="<hr /><h3><font color=\"#FF0000\">Essay".
+ 				" is $osim% similar to an essay by ".
+ 				&Apache::loncommon::plainname($oname,$odom).
+ 				'</font></h3><blockquote><i>'.
+ 				&keywords_highlight($oessay).
+ 				'</i></blockquote><hr />';
+ 			}
+ 		    }
+ 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
+ 		    if ($ENV{'form.lastSub'} eq 'lastonly' ||
+ 			($ENV{'form.lastSub'} eq 'hdgrade' &&
+ 			 $$handgrade{$part} eq 'yes')) {
+ 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ 			    $partid.'</b> <font color="#999999">( ID '.$respid.
+ 			    ' )</font>&nbsp; &nbsp;';
+ 			if ($record{"resource.$partid.$respid.uploadedurl"}) {
+ 			    &Apache::lonnet::allowuploaded('/adm/grades',
+ 			      $record{"resource.$partid.$respid.uploadedurl"});
+ 			    $lastsubonly.='<a href="'.$record{"resource.$partid.$respid.uploadedurl"}.'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
  			}
+ 			$lastsubonly.='<b>Submitted Answer: </b>'.
+ 			    &cleanRecord($subval,$responsetype,$symb,$partid,
+ 					 $respid,\%record,$order);
+ 			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
  		    }
  		}
  	    }
- 	    $lastsubonly.='</td></tr>'."\n";
- 	    $request->print($lastsubonly);
  	}
-     } else {
+ 	$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,$uname,$udom));
+     } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
  	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
  								 $ENV{'request.course.id'},
  								 $last,'.submission',
  								 'Apache::grades::keywords_highlight'));
      }
+     $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+ 	.$udom.'" />'."\n");
      # return if view submission with no grading option
-     if ($ENV{'form.showgrading'} eq '') {
+     if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
- 	$request->print('</td></tr></table></td></tr></table></form>'."\n");
+ 	my $toGrade.='<input type="button" value="Grade Student" '.
- 	$request->print(&show_grading_menu_form($symb,$url))
+ 	    'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
- 	    if (($ENV{'form.command'} eq 'submission') ||
+ 	    .$counter.'\');" TARGET=_self> &nbsp;'."\n" if (&canmodify($usec));
- 		($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+ 	$toGrade.='</td></tr></table></td></tr></table>'."\n";
+ 	if (($ENV{'form.command'} eq 'submission') ||
+ 	    ($ENV{'form.command'} eq 'processGroup' && $counter == $total)) {
+ 	    $toGrade.='</form>'.&show_grading_menu_form($symb,$url)
+ 	}
+ 	$request->print($toGrade);
  	return;
+     } else {
+ 	$request->print('</td></tr></table></td></tr></table>'."\n");
      }
-     # Grading options
+     # essay grading message center
-     $result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
+     if ($ENV{'form.handgrade'} eq 'yes') {
- 	'<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ 	my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
- 	'<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+ 	my $msgfor = $givenn.' '.$lastname;
- 	.$udom.'" />'."\n";
+ 	if (scalar(@col_fullnames) > 0) {
-     my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+ 	    my $lastone = pop @col_fullnames;
-     my $msgfor = $givenn.' '.$lastname;
+ 	    $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
-     if (scalar(@col_fullnames) > 0) {
+ 	}
- 	my $lastone = pop @col_fullnames;
+ 	$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
- 	$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
+ 	$result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
-     }
+ 	    '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
-     $result.='<tr><td bgcolor="#ffffff">'."\n".
+ 	$result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
- 	'&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
+ 	    ',\''.$msgfor.'\')"; TARGET=_self>'.
- 	',\''.$msgfor.'\')"; TARGET=_self>'.
+ 	    'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> &nbsp;'.
- 	'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> &nbsp;'.
+ 	    '<img src="'.$request->dir_config('lonIconsURL').
- 	'<img src="'.$request->dir_config('lonIconsURL').
+ 	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
- 	'/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;(Message will be sent when you click on Save & Next below.)'."\n"
+ 	    if ($ENV{'form.handgrade'} eq 'yes');
- 	if ($ENV{'form.handgrade'} eq 'yes');
+ 	$request->print($result);
-     $request->print($result);
+     }
      my %seen = ();
      my @partlist;
+     my @gradePartRespid;
      for (sort keys(%$handgrade)) {
  	my ($partid,$respid) = split(/_/);
  	next if ($seen{$partid} > 0);
  	$seen{$partid}++;
- 	next if ($$handgrade{$_} =~ /:no$/);
+ 	next if ($$handgrade{$_} =~ /: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.
  	'" value="'.(join ":",@partlist).'" />'."\n";
+     $result.='<input type="hidden" name="gradePartRespid'.
+ 	'" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
      my $ctr = 0;
      while ($ctr < scalar(@partlist)) {
  	$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
- Line 1283  KEYWORDS
+ Line 1760  KEYWORDS
      # print end of form
      if ($counter == $total) {
- 	my $endform='<table border="0"><tr><td>'.
+ 	my $endform='<table border="0"><tr><td>'."\n";
- 	    '<input type="hidden" name="gradeOpt" value="" />'."\n";
+ 	$endform.='<input type="button" value="Save & Next" '.
- 	if ($ENV{'form.handgrade'} eq 'yes') {
+ 	    'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
- 	    $endform.='<input type="button" value="Save & Next" '.
+ 	    $total.','.scalar(@partlist).');" TARGET=_self> &nbsp;'."\n";
- 		'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
+ 	my $ntstu ='<select name="NTSTU">'.
- 		$total.','.scalar(@partlist).');" TARGET=_self> &nbsp;'."\n";
+ 	    '<option>1</option><option>2</option>'.
- 	    my $ntstu ='<select name="NTSTU">'.
+ 	    '<option>3</option><option>5</option>'.
- 		'<option>1</option><option>2</option>'.
+ 	    '<option>7</option><option>10</option></select>'."\n";
- 		'<option>3</option><option>5</option>'.
+ 	my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
- 		'<option>7</option><option>10</option></select>'."\n";
+ 	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
- 	    my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+ 	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
- 	    $ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
+ 	$endform.='<input type="button" value="Previous" '.
- 	    $endform.=$ntstu.'student(s) &nbsp;&nbsp;';
+ 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;'."\n".
- 	} else {
+ 	    '<input type="button" value="Next" '.
- 	    $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
+ 	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;';
- 	}
+ 	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
- 	$endform.='<input type="button" value="Next" '.
- 	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;'."\n".
- 	    '<input type="button" value="Previous" '.
- 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;';
- 	$endform.='(Next and Previous do not save the scores.)'."\n"
- 	    if ($ENV{'form.handgrade'} eq 'yes');
  	$endform.='</td><tr></table></form>';
  	$endform.=&show_grading_menu_form($symb,$url);
  	$request->print($endform);
- Line 1314  KEYWORDS
+ Line 1785  KEYWORDS
  #--- Retrieve the last submission for all the parts
  sub get_last_submission {
-     my (%returnhash)=@_;
+     my ($returnhash)=@_;
      my (@string,$timestamp);
-     if ($returnhash{'version'}) {
+     if ($$returnhash{'version'}) {
  	my %lasthash=();
  	my ($version);
- 	for ($version=1;$version<=$returnhash{'version'};$version++) {
+ 	for ($version=1;$version<=$$returnhash{'version'};$version++) {
- 	    foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+ 	    foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {
- 		$lasthash{$_}=$returnhash{$version.':'.$_};
+ 		$lasthash{$_}=$$returnhash{$version.':'.$_};
- 		   $timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
+ 		   $timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));
  	    }
  	}
  	foreach ((keys %lasthash)) {
- Line 1334  sub get_last_submission {
+ Line 1805  sub get_last_submission {
  	    }
  	}
      }
-     @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+     @string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;
      return \@string,\$timestamp;
  }
- Line 1346  sub keywords_highlight {
+ Line 1817  sub keywords_highlight {
      (my $styleoff = $styleon) =~ s/\</\<\//;
      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;
      }
-     # This is not really the right place to do this, but I cannot find a
-     # better one at this time.  So here we go - the m in the s:::mg causes
-     # ^ to match the beginning of a new line.  So we replace(???) the beginning
-     # of the line with <br /> to make things formatted a little better.
-     $string =~ s:^:<br />:mg;
      return $string;
  }
- Line 1364  sub processHandGrade {
+ Line 1830  sub processHandGrade {
      my $button = $ENV{'form.gradeOpt'};
      my $ngrade = $ENV{'form.NCT'};
      my $ntstu  = $ENV{'form.NTSTU'};
      if ($button eq 'Save & Next') {
  	my $ctr = 0;
  	while ($ctr < $ngrade) {
- Line 1374  sub processHandGrade {
+ Line 1839  sub processHandGrade {
  		$ctr++;
  		next;
  	    }
+ 	    if ($errorflag eq 'not_allowed') {
+ 		$request->print("<font color=\"red\">Not allowed to modify grades for $uname:$udom</font>");
+ 		$ctr++;
+ 		next;
+ 	    }
  	    my $includemsg = $ENV{'form.includemsg'.$ctr};
  	    my ($subject,$message,$msgstatus) = ('','','');
  	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
- Line 1391  sub processHandGrade {
+ Line 1861  sub processHandGrade {
  							       $ENV{'form.msgsub'},$message);
  	    }
  	    if ($ENV{'form.collaborator'.$ctr}) {
- 		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
+ 		my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
- 		foreach (@collaborators) {
+ 		foreach my $collabstr (@collabstrs) {
- 		    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
+ 		    my ($part,@collaborators) = split(/:/,$collabstr);
- 				   $ENV{'form.unamedom'.$ctr});
+ 		    foreach (@collaborators) {
- 		    if ($message ne '') {
+ 			my ($errorflag,$pts,$wgt) =
- 			$msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
+ 			    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
- 								       $ENV{'form.msgsub'},
+ 					   $ENV{'form.unamedom'.$ctr},$part);
- 								       $message);
+ 			if ($errorflag eq 'not_allowed') {
+ 			    $request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+ 			    next;
+ 			} else {
+ 			    if ($message ne '') {
+ 				$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$ENV{'form.msgsub'},$message);
+ 			    }
+ 			}
  		    }
  		}
  	    }
- Line 1406  sub processHandGrade {
+ Line 1884  sub processHandGrade {
  	}
      }
-     # Keywords sorted in alphabatical order
+     if ($ENV{'form.handgrade'} eq 'yes') {
-     my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ 	# Keywords sorted in alphabatical order
-     my %keyhash = ();
+ 	my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
-     $ENV{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
+ 	my %keyhash = ();
-     $ENV{'form.keywords'}           =~ s/^\s+|\s+$//;
+ 	$ENV{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
-     my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
+ 	$ENV{'form.keywords'}           =~ s/^\s+|\s+$//;
-     $ENV{'form.keywords'} = join(' ',@keywords);
+ 	my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
-     $keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
+ 	$ENV{'form.keywords'} = join(' ',@keywords);
-     $keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
+ 	$keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
-     $keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
+ 	$keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
-     $keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
+ 	$keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
-     $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+ 	$keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
+ 	$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.
+ 	# message center - Order of message gets changed. Blank line is eliminated.
-     # All messages are saved in nohist_handgrade.db
+ 	# New messages are saved in ENV for the next student.
-     my ($ctr,$idx) = (1,1);
+ 	# All messages are saved in nohist_handgrade.db
-     while ($ctr <= $ENV{'form.savemsgN'}) {
+ 	my ($ctr,$idx) = (1,1);
- 	if ($ENV{'form.savemsg'.$ctr} ne '') {
+ 	while ($ctr <= $ENV{'form.savemsgN'}) {
- 	    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+ 	    if ($ENV{'form.savemsg'.$ctr} ne '') {
- 	    $idx++;
+ 		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+ 		$idx++;
+ 	    }
+ 	    $ctr++;
  	}
- 	$ctr++;
+ 	$ctr = 0;
-     }
+ 	while ($ctr < $ngrade) {
-     $ctr = 0;
+ 	    if ($ENV{'form.newmsg'.$ctr} ne '') {
-     while ($ctr < $ngrade) {
+ 		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- 	if ($ENV{'form.newmsg'.$ctr} ne '') {
+ 		$ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- 	    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ 		$idx++;
- 	    $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ 	    }
- 	    $idx++;
+ 	    $ctr++;
  	}
- 	$ctr++;
+ 	$ENV{'form.savemsgN'} = --$idx;
+ 	$keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+ 	my $putresult = &Apache::lonnet::put
+ 	    ('nohist_handgrade',\%keyhash,
+ 	     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 	     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
      }
-     $ENV{'form.savemsgN'} = --$idx;
-     $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
-     my $putresult = &Apache::lonnet::put
- 	('nohist_handgrade',\%keyhash,
- 	 $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');
      if ($ENV{'form.refresh'} eq 'on') {
- 	my $ctr = 0;
+ 	my ($ctr,$total) = (0,0);
- 	$ENV{'form.NTSTU'}=$ngrade;
  	while ($ctr < $ngrade) {
- 	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$ENV{'form.unamedom'.$ctr});
+ 	    $total++ if  $ENV{'form.unamedom'.$ctr} ne '';
- 	    &submission($request,$ctr,$ngrade-1);
  	    $ctr++;
  	}
+ 	$ENV{'form.NTSTU'}=$ngrade;
+ 	$ctr = 0;
+ 	while ($ctr < $total) {
+ 	    my $processUser = $ENV{'form.unamedom'.$ctr};
+ 	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+ 	    $ENV{'form.fullname'} = $$fullname{$processUser};
+ 	    &submission($request,$ctr,$total-1);
+ 	    $ctr++;
+ 	}
+ 	return '';
+     }
+ # 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);
+ 	my $processUser = $ENV{'form.unamedom'.$ENV{'form.studentNo'}};
+ 	($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$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 $laststu = $ENV{'form.unamedom'.($ngrade-1)};
-     $ctr = 2;
+     my $ctr = 2;
      while ($laststu eq '') {
  	$laststu  = $ENV{'form.unamedom'.($ngrade-$ctr)};
  	$ctr++;
  	$laststu = $firststu if ($ctr > $ngrade);
      }
-     my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
      my (@parsedlist,@nextlist);
      my ($nextflg) = 0;
      foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
- Line 1482  sub processHandGrade {
+ Line 1978  sub processHandGrade {
  	}
      }
      $ctr = 0;
-     my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
      @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') {
+ 	if ($submitonly =~ /^(yes|graded|incorrect)$/) {
- 	    my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ;
+ #	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
- 	    my $statusflg = '';
+ 	    my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+ 	    my $submitted = 0;
+ 	    my $graded = 1;
  	    foreach (keys(%status)) {
- 		$statusflg = 1 if ($status{$_} ne 'nothing');
+ 		$submitted = 1 if ($status{$_} ne 'nothing');
- 		my ($foo,$partid,$foo1) = split(/\./);
+ 		$graded = 0 if ($status{$_} =~ /^correct/);
- 		$statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
+ 		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 (!$graded && ($submitonly eq 'graded' ||
+ 				  $submitonly eq 'incorrect'));
  	}
  	push @nextlist,$student if ($ctr < $ntstu);
+ 	last if ($ctr == $ntstu);
  	$ctr++;
      }
- Line 1523  sub processHandGrade {
+ Line 2030  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 $usec = &Apache::lonnet::getsection($domain,$stuname,
+ 					   $ENV{'request.course.id'});
+     if (!&canmodify($usec)) { return('not_allowed'); }
      my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
      my %newrecord  = ();
      my ($pts,$wgt) = ('','');
      foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
- 	if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
+ 	#collaborator may vary for different parts
+ 	if ($submitter && $_ ne $part) { next; }
+ 	my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+ 	if ($dropMenu eq 'excused') {
  	    if ($record{'resource.'.$_.'.solved'} ne 'excused') {
  		$newrecord{'resource.'.$_.'.solved'} = 'excused';
  		if (exists($record{'resource.'.$_.'.awarded'})) {
  		    $newrecord{'resource.'.$_.'.awarded'} = '';
  		}
+ 	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
  	    }
- 	} else {
+ 	} elsif ($dropMenu eq 'reset status'
+ 		 && exists($record{'resource.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
+ 	    foreach my $key (keys (%record)) {
+ 		if ($key=~/^resource\.\Q$_\E\./) { $newrecord{$key} = ''; }
+ 	    }
+ 	    $newrecord{'resource.'.$_.'.regrader'}=
+ 		"$ENV{'user.name'}:$ENV{'user.domain'}";
+ 	} elsif ($dropMenu eq '') {
  	    $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
  		    $ENV{'form.GD_BOX'.$newflg.'_'.$_} :
  		    $ENV{'form.RADVAL'.$newflg.'_'.$_});
- 	    return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '');
+ 	    if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '') {
+ 		next;
+ 	    }
  	    $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
  		$ENV{'form.WGT'.$newflg.'_'.$_};
  	    my $partial= $pts/$wgt;
- 	    $newrecord{'resource.'.$_.'.awarded'}  = $partial
+ 	    if ($partial eq $record{'resource.'.$_.'.awarded'}) {
- 		if ($record{'resource.'.$_.'.awarded'} ne $partial);
+ 		#do not update score for part if not changed.
+ 		next;
+ 	    }
+ 	    if ($record{'resource.'.$_.'.awarded'} ne $partial) {
+ 		$newrecord{'resource.'.$_.'.awarded'}  = $partial;
+ 	    }
  	    my $reckey = 'resource.'.$_.'.solved';
  	    if ($partial == 0) {
- 		$newrecord{$reckey} = 'incorrect_by_override'
+ 		if ($record{$reckey} ne 'incorrect_by_override') {
- 		    if ($record{$reckey} ne 'incorrect_by_override');
+ 		    $newrecord{$reckey} = 'incorrect_by_override';
+ 		}
  	    } else {
- 		$newrecord{$reckey} = 'correct_by_override'
+ 		if ($record{$reckey} ne 'correct_by_override') {
- 		    if ($record{$reckey} ne 'correct_by_override');
+ 		    $newrecord{$reckey} = 'correct_by_override';
+ 		}
+ 	    }
+ 	    if ($submitter &&
+ 		($record{'resource.'.$_.'.submitted_by'} ne $submitter)) {
+ 		$newrecord{'resource.'.$_.'.submitted_by'} = $submitter;
  	    }
- 	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter
+ 	    $newrecord{'resource.'.$_.'.regrader'}=
- 		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
+ 		"$ENV{'user.name'}:$ENV{'user.domain'}";
- 	    $newrecord{'resource.'.$_.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
  	}
      }
      if (scalar(keys(%newrecord)) > 0) {
  	&Apache::lonnet::cstore(\%newrecord,$symb,
  				$ENV{'request.course.id'},$domain,$stuname);
- Line 1577  sub viewgrades_js {
+ Line 2109  sub viewgrades_js {
      $request->print(<<VIEWJAVASCRIPT);
  <script type="text/javascript" language="javascript">
     function writePoint(partid,weight,point) {
- 	var radioButton = eval("document.classgrade.RADVAL_"+partid);
+ 	var radioButton = document.classgrade["RADVAL_"+partid];
- 	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ 	var textbox = document.classgrade["TEXTVAL_"+partid];
  	if (point == "textval") {
- 	    var point = eval("document.classgrade.TEXTVAL_"+partid+".value");
+ 	    point = document.classgrade["TEXTVAL_"+partid].value;
- 	    if (isNaN(point) || point < 0) {
+ 	    if (isNaN(point) || parseFloat(point) < 0) {
- 		alert("A number equal or greater than 0 is expected. Entered value = "+point);
+ 		alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
  		var resetbox = false;
  		for (var i=0; i<radioButton.length; i++) {
  		    if (radioButton[i].checked) {
- Line 1595  sub viewgrades_js {
+ Line 2127  sub viewgrades_js {
  		}
  		return;
  	    }
- 	    if (point > weight) {
+ 	    if (parseFloat(point) > parseFloat(weight)) {
- 		var resp = confirm("You entered a value ("+point+
+ 		var resp = confirm("You entered a value ("+parseFloat(point)+
  				   ") greater than the weight for the part. Accept?");
  		if (resp == false) {
  		    textbox.value = "";
- Line 1605  sub viewgrades_js {
+ Line 2137  sub viewgrades_js {
  	    }
  	    for (var i=0; i<radioButton.length; i++) {
  		radioButton[i].checked=false;
- 		if (point == i) {
+ 		if (parseFloat(point) == i) {
  		    radioButton[i].checked=true;
  		}
  	    }
  	} else {
- 	    textbox.value = point;
+ 	    textbox.value = parseFloat(point);
  	}
  	for (i=0;i<document.classgrade.total.value;i++) {
- 	    var user = eval("document.classgrade.ctr"+i+".value");
+ 	    var user = document.classgrade["ctr"+i].value;
- 	    var scorename = eval("document.classgrade.GD_"+user+
+ 	    var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
- 				 "_"+partid+"_awarded");
+ 	    var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
- 	    var saveval   = eval("document.classgrade.GD_"+user+
+ 	    var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- 				 "_"+partid+"_solved_s.value");
- 	    var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
  	    if (saveval != "correct") {
  		scorename.value = point;
  		if (selname[0].selected != true) {
- Line 1627  sub viewgrades_js {
+ Line 2157  sub viewgrades_js {
  		}
  	    }
  	}
- 	var selval   = eval("document.classgrade.SELVAL_"+partid);
+ 	document.classgrade["SELVAL_"+partid][0].selected = true;
- 	selval[0].selected = true;
      }
      function writeRadText(partid,weight) {
- 	var selval   = eval("document.classgrade.SELVAL_"+partid);
+ 	var selval   = document.classgrade["SELVAL_"+partid];
- 	var radioButton = eval("document.classgrade.RADVAL_"+partid);
+ 	var radioButton = document.classgrade["RADVAL_"+partid];
- 	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ 	var textbox = document.classgrade["TEXTVAL_"+partid];
- 	if (selval[1].selected) {
+ 	if (selval[1].selected || selval[2].selected) {
  	    for (var i=0; i<radioButton.length; i++) {
  		radioButton[i].checked=false;
- Line 1643  sub viewgrades_js {
+ Line 2172  sub viewgrades_js {
  	    textbox.value = "";
  	    for (i=0;i<document.classgrade.total.value;i++) {
- 		var user = eval("document.classgrade.ctr"+i+".value");
+ 		var user = document.classgrade["ctr"+i].value;
- 		var scorename = eval("document.classgrade.GD_"+user+
+ 		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
- 				     "_"+partid+"_awarded");
+ 		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
- 		var saveval   = eval("document.classgrade.GD_"+user+
+ 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- 				     "_"+partid+"_solved_s.value");
- 		var selname   = eval("document.classgrade.GD_"+user+
- 				     "_"+partid+"_solved");
  		if (saveval != "correct") {
  		    scorename.value = "";
- 		    selname[1].selected = true;
+ 		    if (selval[1].selected) {
+ 			selname[1].selected = true;
+ 		    } else {
+ 			selname[2].selected = true;
+ 			if (Number(document.classgrade["GD_"+user+"_"+partid+"_tries"].value))
+ 			{document.classgrade["GD_"+user+"_"+partid+"_tries"].value = '0';}
+ 		    }
  		}
  	    }
  	} else {
  	    for (i=0;i<document.classgrade.total.value;i++) {
- 		var user = eval("document.classgrade.ctr"+i+".value");
+ 		var user = document.classgrade["ctr"+i].value;
- 		var scorename = eval("document.classgrade.GD_"+user+
+ 		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
- 				     "_"+partid+"_awarded");
+ 		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
- 		var saveval   = eval("document.classgrade.GD_"+user+
+ 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- 				     "_"+partid+"_solved_s.value");
- 		var selname   = eval("document.classgrade.GD_"+user+
- 				     "_"+partid+"_solved");
  		if (saveval != "correct") {
- 		    scorename.value = eval("document.classgrade.GD_"+user+
+ 		    scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
- 				     "_"+partid+"_awarded_s.value");;
  		    selname[0].selected = true;
  		}
  	    }
- Line 1674  sub viewgrades_js {
+ Line 2202  sub viewgrades_js {
      }
      function changeSelect(partid,user) {
- 	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
+ 	var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
- 	var textbox = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+ 	var textbox = document.classgrade["GD_"+user+'_'+partid+"_awarded"];
  	var point  = textbox.value;
- 	var weight = eval("document.classgrade.weight_"+partid+".value");
+ 	var weight = document.classgrade["weight_"+partid].value;
- 	if (isNaN(point) || point < 0) {
+ 	if (isNaN(point) || parseFloat(point) < 0) {
- 	    alert("A number equal or greater than 0 is expected. Entered value = "+point);
+ 	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
  	    textbox.value = "";
  	    return;
  	}
- 	if (point > weight) {
+ 	if (parseFloat(point) > parseFloat(weight)) {
- 	    var resp = confirm("You entered a value ("+point+
+ 	    var resp = confirm("You entered a value ("+parseFloat(point)+
  			       ") greater than the weight of the part. Accept?");
  	    if (resp == false) {
  		textbox.value = "";
- Line 1696  sub viewgrades_js {
+ Line 2224  sub viewgrades_js {
      }
      function changeOneScore(partid,user) {
- 	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
+ 	var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
- 	if (selval[1].selected) {
+ 	if (selval[1].selected || selval[2].selected) {
- 	    var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+ 	    document.classgrade["GD_"+user+'_'+partid+"_awarded"].value = "";
- 	    boxval.value = "";
+ 	    if (selval[2].selected) {
+ 		document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
+ 	    }
  	}
      }
      function resetEntry(numpart) {
  	for (ctpart=0;ctpart<numpart;ctpart++) {
- 	    var partid = eval("document.classgrade.partid_"+ctpart+".value");
+ 	    var partid = document.classgrade["partid_"+ctpart].value;
- 	    var radioButton = eval("document.classgrade.RADVAL_"+partid);
+ 	    var radioButton = document.classgrade["RADVAL_"+partid];
- 	    var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ 	    var textbox = document.classgrade["TEXTVAL_"+partid];
- 	    var selval  = eval("document.classgrade.SELVAL_"+partid);
+ 	    var selval  = document.classgrade["SELVAL_"+partid];
  	    for (var i=0; i<radioButton.length; i++) {
  		radioButton[i].checked=false;
- Line 1717  sub viewgrades_js {
+ Line 2247  sub viewgrades_js {
  	    selval[0].selected = true;
  	    for (i=0;i<document.classgrade.total.value;i++) {
- 		var user = eval("document.classgrade.ctr"+i+".value");
+ 		var user = document.classgrade["ctr"+i].value;
- 		var resetscore = eval("document.classgrade.GD_"+user+
+ 		var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
- 				      "_"+partid+"_awarded");
+ 		resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
- 		resetscore.value = eval("document.classgrade.GD_"+user+
+ 		var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
- 					"_"+partid+"_awarded_s.value");
+ 		resettries.value = document.classgrade["GD_"+user+"_"+partid+"_tries_s"].value;
+ 		var saveselval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
- 		var saveselval   = eval("document.classgrade.GD_"+user+
+ 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
- 				     "_"+partid+"_solved_s.value");
- 		var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
  		if (saveselval == "excused") {
  		    if (selname[1].selected == false) { selname[1].selected = true;}
  		} else {
- Line 1746  sub viewgrades {
+ Line 2273  sub viewgrades {
      &viewgrades_js($request);
      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>Problem: </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 1760  sub viewgrades {
+ Line 2293  sub viewgrades {
  	'<input type="hidden" name="command" value="editgrades" />'."\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="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
  	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
-     $result.='<h3>Assign Common Grade To ';
+     my $sectionClass;
      if ($ENV{'form.section'} eq 'all') {
- 	$result.='Class </h3>';
+ 	$sectionClass='Class </h3>';
      } elsif ($ENV{'form.section'} eq 'no') {
- 	$result.='Students in no Section </h3>';
+ 	$sectionClass='Students in no Section </h3>';
      } else {
- 	$result.='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".
  	'<table border=0><tr bgcolor="#ffffdd"><td>';
      #radio buttons/text box for assigning points for a section or class.
      #handles different parts of a problem
-     my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+     my ($partlist,$handgrade) = &response_type($url,$symb);
      my %weight = ();
      my $ctsparts = 0;
      $result.='<table border="0">';
- Line 1783  sub viewgrades {
+ Line 2318  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 1810  sub viewgrades {
+ Line 2345  sub viewgrades {
  	    'onChange="javascript:writeRadText(\''.$partid.'\','.
  		$weight{$partid}.')"> '.
  	    '<option selected="on"> </option>'.
- 	    '<option>excused</option></select></td></tr>'."\n";
+ 	    '<option>excused</option>'.
+ 	    '<option>reset status</option></select></td></tr>'."\n";
  	$ctsparts++;
      }
      $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
  	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
      $result.='<input type="button" value="Reset" '.
- 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self> &nbsp; &nbsp;';
+ 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
-     $result.='<input type="button" value="Submit Changes" '.
- 	'onClick="javascript:submit();" TARGET=_self />'."\n";
      #table listing all the students in a section/class
      #header of table
-     $result.= '<h3>Assign Grade to Specific Students in ';
+     $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
-     if ($ENV{'form.section'} eq 'all') {
- 	$result.='the Class </h3>';
-     } elsif ($ENV{'form.section'} eq 'no') {
- 	$result.='no Section </h3>';
-     } else {
- 	$result.='Section '.$ENV{'form.section'}.'</h3>';
-     }
      $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
- 	'<table border=0><tr bgcolor="#deffff">'.
+ 	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
- 	'<td><b>Fullname</b></td><td><b>Username</b></td><td><b>Domain</b></td>'."\n";
+ 	'<td>'.&nameUserString('header')."</td>\n";
-     my (@parts) = sort(&getpartlist($url));
+     my (@parts) = sort(&getpartlist($url,$symb));
      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'); }
  	if ($display =~ /^Partial Credit Factor/) {
  	    my ($partid) = &split_part_type($part);
- Line 1853  sub viewgrades {
+ Line 2381  sub viewgrades {
      my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
      my $ctr = 0;
      foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
- 	my ($uname,$udom) = split(/:/);
+ 	my $uname = $_;
+ 	$uname=~s/:/_/;
  	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
- 	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
- 				   $_,$$fullname{$_},\@parts,\%weight);
  	$ctr++;
+ 	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+ 				   $_,$$fullname{$_},\@parts,\%weight,$ctr);
      }
      $result.='</table></td></tr></table>';
      $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-     $result.='<input type="button" value="Submit Changes" '.
+     $result.='<input type="button" value="Save" '.
  	'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'}.
+ 	    '" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
+     }
      $result.=&show_grading_menu_form($symb,$url);
      return $result;
  }
  #--- call by previous routine to display each student
  sub viewstudentgrade {
-     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
+     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
      my ($uname,$udom) = split(/:/,$student);
+     $student=~s/:/_/;
      my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
-     my $result='<tr bgcolor="#ffffdd"><td>'.
+     my $result='<tr bgcolor="#ffffdd"><td align="right">'.$ctr.'&nbsp;</td><td>&nbsp;'.
  	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
- 	'\')"; TARGET=_self>'.$fullname.'</a>'.
+ 	'\')"; TARGET=_self>'.$fullname.'</a> '.
- 	'</td><td>'.$uname.'</td><td align="middle">'.$udom.'</td>'."\n";
+ 	'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
      foreach my $apart (@$parts) {
  	my ($part,$type) = &split_part_type($apart);
  	my $score=$record{"resource.$part.$type"};
  	if ($type eq 'awarded') {
  	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
  	    $result.='<input type="hidden" name="'.
- 		'GD_'.$uname.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
+ 		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
  	    $result.='<td align="middle"><input type="text" name="'.
- 		'GD_'.$uname.'_'.$part.'_awarded" '.
+ 		'GD_'.$student.'_'.$part.'_awarded" '.
- 		'onChange="javascript:changeSelect(\''.$part.'\',\''.$uname.
+ 		'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
  		'\')" value="'.$pts.'" size="4" /></td>'."\n";
  	} elsif ($type eq 'solved') {
  	    my ($status,$foo)=split(/_/,$score,2);
  	    $status = 'nothing' if ($status eq '');
- 	    $result.='<input type="hidden" name="'.'GD_'.$uname.'_'.
+ 	    $result.='<input type="hidden" name="'.'GD_'.$student.'_'.
  		$part.'_solved_s" value="'.$status.'" />'."\n";
- 	    $result.='<td align="middle"><select name="'.
+ 	    $result.='<td align="middle">&nbsp;<select name="'.
- 		'GD_'.$uname.'_'.$part.'_solved" '.
+ 		'GD_'.$student.'_'.$part.'_solved" '.
- 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$uname.'\')" >'."\n";
+ 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
- 	    my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
+ 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>'
- 	    $optsel = '<option> </option><option selected="on">excused</option>'."\n"
+ 		: '<option selected="on"> </option><option>excused</option>')."\n";
- 		if ($status eq 'excused');
+ 	    $result.='<option>reset status</option>';
- 	    $result.=$optsel;
+ 	    $result.="</select>&nbsp;</td>\n";
- 	    $result.="</select></td>\n";
  	} else {
  	    $result.='<input type="hidden" name="'.
- 		'GD_'.$uname.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
+ 		'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
  		    "\n";
  	    $result.='<td align="middle"><input type="text" name="'.
- 		'GD_'.$uname.'_'.$part.'_'.$type.'" '.
+ 		'GD_'.$student.'_'.$part.'_'.$type.'" '.
  		'value="'.$score.'" size="4" /></td>'."\n";
  	}
      }
- Line 1921  sub editgrades {
+ Line 2455  sub editgrades {
      my $symb=$ENV{'form.symb'};
      my $url =$ENV{'form.url'};
      my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
-     $title.='<font size=+1><b>Problem: </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";
      my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
      $result.= '<table border="0"><tr bgcolor="#deffff">'.
- 	'<td rowspan=2><b>Username</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+ 	'<td rowspan=2 valign="center">&nbsp;<b>No.</b>&nbsp;</td>'.
+ 	'<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n";
      my %scoreptr = (
  		    'correct'  =>'correct_by_override',
- Line 1941  sub editgrades {
+ Line 2477  sub editgrades {
      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'}) {
  	my $partid = $ENV{'form.partid_'.$ctr};
- Line 1959  sub editgrades {
+ Line 2495  sub editgrades {
  	    if ($type eq 'awarded' || $type eq 'solved') { next; }
  	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
  	    $display =~ s/\[Part: (\w)+\]//;
- 	    $header .= '<td align="center">&nbsp;<b>Old</b> '.$display.'&nbsp;</td>'.
+ 	    $display =~ s/Number of Attempts/Tries/;
- 		'<td align="center">&nbsp;<b>New</b> '.$display.'&nbsp;</td>';
+ 	    $header .= '<td align="center">&nbsp;<b>Old '.$display.'</b>&nbsp;</td>'.
+ 		'<td align="center">&nbsp;<b>New '.$display.'</b>&nbsp;</td>';
  	    $columns{$partid}+=2;
  	}
      }
- Line 1973  sub editgrades {
+ Line 2510  sub editgrades {
      $result .= '</tr><tr bgcolor="#deffff">';
      $result .= $header;
      $result .= '</tr>'."\n";
+     my $noupdate;
+     my ($updateCtr,$noupdateCtr) = (1,1);
      for ($i=0; $i<$ENV{'form.total'}; $i++) {
+ 	my $line;
  	my $user = $ENV{'form.ctr'.$i};
+ 	my $usercolon = $user;
+ 	$usercolon =~s/_/:/;
+ 	my ($uname,$udom)=split(/_/,$user);
  	my %newrecord;
  	my $updateflag = 0;
- 	my @userdom = grep /^$user:/,keys %$classlist;
+ 	$line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';
- 	my (undef,$udom) = split(/:/,$userdom[0]);
+ 	my $usec=$classlist->{"$uname:$udom"}[5];
+ 	if (!&canmodify($usec)) {
- 	$result .= '<tr bgcolor="#ffffde"><td>'.$user.'&nbsp;</td><td>'.
+ 	    my $numcols=scalar(@partid)*4+2;
- 	    $$fullname{$userdom[0]}.'&nbsp;</td>';
+ 	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
+ 	    next;
+ 	}
  	foreach (@partid) {
  	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
  	    my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
- Line 2000  sub editgrades {
+ Line 2544  sub editgrades {
  	    } elsif ($partial == 0) {
  		$score = 'incorrect_by_override';
  	    }
- 	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
+ 	    my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
- 				   ($score ne 'excused'));
+ 	    $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
- 	    $result .= '<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)) {
+ 	    if ($dropMenu eq 'reset status' &&
+ 		$old_score ne '') { # ignore if no previous attempts => nothing to reset
+ 		$newrecord{'resource.'.$_.'.tries'} = 0;
+ 		$newrecord{'resource.'.$_.'.solved'} = '';
+ 		$newrecord{'resource.'.$_.'.award'} = '';
+ 		$newrecord{'resource.'.$_.'.awarded'} = 0;
+ 		$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ 		$updateflag = 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>';
  	    my $partid=$_;
  	    foreach my $stores (@parts) {
  		my ($part,$type) = &split_part_type($stores);
- Line 2022  sub editgrades {
+ Line 2576  sub editgrades {
  		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;
  		}
- 		$result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+ 		$line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
  		    '<td align="center">'.$awarded.'&nbsp;</td>';
  	    }
  	}
- 	$result .= '</tr>'."\n";
+ 	$line.='</tr>'."\n";
  	if ($updateflag) {
  	    $count++;
  	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
- 				    $udom,$user);
+ 				    $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 ($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 .= '</table></td></tr></table>'."\n".
  	&show_grading_menu_form ($symb,$url);
-     my $msg = '<b>Number of records updated = '.$rec_update.
+     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 />';
      return $title.$msg.$result;
- Line 2144  sub csvuploadmap_header {
+ Line 2708  sub csvuploadmap_header {
  	$javascript=&csvupload_javascript_forward_associate();
      }
-     my $result='<table border="0">';
+     my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
-     $result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>';
-     my ($partlist,$handgrade) = &response_type($url);
-     my ($resptype,$hdgrade)=('','no');
-     for (sort keys(%$handgrade)) {
- 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- 	$resptype = $responsetype;
- 	$hdgrade = $handgrade if ($handgrade eq 'yes');
- 	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
- 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-     }
-     $result.='</table>';
      $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 2184  to this page if the data selected is ins
+ Line 2737  to this page if the data selected is ins
  $javascript
  </script>
  ENDPICK
- return '';
+     return '';
  }
  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']);
      foreach my $part (sort(@parts)) {
  	my @datum;
- Line 2214  sub csvuploadmap_footer {
+ Line 2767  sub csvuploadmap_footer {
  ENDPICK
  }
+ sub upcsvScores_form {
+     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) {
+ 	if (formname.upfile.value == "") {
+ 	    alert("Please use the browse button to select a file from your local directory.");
+ 	    return false;
+ 	}
+ 	formname.submit();
+     }
+     </script>
+ CSVFORMJS
+     $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";
+     $result.='&nbsp;<b>Specify a file containing the class scores for current resource'.
+ 	'.</b></td></tr>'."\n";
+     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+     my $upfile_select=&Apache::loncommon::upfile_select_html();
+     $result.=<<ENDUPFORM;
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+ <input type="hidden" name="symb" value="$symb" />
+ <input type="hidden" name="url" value="$url" />
+ <input type="hidden" name="command" value="csvuploadmap" />
+ <input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />
+ <input type="hidden" name="saveState"  value="$ENV{'form.saveState'}" />
+ $upfile_select
+ <br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
+ </form>
+ ENDUPFORM
+     $result.='</td></tr></table>'."\n";
+     $result.='</td></tr></table><br /><br />'."\n";
+     $result.=&show_grading_menu_form($symb,$url);
+     return $result;
+ }
  sub csvuploadmap {
      my ($request)= @_;
      my ($symb,$url)=&get_symb_and_url($request);
- Line 2230  sub csvuploadmap {
+ Line 2826  sub csvuploadmap {
      &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') {
  	    &Apache::loncommon::csv_print_samples($request,\@records);
- Line 2273  sub csvuploadassign {
+ Line 2869  sub csvuploadassign {
      }
      $request->print('<h3>Assigning Grades</h3>');
      my $courseid=$ENV{'request.course.id'};
-     my ($classlist) = &getclasslist('all','1');
+     my ($classlist) = &getclasslist('all',0);
+     my @notallowed;
      my @skipped;
      my $countdone=0;
      foreach my $grade (@gradedata) {
  	my %entries=&Apache::loncommon::record_sep($grade);
  	my $username=$entries{$fields{'username'}};
+ 	$username=~s/\s//g;
  	my $domain=$entries{$fields{'domain'}};
+ 	$domain=~s/\s//g;
  	if (!exists($$classlist{"$username:$domain"})) {
  	    push(@skipped,"$username:$domain");
  	    next;
  	}
+ 	my $usec=$classlist->{"$username:$domain"}[5];
+ 	if (!&canmodify($usec)) {
+ 	    push(@notallowed,"$username:$domain");
+ 	    next;
+ 	}
  	my %grades;
  	foreach my $dest (keys(%fields)) {
  	    if ($dest eq 'username' || $dest eq 'domain') { next; }
- Line 2302  sub csvuploadassign {
+ Line 2906  sub csvuploadassign {
      }
      $request->print("<br />Stored $countdone students\n");
      if (@skipped) {
- 	$request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
+ 	$request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');
- 	foreach my $student (@skipped) { $request->print("<br />$student"); }
+ 	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
+     }
+     if (@notallowed) {
+ 	$request->print('<p><font size="+1" color="red"><b>Students Not Allowed to Modify</b></font></p>');
+ 	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
      }
-     $request->print(&view_edit_entire_class_form($symb,$url));
+     $request->print("<br />\n");
      $request->print(&show_grading_menu_form($symb,$url));
      return '';
  }
- Line 2313  sub csvuploadassign {
+ Line 2921  sub csvuploadassign {
  #
  #-------------------------------------------------------------------
  #
- #-------------- Next few routines handles grading by page/sequence
+ #-------------- Next few routines handle grading by page/sequence
  #
  #--- Select a page/sequence and a student to grade
  sub pickStudentPage {
- Line 2327  function checkPickOne(formname) {
+ Line 2935  function checkPickOne(formname) {
  	alert("Please select the student you wish to grade.");
  	return;
      }
-     var ptr = pullDownSelection(formname.selectpage);
+     ptr = pullDownSelection(formname.selectpage);
-     formname.page.value = eval("formname.page"+ptr+".value");
+     formname.page.value = formname["page"+ptr].value;
-     formname.title.value = eval("formname.title"+ptr+".value");
+     formname.title.value = formname["title"+ptr].value;
      formname.submit();
  }
- function radioSelection(radioButton) {
-     var selection=null;
-     if (radioButton.length > 1) {
- 	for (var i=0; i<radioButton.length; i++) {
- 	    if (radioButton[i].checked) {
- 		return radioButton[i].value;
- 	    }
- 	}
-     } else {
- 	if (radioButton.checked) return radioButton.value;
-     }
-     return selection;
- }
- function pullDownSelection(selectOne) {
-     var selection="";
-     if (selectOne.length > 1) {
- 	for (var i=0; i<selectOne.length; i++) {
- 	    if (selectOne[i].selected) {
- 		return selectOne[i].value;
- 	    }
- 	}
-     } else {
- 	if (selectOne.selected) return selectOne.value;
-     }
- }
  </script>
  LISTJAVASCRIPT
+     &commonJSfunctions($request);
      my ($symb,$url) = &get_symb_and_url($request);
      my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
      my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
- Line 2373  LISTJAVASCRIPT
+ Line 2955  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 2393  LISTJAVASCRIPT
+ Line 2977  LISTJAVASCRIPT
      $result.='<input type="hidden" name="page" />'."\n".
  	'<input type="hidden" name="title" />'."\n";
-     $result.='&nbsp;<b>View Problems: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+     $result.='&nbsp;<b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
  	'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
      $result.='&nbsp;<b>Submission Details: </b>'.
  	'<input type="radio" name="lastSub" value="none" /> none'."\n".
- 	'<input type="radio" name="lastSub" value="datesub" checked /> dates and submissions'."\n".
+ 	'<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".
  	'<input type="radio" name="lastSub" value="all" /> all details'."\n";
      $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\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";
      $result.='&nbsp;<input type="button" '.
- 	'onClick="javascript:checkPickOne(this.form);"value="Submit" /><br />'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
      $request->print($result);
-     my $studentTable.='&nbsp;<b>Select a student you wish to grade</b><br>'.
+     my $studentTable.='&nbsp;<b>Select a student you wish to grade and then click on the Next button.</b><br>'.
  	'<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">'.
- 	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td>'.
+ 	'<td align="right">&nbsp;<b>No.</b></td>'.
- 	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td>'.
+ 	'<td>'.&nameUserString('header').'</td>'.
- 	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td>'.
+ 	'<td align="right">&nbsp;<b>No.</b></td>'.
- 	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td></tr>';
+ 	'<td>'.&nameUserString('header').'</td></tr>';
      my (undef,undef,$fullname) = &getclasslist($getsec,'1');
      my $ptr = 1;
      foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
  	my ($uname,$udom) = split(/:/,$student);
- 	$studentTable.=($ptr%4 == 1 ? '<tr bgcolor="#ffffe6"><td>' : '</td><td>');
+ 	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
- 	$studentTable.='<input type="radio" name="student" value="'.$student.'" /> '.$$fullname{$student}.
+ 	$studentTable.='<td align="right">'.$ptr.'&nbsp;</td>';
- 	    '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font>'."\n";
+ 	$studentTable.='<td>&nbsp;<input type="radio" name="student" value="'.$student.'" /> '
- 	$studentTable.=($ptr%4 == 0 ? '</td></tr>' : '');
+ 	    .&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n";
+ 	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
  	$ptr++;
      }
-     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%4 == 2);
+     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%2 == 0);
-     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%4 == 3);
-     $studentTable.='</td><td>&nbsp;' if ($ptr%4 == 0);
      $studentTable.='</td></tr></table></td></tr></table>'."\n";
-     $studentTable.='<br />&nbsp;<input type="button" '.
+     $studentTable.='<input type="button" '.
- 	'onClick="javascript:checkPickOne(this.form);"value="Submit" /></form>'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
      $studentTable.=&show_grading_menu_form($symb,$url);
      $request->print($studentTable);
- Line 2445  LISTJAVASCRIPT
+ Line 3029  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',1, 1);
-     my $res = $navmap->firstResource(); # temp resource to access constants
-     $navmap->init();
-     # End navmap using boilerplate
-     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
-     my $depth = 1;
-     $iterator->next(); # ignore first BEGIN_MAP
-     my $curRes = $iterator->next();
      my %symbx = ();
      my @titles = ();
-     my $minder=0;
+     my $minder = 0;
-     while ($depth > 0) {
-         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
-         if ($curRes == $iterator->END_MAP()) { $depth--; }
-         if (ref($curRes) && $curRes->is_map()) {
- 	    my ($mapUrl, $id, $resUrl) = split(/___/, $curRes->symb()); # check map contains at least one problem
- 	    my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
- 	    my $mapiterator = $navmap->getIterator($map->map_start(),
- 						   $map->map_finish());
- 	    my $mapdepth = 1;
- 	    my $countProblems = 0;
- 	    $mapiterator->next(); # skip the first BEGIN_MAP
- 	    my $mapcurRes = $mapiterator->next(); # for "current resource"
- 	    my $ctr=0;
- 	    while ($mapdepth > 0 && $ctr < 100) {
- 		if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; }
- 		if($mapcurRes == $mapiterator->END_MAP) { $mapdepth++; }
- 		if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) {
+     # Gather every sequence that has problems.
- 		    $countProblems++;
+     my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
- 		}
+     for my $sequence ($navmap->getById('0.0'), @sequences) {
- 		$ctr++;
+ 	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
- 	    }
+ 	    my $title = $minder.'.'.$sequence->compTitle();
- 	    if ($countProblems > 0) {
+ 	    push @titles, $title; # minder in case two titles are identical
- 		my $title = $curRes->compTitle();
+ 	    $symbx{$title} = $sequence->symb();
- 		push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
+ 	    $minder++;
- 		$symbx{$minder.'.'.$title} = $curRes->symb();
+ 	}
- 		$minder++;
- 	    }
-        }
-         $curRes = $iterator->next();
      }
      $navmap->untieHashes();
- Line 2510  sub displayPage {
+ Line 3060  sub displayPage {
      my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
      my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
      my $pageTitle = $ENV{'form.page'};
-     my (undef,undef,$fullname) = &getclasslist($getsec,'1');
+     my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
      my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+     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(&show_grading_menu_form($symb,$url));
+ 	return;
+     }
      my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
-     $result.='<h3>&nbsp;Student: '.$$fullname{$ENV{'form.student'}}.
+     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
- 	'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
+ 	'</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
      my $iterator = $navmap->getIterator($map->map_start(),
- Line 2530  sub displayPage {
+ Line 3091  sub displayPage {
      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="student" value="'.$ENV{'form.student'}.'" />'."\n".
  	'<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".
  	'<input type="hidden" name="title"   value="'.$ENV{'form.title'}.'" />'."\n".
  	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
  	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="overRideScore" value="no" />'."\n".
  	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
      my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
  	'/check.gif" height="16" border="0" />';
-     $studentTable.='&nbsp;<b>Note:</b> A problem graded correct ('.$checkIcon.
+     $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
- 	') by the computer cannot be changed.'."\n".
+ 	' symbol.'."\n".
  	'<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">'.
- 	'<td align="center"><b>&nbsp;No&nbsp;</b></td>'.
+ 	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
- 	'<td><b>&nbsp;'.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem View').'/Grade</b></td></tr>';
+ 	'<td><b>&nbsp;'.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
-     my ($depth,$ctr,$question) = (1,0,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 && $ctr < 100) { # ctr, just in case it never gets out of loop
+     while ($depth > 0) {
          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
-         if($curRes == $iterator->END_MAP) { $depth++; }
+         if($curRes == $iterator->END_MAP) { $depth--; }
-         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+         if (ref($curRes) && $curRes->is_problem()) {
  	    my $parts = $curRes->parts();
- 	    $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
              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(
+ 		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$ENV{'request.course.id'});
- 									 $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>
- #		    $request->print('match='.$1.'<br>');
+ #		    $companswer =~ s/$1/ /ms;
- #		    $companswer =~ s/$1/ /s;
+ #		    $request->print('match='.$1."<br>\n");
  #		}
- #		$companswer =~ s/<table border=\"1\">/<table border=\"0\">/g;
+ #		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
  		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br>&nbsp;<b>Correct answer:</b><br>'.$companswer;
  	    }
- Line 2584  sub displayPage {
+ Line 3145  sub displayPage {
  		if ($record{'version'} eq '') {
  		    $studentTable.='<br />&nbsp;<font color="red">No recorded submission for this problem</font><br />';
  		} else {
- 		    $studentTable.='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
+ 		    my %responseType = ();
- 			'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
+ 		    foreach my $partid (@{$parts}) {
- 			'<td><b>Date/Time</b></td>'.
+ 			my @responseIds =$curRes->responseIds($partid);
- 			'<td><b>Submission</b></td>'.
+ 			my @responseType =$curRes->responseType($partid);
- 			'<td><b>Status&nbsp;</b></td></tr>';
+ 			my %responseIds;
- 		    my ($version);
+ 			for (my $i=0;$i<=$#responseIds;$i++) {
- 		    for ($version=1;$version<=$record{'version'};$version++) {
+ 			    $responseIds{$responseIds[$i]}=$responseType[$i];
- 			my $timestamp = scalar(localtime($record{$version.':timestamp'}));
- 			$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
- 			my @versionKeys = split(/\:/,$record{$version.':keys'});
- 			my @displaySub = ();
- 			foreach my $partid (@{$parts}) {
- 			    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
- 			    next if ($record{"$version:resource.$partid.solved"} eq '');
- #			    next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' &&
- #				     $record{"$version:resource.$partid.solved"} eq '');
- 			    $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ?
- 				'<b>Part&nbsp;'.$partid.'&nbsp;'.
- 				($record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
- 				'Trial&nbsp;'.$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
- 				$record{$version.':'.$matchKey[0]}.'<br />' : '';
- 			    $displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?
- 				'<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
- 				$record{"$version:resource.$partid.award"}.'/'.
- 				$record{"$version:resource.$partid.solved"}.'<br />' : '';
- 			    $displaySub[2].=(exists $record{"$version:resource.$partid.regrader"}) ?
- 				$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
  			}
- 			$displaySub[2].=(exists $record{"$version:resource.regrader"}) ?
+ 			$responseType{$partid} = \%responseIds;
- 			    $record{"$version:resource.regrader"} : '';
- 			$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1].
- 			    ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).'&nbsp;</td></tr>';
  		    }
- 		    $studentTable.='</table></td></tr></table>';
+ 		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
  		}
  	    } elsif ($ENV{'form.lastSub'} eq 'all') {
  		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
- Line 2626  sub displayPage {
+ Line 3165  sub displayPage {
  									'','.submission');
  	    }
+ 	    if (&canmodify($usec)) {
- 	    foreach my $partid (@{$parts}) {
+ 		foreach my $partid (@{$parts}) {
- 		$studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);
+ 		    $studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);
- 		$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
+ 		    $studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
- 		$question++;
+ 		    $question++;
+ 		}
+ 		$prob++;
  	    }
  	    $studentTable.='</td></tr>';
-        }
+ 	}
          $curRes = $iterator->next();
- 	$ctr++;
      }
+     $navmap->untieHashes();
      $studentTable.='</td></tr></table></td></tr></table>'."\n".
- 	'&nbsp;&nbsp;<input type="button" value="Save" '.
+ 	'<input type="button" value="Save" '.
  	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
  	'</form>'."\n";
      $studentTable.=&show_grading_menu_form($symb,$url);
- Line 2649  sub displayPage {
+ Line 3191  sub displayPage {
      return '';
  }
- sub temp_parts_fix { #remove sub once lonnavmap is fixed
+ sub displaySubByDates {
-     my $parts = shift;
+     my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
-     my %seen = ();
+     my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
-     my @correctParts = ();
+ 	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
-     foreach (@{$parts}) {
+ 	'<td><b>Date/Time</b></td>'.
- 	next if ($seen{$_} > 0);
+ 	'<td><b>Submission</b></td>'.
- 	$seen{$_}++;
+ 	'<td><b>Status&nbsp;</b></td></tr>';
- 	push @correctParts,$_;
+     my ($version);
+     my %mark;
+     my %orders;
+     $mark{'correct_by_student'} = $checkIcon;
+     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>';
+ 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
+ 	my @displaySub = ();
+ 	foreach my $partid (@{$parts}) {
+ 	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
+ #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
+ 	    foreach my $matchKey (@matchKey) {
+ 		if (exists($$record{$version.':'.$matchKey}) &&
+ 		    $$record{$version.':'.$matchKey} ne '') {
+ 		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+ 		    $displaySub[0].='<b>Part&nbsp;'.$partid.'&nbsp;';
+ 		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
+ 			$responseId.')</font>&nbsp;';
+ 		    if ($$record{"$version:resource.$partid.tries"} eq '') {
+ 			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
+ 		    } else {
+ 			$displaySub[0].='Trial&nbsp;'.
+ 			    $$record{"$version:resource.$partid.tries"};
+ 		    }
+ 		    my $responseType=$responseType->{$partid}->{$responseId};
+ 		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
+ 		    if (!exists($orders{$partid}->{$responseId})) {
+ 			$orders{$partid}->{$responseId}=
+ 			    &get_order($partid,$responseId,$symb,$uname,$udom);
+ 		    }
+ 		    $displaySub[0].='</b>&nbsp; '.
+ 			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';
+ 		}
+ 	    }
+ 	    if (exists $$record{"$version:resource.$partid.award"}) {
+ 		$displaySub[1].='<b>Part&nbsp;'.$partid.'</b> &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> '.$partid.')';
+ 	    }
+ 	}
+ 	# 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>';
      }
-     return \@correctParts;
+     $studentTable.='</table></td></tr></table>';
+     return $studentTable;
  }
  sub updateGradeByPage {
- Line 2668  sub updateGradeByPage {
+ Line 3269  sub updateGradeByPage {
      my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
      my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
      my $pageTitle = $ENV{'form.page'};
-     my (undef,undef,$fullname) = &getclasslist($getsec,'1');
+     my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
      my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+     my $usec=$classlist->{$ENV{'form.student'}}[5];
+     if (!&canmodify($usec)) {
+ 	$request->print('<font color="red">Unable to modify requested student.('.$ENV{'form.student'}.'</font>');
+ 	$request->print(&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}));
+ 	return;
+     }
      my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
-     $result.='<h3>&nbsp;Student: '.$$fullname{$ENV{'form.student'}}.
+     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
- 	'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
+ 	'</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
      my $iterator = $navmap->getIterator($map->map_start(),
- Line 2687  sub updateGradeByPage {
+ Line 3292  sub updateGradeByPage {
      my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
  	'<table border="0"><tr bgcolor="#e6ffff">'.
- 	'<td align="center"><b>&nbsp;No&nbsp;</b></td>'.
+ 	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
  	'<td><b>&nbsp;Title&nbsp;</b></td>'.
  	'<td><b>&nbsp;Previous Score&nbsp;</b></td>'.
  	'<td><b>&nbsp;New Score&nbsp;</b></td></tr>';
      $iterator->next(); # skip the first BEGIN_MAP
      my $curRes = $iterator->next(); # for "current resource"
-     my ($depth,$ctr,$question,$changeflag)= (1,0,1,0);
+     my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
-     while ($depth > 0 && $ctr < 100) { # ctr, just in case it never gets out of loop
+     while ($depth > 0) {
          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
-         if($curRes == $iterator->END_MAP) { $depth++; }
+         if($curRes == $iterator->END_MAP) { $depth--; }
          if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
  	    my $parts = $curRes->parts();
- 	    $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
              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>';
- Line 2720  sub updateGradeByPage {
+ Line 3324  sub updateGradeByPage {
  		my $score;
  		if ($partial > 0) {
  		    $score = 'correct_by_override';
- 		} elsif ($partial == 0) {
+ 		} elsif ($newpts ne '') { #empty is taken as 0
  		    $score = 'incorrect_by_override';
  		}
- 		if ($ENV{'form.GD_SEL'.$question.'_'.$partid} eq 'excused') {
+ 		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
+ 		    $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'}";
+ 		    $changeflag++;
+ 		    $newpts = '';
  		}
  		my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
  		$displayPts[0].='&nbsp;<b>Part</b> '.$partid.' = '.
  		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
  		    '&nbsp;<br>';
  		$displayPts[1].='&nbsp;<b>Part</b> '.$partid.' = '.
- 		    ($oldstatus eq 'correct_by_student' ? $oldpts :
+ 		     (($score eq 'excused') ? 'excused' : $newpts).
- 		     (($score eq 'excused') ? 'excused' : $newpts)).
  		    '&nbsp;<br>';
  		$question++;
- 		if (($oldstatus eq 'correct_by_student') ||
+ 		next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
- 		    ($newpts eq $oldpts && $score eq $oldstatus))
- 		{
- 		    next;
- 		}
  		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
- 		$newrecord{'resource.'.$partid.'.solved'}   = $score;
+ 		$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++;
  	    }
- Line 2752  sub updateGradeByPage {
+ Line 3364  sub updateGradeByPage {
  		&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
  					$udom,$uname);
  	    }
  	    $studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
  		'<td valign="top">'.$displayPts[1].'</td>'.
  		'</tr>';
+ 	    $prob++;
  	}
          $curRes = $iterator->next();
- 	$ctr++;
      }
+     $navmap->untieHashes();
      $studentTable.='</td></tr></table></td></tr></table>';
      $studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
      my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
- Line 2792  sub getSequenceDropDown {
+ Line 3407  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 2808  sub getSequenceDropDown {
+ Line 3423  sub getSequenceDropDown {
  sub scantron_uploads {
      if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
      my $result=	'<select name="scantron_selectfile">';
-     opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});
+     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-     my @files=sort(readdir(DIR));
+     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
+ 				    &Apache::loncommon::propath($cdom,$cname));
+     $result.="<option></option>";
      foreach my $filename (@files) {
- 	if ($filename eq '.' or $filename eq '..') { next; }
+ 	($filename)=split(/&/,$filename);
+ 	if ($filename!~/^scantron_orig_/) { next ; }
+ 	$filename=~s/^scantron_orig_//;
  	$result.="<option>$filename</option>\n";
      }
-     closedir(DIR);
      $result.="</select>";
      return $result;
  }
- Line 2822  sub scantron_uploads {
+ Line 3441  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 2832  sub scantron_scantab {
+ Line 3452  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 (@names) {
+ 	if ($name =~ /^error: 2 /) { next; }
+ 	$namechoice.='<option value="'.$name.'">'.$name.'</option>';
+     }
+     $namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';
+     return $namechoice;
+ }
+ sub scantron_CODEunique {
+     my $result='<nobr>
+                  <input type="radio" name="scantron_CODEunique"
+                         value="Yes" checked="on" /> Yes
+                 </nobr>
+                 <nobr>
+                  <input type="radio" name="scantron_CODEunique"
+                         value="No" /> No
+                 </nobr>';
+     return $result;
+ }
  sub scantron_selectphase {
      my ($r) = @_;
      my ($symb,$url)=&get_symb_and_url($r);
- Line 2841  sub scantron_selectphase {
+ Line 3486  sub scantron_selectphase {
      my $grading_menu_button=&show_grading_menu_form($symb,$url);
      my $file_selector=&scantron_uploads();
      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_process" />
-   $default_form_data
-   <table width="100%" border="0">
      <tr>
        <td bgcolor="#777777">
+        <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
+        <input type="hidden" name="command" value="scantron_validate" />
+         $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> Sequence to grade: </td><td> $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>
-                Sequence to grade: $sequence_selector
+                 <input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only skipped records <br />
+                 <input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove any exisiting corrections
  	    </td>
            </tr>
            <tr bgcolor="#ffffe6">
+             <td colspan="2">
+               <input type="submit" value="Validate Scantron Records" />
+             </td>
+           </tr>
+         </table>
+        </form>
+       </td>
+     </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>
- 		Filename of scoring office file: $file_selector
+               &nbsp;<b>Specify a Scantron data file to upload.</b>
- 	    </td>
+             </td>
            </tr>
            <tr bgcolor="#ffffe6">
              <td>
-               Format of data file: $format_selector
+ SCANTRONFORM
- 	    </td>
+     my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+     my $cdom= $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     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>
+       <td bgcolor="#777777">
+         <form action='/adm/grades' name='scantron_download'>
+           <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>
+                 Records to download
+               </td>
+               <td>
+                   <input type="radio" name="scantron_options" value="download_skipped"/> Skipped Records <br />
+                   <input type="radio" name="scantron_options" value="download_corrected"/> Corrected Records <br />
+                   <input checked="on" type="radio" name="scantron_options" value="dowload_orig"/> Original Records
+               </td>
+             </tr>
+             <tr bgcolor="#ffffe6">
+               <td colspan="2">
+                 <input type="submit" value="Validate Scantron Records" />
+               </td>
+             </tr>
+           </table>
+         </form>
+       </td>
+     </tr>
+ SCANTRONFORM
+     $r->print(<<SCANTRONFORM);
    </table>
-   <input type="submit" value="Submit" />
  </form>
  $grading_menu_button
  SCANTRONFORM
-     return $result;
+     return
  }
  sub get_scantron_config {
      my ($which) = @_;
      my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
      my %config;
+     #FIXME probably should move to XML it has already gotten a bit much now
      foreach my $line (<$fh>) {
  	my ($name,$descrip)=split(/:/,$line);
  	if ($name ne $which ) { next; }
- Line 2902  sub get_scantron_config {
+ Line 3652  sub get_scantron_config {
  	$config{'Qlength'}=$config[8];
  	$config{'Qoff'}=$config[9];
  	$config{'Qon'}=$config[10];
+ 	$config{'PaperID'}=$config[11];
+ 	$config{'PaperIDlength'}=$config[12];
+ 	$config{'FirstName'}=$config[13];
+ 	$config{'FirstNamelength'}=$config[14];
+ 	$config{'LastName'}=$config[15];
+ 	$config{'LastNamelength'}=$config[16];
  	last;
      }
      return %config;
- Line 2917  sub username_to_idmap {
+ Line 3673  sub username_to_idmap {
      return %idmap;
  }
+ sub scantron_fixup_scanline {
+     my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
+     if ($field eq 'ID') {
+ 	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
+ 	    return ($line,1,'New value too large');
+ 	}
+ 	if (length($args->{'newid'}) < $$scantron_config{'IDlength'}) {
+ 	    $args->{'newid'}=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
+ 				     $args->{'newid'});
+ 	}
+ 	substr($line,$$scantron_config{'IDstart'}-1,
+ 	       $$scantron_config{'IDlength'})=$args->{'newid'};
+ 	if ($args->{'newid'}=~/^\s*$/) {
+ 	    &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'};
+ 	my $on=$scantron_config->{'Qon'};
+ 	my $answer=${off}x$length;
+ 	if ($args->{'response'} eq 'none') {
+ 	    &scan_data($scan_data,
+ 		       "$whichline.no_bubble.".$args->{'question'},'1');
+ 	} else {
+ 	    substr($answer,$args->{'response'},1)=$on;
+ 	    &scan_data($scan_data,
+ 		       "$whichline.no_bubble.".$args->{'question'},undef,'1');
+ 	}
+ 	my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ 	substr($line,$where-1,$length)=$answer;
+     }
+     return $line;
+ }
+ sub scan_data {
+     my ($scan_data,$key,$value,$delete)=@_;
+     my $filename=$ENV{'form.scantron_selectfile'};
+     if (defined($value)) {
+ 	$scan_data->{$filename.'_'.$key} = $value;
+     }
+     if ($delete) { delete($scan_data->{$filename.'_'.$key}); }
+     return $scan_data->{$filename.'_'.$key};
+ }
  sub scantron_parse_scanline {
-     my ($line,$scantron_config)=@_;
+     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'} < 0) {
- 	    $record{'CODE'}=substr($data,$$scantron_config{'CODEstart'}-1,
+ 	    $record{'scantron.CODE'}=substr($data,
- 				   $$scantron_config{'CODElength'});
+ 					    $$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
  	}
      }
-     $record{'ID'}=substr($data,$$scantron_config{'IDstart'}-1,
+     $record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
- 			 $$scantron_config{'IDlength'});
+ 				  $$scantron_config{'IDlength'});
+     $record{'scantron.PaperID'}=
+ 	substr($data,$$scantron_config{'PaperID'}-1,
+ 	       $$scantron_config{'PaperIDlength'});
+     $record{'scantron.FirstName'}=
+ 	substr($data,$$scantron_config{'FirstName'}-1,
+ 	       $$scantron_config{'FirstNamelength'});
+     $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) {
  	$questnum++;
  	my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
  	substr($questions,0,$$scantron_config{'Qlength'})='';
- 	my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);
+ 	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
- 	if (scalar(@array) gt 2) {
+ 	my @array=split($$scantron_config{'Qon'},$currentquest,-1);
- 	    #FIXME do something intelligent with double bubbles
- 	    Apache->request->print("<br ><b>Wha!!!</b> ".scalar(@array).
- 				   '-'.$questions.'-'.$currentquest.'-'.$questnum.
- 				   '-'.length($questions).
- 				   '-'.$line.'-'.length($line).'-'.
- 				   '-'.$data.'-'.length($data).'-'.
- 				   '<br />');
- 	}
  	if (length($array[0]) eq $$scantron_config{'Qlength'}) {
- 	    $record{"$questnum.answer"}='';
+ 	    $record{"scantron.$questnum.answer"}='';
+ 	    if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ 		push(@{$record{"scantron.missingerror"}},$questnum);
+  	    }
  	} else {
- 	    $record{"$questnum.answer"}=$alphabet[length($array[0])];
+ 	    $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
  	}
+  	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);
+  	    }
+  	}
      }
-     $record{'maxquest'}=$questnum;
+     $record{'scantron.maxquest'}=$questnum;
-     $Apache::lonxml::debug=1;
+     return \%record;
-     &Apache::lonhomework::showhash(%record);
-     $Apache::lonxml::debug=0;
-     return %record;
  }
  sub scantron_add_delay {
+     my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
+     push(@$delayqueue,
+ 	 {'line' => $scanline, 'emsg' => $errormessage,
+ 	  'ecode' => $errorcode }
+ 	 );
  }
  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");
+     }
+     foreach my $id (keys(%$idmap)) {
+  	if (lc($id) eq lc($scanID)) {
+  	    return $$idmap{$id};
+  	}
+     }
+     return undef;
+ }
+ sub scantron_filter {
+     my ($curres)=@_;
+     if (ref($curres) && $curres->is_problem() && !$curres->randomout) {
+ 	return 1;
+     }
+     return 0;
+ }
+ sub scantron_process_corrections {
+     my ($r) = @_;
+     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 $line=&scantron_get_line($scanlines,$which);
+     my ($skip,$err,$errmsg);
+     if ($ENV{'form.scantron_skip_record'}) {
+ 	$skip=1;
+     } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
+ 	my $newstudent=$ENV{'form.scantron_username'}.':'.
+ 	    $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'},
+ 				    'domain'=>$ENV{'form.scantron_domain'}});
+     } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)CODE$/) {
+ 	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"}});
+ 	    if ($err) { last; }
+ 	}
+     }
+     if ($err) {
+ 	$r->print("Unable to accept last correction, an error occurred :$errmsg:");
+     } else {
+ 	&scantron_put_line($scanlines,$which,$line,$skip);
+ 	&scantron_putfile($scanlines,$scan_data);
+     }
+ }
+ sub scantron_validate_file {
+     my ($r) = @_;
+     my ($symb,$url)=&get_symb_and_url($r);
+     if (!$symb) {return '';}
+     my $default_form_data=&defaultFormData($symb,$url);
+     if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {
+ 	my $result=&scantron_remove('corrected');
+ 	if ($result ne 'ok' && $result ne 'not_found' ) {
+ 	    $r->print("An error occured ($result) when trying to Remove the existing corrections.");
+ 	}
+ 	$ENV{'form.scantron_options_ignore'}='done';
+     }
+     if ($ENV{'form.scantron_corrections'}) {
+ 	&scantron_process_corrections($r);
+     }
+     $r->print("<p>Gathering neccessary info.</p>");$r->rflush();
+     my $max_bubble=&scantron_get_maxbubble($r);
+     #get the student pick code ready
+     $r->print(&Apache::loncommon::studentbrowser_javascript());
+     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'}" />
+   $default_form_data
+ SCANTRONFORM
+     $r->print($result);
+     my @validate_phases=( 'ID',
+ 			  'CODE',
+ 			  'doublebubble',
+ 			  'missingbubbles');
+     if (!$ENV{'form.validatepass'}) {
+ 	$ENV{'form.validatepass'} = 0;
+     }
+     my $currentphase=$ENV{'form.validatepass'};
+     my $stop=0;
+     while (!$stop && $currentphase < scalar(@validate_phases)) {
+ 	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
+ 	$r->rflush();
+ 	my $which="scantron_validate_".$validate_phases[$currentphase];
+ 	{
+ 	    no strict 'refs';
+ 	    ($stop,$currentphase)=&$which($r,$currentphase);
+ 	}
+     }
+     if (!$stop) {
+ 	$r->print("Validation process complete.<br />");
+ 	$r->print('<input type="submit" name="submit" value="Start Grading" />');
+ 	$r->print('<input type="hidden" name="command" value="scantron_process" />');
+     } else {
+ 	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
+ 	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+     }
+     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 {
+     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') {
+ 	$file.='corrected_';
+     } else {
+ 	return 'refused';
+     }
+     $file.=$ENV{'form.scantron_selectfile'};
+     my $result=&Apache::lonnet::removeuserfile($cname,$cdom,$file);
+     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_/) {
+ 	    push(@todelete,$key);
+ 	}
+     }
+     if (@todelete) {
+ 	&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+     }
+     return $result;
+ }
+ sub scantron_getfile {
+     #FIXME really would prefer a scantron directory but tokenwrapper
+     # doesn't allow access to subdirs of userfiles
+     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     my $lines;
+     $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 		       'scantron_orig_'.$ENV{'form.scantron_selectfile'});
+     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'});
+     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'});
+     if ($lines eq '-1') {
+ 	$scanlines{'skipped'}=[];
+     } else {
+ 	$scanlines{'skipped'}=[(split("\n",$lines,-1))];
+     }
+     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);
+ }
+ sub lonnet_putfile {
+     my ($contents,$filename)=@_;
+     my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+     $ENV{'form.sillywaytopassafilearound'}=$contents;
+     &Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);
+ }
+ sub scantron_putfile {
+     my ($scanlines,$scan_data) = @_;
+     #FIXME really would prefer a scantron directory but tokenwrapper
+     # doesn't allow access to subdirs of userfiles
+     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     my $prefix='scantron_';
+ # no need to update orig, shouldn't change
+ #   &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
+ #		    $ENV{'form.scantron_selectfile'});
+     &lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
+ 		    $prefix.'corrected_'.
+ 		    $ENV{'form.scantron_selectfile'});
+     &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
+ 		    $prefix.'skipped_'.
+ 		    $ENV{'form.scantron_selectfile'});
+     &Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
+ }
+ sub scantron_get_line {
+     my ($scanlines,$i)=@_;
+     if ($scanlines->{'skipped'}[$i]) {return undef;}
+     if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
+     return $scanlines->{'orig'}[$i];
+ }
+ sub scantron_put_line {
+     my ($scanlines,$i,$newline,$skip)=@_;
+     if ($skip) {
+ 	$scanlines->{'skipped'}[$i]=$newline;
+ 	return;
+     }
+     $scanlines->{'corrected'}[$i]=$newline;
+ }
+ sub scantron_validate_ID {
+     my ($r,$currentphase) = @_;
+     #get student info
+     my $classlist=&Apache::loncoursedata::get_classlist();
+     my %idmap=&username_to_idmap($classlist);
+     #get scantron line setup
+     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);
+ 	if ($line=~/^[\s\cz]*$/) { next; }
+ 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ 						 $scan_data);
+ 	my $id=$$scan_record{'scantron.ID'};
+ 	my $found;
+ 	foreach my $checkid (keys(%idmap)) {
+ 	    if (lc($checkid) eq lc($id)) { $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,$currentphase);
+ 	    } elsif ($found{'usernames'}{$username}) {
+ 		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ 					 $line,'duplicateID',$username);
+ 		return(1,$currentphase);
+ 	    }
+ 	    #FIXME store away line we previously saw the ID on to use above
+ 	    $found{'ids'}{$found}++;
+ 	    $found{'usernames'}{$username}++;
+ 	} else {
+ 	    if ($id =~ /^\s*$/) {
+ 		my $username=&scan_data($scan_data,"$i.user");
+ 		if (defined($username) && $found{'usernames'}{$username}) {
+ 		    &scantron_get_correction($r,$i,$scan_record,
+ 					     \%scantron_config,
+ 					     $line,'duplicateID',$username);
+ 		    return(1,$currentphase);
+ 		} elsif (!defined($username)) {
+ 		    &scantron_get_correction($r,$i,$scan_record,
+ 					     \%scantron_config,
+ 					     $line,'incorrectID');
+ 		    return(1,$currentphase);
+ 		}
+ 		$found{'usernames'}{$username}++;
+ 	    } else {
+ 		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ 					 $line,'incorrectID');
+ 		return(1,$currentphase);
+ 	    }
+ 	}
+     }
+     return (0,$currentphase+1);
+ }
+ sub scantron_get_correction {
+     my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
+ #FIXME in the case of a duplicated ID the previous line, probaly need
+ #to show both the current line and the previous one and allow skipping
+ #the previous one or the current one
+     $r->print("<p><b>An error was detected ($error)</b>");
+     if ( defined($$scan_record{'scantron.PaperID'}) ) {
+ 	$r->print(" for PaperID <tt>".
+ 		  $$scan_record{'scantron.PaperID'}."</tt> \n");
+     } else {
+ 	$r->print(" in scanline $i <pre>".
+ 		  $line."</pre> \n");
+     }
+     $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 '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>The ID on the form is  <tt>".
+ 		  $$scan_record{'scantron.ID'}."</tt><br />\n");
+ 	$r->print("The name on the paper is ".
+ 		  $$scan_record{'scantron.LastName'}.",".
+ 		  $$scan_record{'scantron.FirstName'}."</p>");
+ 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("\n<ul><li> ");
+ 	#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'));
+ 	$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("<p>The ID on the form is  <tt>".
+ 		  $$scan_record{'scantron.ID'}."</tt><br />\n");
+ 	$r->print("The name on the paper is ".
+ 		  $$scan_record{'scantron.LastName'}.",".
+ 		  $$scan_record{'scantron.FirstName'}."</p>");
+ 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("\n<br /> ");
+ 	my $i=0;
+ 	if ($error eq 'incorrectCODE') {
+ 	    my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});
+ 	    foreach my $testcode (@{$closest}) {
+ 		my $checked='';
+ 		if (!$i) { $checked=' checked="on" '; }
+ 		$r->print("<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.<input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
+ 		$r->print("\n<br />");
+ 		$i++;
+ 	    }
+ 	}
+ 	my $checked; if (!$i) { $checked=' checked="on" '; }
+ 	$r->print("<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.");
+ 	$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("<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. 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("<input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use <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("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
+ 	$r->print('<input type="hidden" name="scantron_questions" value="'.
+ 		  join(',',@{$arg}).'" />');
+ 	$r->print("<p>Please indicate which bubble should be used for grading</p>");
+ 	foreach my $question (@{$arg}) {
+ 	    my $selected=$$scan_record{"scantron.$question.answer"};
+ 	    &scantron_bubble_selector($r,$scan_config,$question,split('',$selected));
+ 	}
+     } elsif ($error eq 'missingbubble') {
+ 	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ 	$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"};
+ 	    &scantron_bubble_selector($r,$scan_config,$question);
+ 	}
+     } else {
+ 	$r->print("\n<ul>");
+     }
+     $r->print("\n</li></ul>");
+ }
+ sub scantron_bubble_selector {
+     my ($r,$scan_config,$quest,@selected)=@_;
+     my $max=$$scan_config{'Qlength'};
+     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('<td align="center">');
+ 	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
+ 	else { $r->print('&nbsp;'); }
+ 	$r->print('</td>');
+     }
+     $r->print('<td></td></tr><tr>');
+     for (my $i=0;$i<$max;$i++) {
+ 	$r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
+ 		  '" value="'.$i.'" />'.$alphabet[$i]."</td>");
+     }
+     $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
+ 	      '" value="none" /> No bubble </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++; }
+     }
+     return $same;
+ }
+ 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=$ENV{'form.scantron_CODElist'};
+     my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
+     my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
+     return %allcodes;
+ }
+ sub scantron_validate_CODE {
+     my ($r,$currentphase) = @_;
+     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,$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 (!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'}
+ 	    && !$$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);
+ }
+ sub scantron_validate_doublebubble {
+     my ($r,$currentphase) = @_;
+     #get student info
+     my $classlist=&Apache::loncoursedata::get_classlist();
+     my %idmap=&username_to_idmap($classlist);
+     #get scantron line setup
+     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);
+ 	if ($line=~/^[\s\cz]*$/) { next; }
+ 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ 						 $scan_data);
+ 	if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
+ 	&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
+ 				 'doublebubble',
+ 				 $$scan_record{'scantron.doubleerror'});
+     	return (1,$currentphase);
+     }
+     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());
+     }
+     &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
+     my $classlist=&Apache::loncoursedata::get_classlist();
+     my %idmap=&username_to_idmap($classlist);
+     #get scantron line setup
+     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+     my ($scanlines,$scan_data)=&scantron_getfile();
+     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);
+ 	if ($line=~/^[\s\cz]*$/) { next; }
+ 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ 						 $scan_data);
+ 	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
+ 	my @to_correct;
+ 	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
+ 	    if ($missing > $max_bubble) { next; }
+ 	    push(@to_correct,$missing);
+ 	}
+ 	if (@to_correct) {
+ 	    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ 				     $line,'missingbubble',\@to_correct);
+ 	    return (1,$currentphase);
+ 	}
+     }
+     return (0,$currentphase+1);
  }
  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 $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
+     my ($scanlines,$scan_data)=&scantron_getfile();
      my $classlist=&Apache::loncoursedata::get_classlist();
      my %idmap=&username_to_idmap($classlist);
+     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 />");
      my $result= <<SCANTRONFORM;
  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
    <input type="hidden" name="command" value="scantron_configphase" />
- Line 2986  SCANTRONFORM
+ Line 4435  SCANTRONFORM
      $r->print($result);
      my @delayqueue;
+     my %completedstudents;
-     foreach my $line (<$scanlines>) {
- 	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
+     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
- 	my ($uname,$udom);
+  				    'Scantron Progress',$scanlines->{'count'},
- 	if ($uname=&scantron_find_student($scan_record,\%idmap)) {
+ 				    'inline',undef,'scantronupload');
- 	    &scantron_add_delay(\@delayqueue,$line,
+     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
- 				'Unable to find a student that matches');
+ 					  'Processing first student');
- 	}
+     my $start=&Time::HiRes::time();
- 	($uname,$udom)=split(/:/,$uname);
+     my $i=-1;
- 	#FIXME
+     my ($uname,$udom);
- 	#get iterator for $sequence
+     while ($i<$scanlines->{'count'}) {
- 	#foreach question 'submit' the students answer to the server
+  	($uname,$udom)=('','');
- 	#   through grade target {
+  	$i++;
- 	#   generate data to pass back that includes grade recevied
+  	my $line=&scantron_get_line($scanlines,$i);
- 	#}
+  	if ($line=~/^[\s\cz]*$/) { next; }
-     }
+  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
-     foreach my $delay (@delayqueue) {
+  						 $scan_data);
- 	#FIXME
+  	unless ($uname=&scantron_find_student($scan_record,$scan_data,
- 	#print out each delayed student with interface to select how
+  					      \%idmap,$i)) {
- 	#  to repair student provided info
+   	    &scantron_add_delay(\@delayqueue,$line,
- 	#Expected errors include
+  				'Unable to find a student that matches',1);
- 	#  1 bad/no stuid/username
+  	    next;
- 	#  2 invalid bubblings
+   	}
+  	if (exists $completedstudents{$uname}) {
+  	    &scantron_add_delay(\@delayqueue,$line,
+  				'Student '.$uname.' has multiple sheets',2);
+  	    next;
+  	}
+   	($uname,$udom)=split(/:/,$uname);
+   	&Apache::lonnet::delenv('form.counter');
+   	&Apache::lonnet::appenv(%$scan_record);
+ 	my $i=0;
+ 	foreach my $resource (@resources) {
+ 	    $i++;
+ 	    my %form=('submitted'     =>'scantron',
+ 		      'grade_target'  =>'grade',
+ 		      'grade_username'=>$uname,
+ 		      'grade_domain'  =>$udom,
+ 		      'grade_courseid'=>$ENV{'request.course.id'},
+ 		      'grade_symb'    =>$resource->symb());
+ 	    if (exists($scan_record->{'scantron.CODE'}) &&
+ 		$scan_record->{'scantron.CODE'}) {
+ 		$form{'CODE'}=$scan_record->{'scantron.CODE'};
+ 	    }
+ 	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
+ 	}
+ 	$completedstudents{$uname}={'line'=>$line};
+     } continue {
+ 	&Apache::lonnet::delenv('form.counter');
+ 	&Apache::lonnet::delenv('scantron\.');
+ 	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ 						 'last student');
+     }
+     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ #    my $lasttime = &Time::HiRes::time()-$start;
+ #    $r->print("<p>took $lasttime</p>");
+     $navmap->untieHashes();
+     $r->print("</form><p>Done</p>");
+     $r->print(&show_grading_menu_form($symb,$url));
+     return '';
+ }
+ sub scantron_upload_scantron_data {
+     my ($r)=@_;
+     $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
+     my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
+ 							  'domainid',
+ 							  '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) {
+ 	if (formname.upfile.value == "") {
+ 	    alert("Please use the browse button to select a file from your local directory.");
+ 	    return false;
+ 	}
+ 	formname.submit();
      }
-     #FIXME
+ </script>
-     # if delay queue exists 2 submits one to process delayed students one
-     #     to ignore delayed students, possibly saving the delay queue for later
+ <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+ $default_form_data
+ <table>
+ <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' />
+ <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+ </form>
+ UPLOAD
+     return '';
  }
+ sub scantron_upload_scantron_data_save {
+     my($r)=@_;
+     my ($symb,$url)=&get_symb_and_url($r,1);
+     my $doanotherupload=
+ 	'<br /><form action="/adm/grades" method="post">'."\n".
+ 	'<input type="hidden" name="command" value="scantronupload" />'."\n".
+ 	'<input type="submit" name="submit" value="Do Another Upload" />'."\n".
+ 	'</form>'."\n";
+     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 '';
+     }
+     $r->print("Doing upload to ".$ENV{'form.courseid'}." <br />");
+     my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
+ 					 $ENV{'form.domainid'});
+     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'; }
+     $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'},$home,'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.") occured when attempting to upload the file, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."</tt>");
+ 	}
+     }
+     if ($symb) {
+ 	$r->print(&show_grading_menu_form($symb,$url));
+     } else {
+ 	$r->print($doanotherupload);
+     }
+     return '';
+ }
  #-------- end of section for handling grading scantron forms -------
  #
  #-------------------------------------------------------------------
- Line 3026  SCANTRONFORM
+ Line 4602  SCANTRONFORM
  #--- Show a Grading Menu button - Calls the next routine ---
  sub show_grading_menu_form {
      my ($symb,$url)=@_;
-     my $result.='<form action="/adm/grades" method="post">'."\n".
+     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".
- Line 3057  sub gradingmenu {
+ Line 4633  sub gradingmenu {
      $request->print(<<GRADINGMENUJS);
  <script type="text/javascript" language="javascript">
-     function checkChoice(formname) {
+     function checkChoice(formname,val,cmdx) {
- 	var cmd = formname.command;
+ 	if (val <= 2) {
- 	formname.saveState.value = "saveCmd="+radioSelection(cmd)+":saveSec="+pullDownSelection(formname.section)+
+ 	    var cmd = radioSelection(formname.radioChoice);
- 	    ":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.status);
+ 	    var cmdsave = cmd;
- 	if (cmd[0].checked || cmd[1].checked || cmd[2].checked || cmd[4].checked) formname.submit();
+ 	} else {
+ 	    cmd = cmdx;
- 	if (cmd[3].checked) browseAndUpload();
+ 	    cmdsave = 'submission';
+ 	}
- 	if (cmd[5].checked) {
+ 	formname.command.value = cmd;
+ 	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
+ 	    ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+ 	if (val < 5) formname.submit();
+ 	if (val == 5) {
  	    if (!checkReceiptNo(formname,'notOK')) { return false;}
  	    formname.submit();
  	}
- Line 3082  sub gradingmenu {
+ Line 4662  sub gradingmenu {
  	    formname.receipt.focus();
  	    return false;
  	}
- 	formname.command[5].checked = true;
  	return true;
      }
-     function radioSelection(radioButton) {
- 	var selection=null;
- 	if (radioButton.length > 1) {
- 	    for (var i=0; i<radioButton.length; i++) {
- 		if (radioButton[i].checked) {
- 		    return radioButton[i].value;
- 		}
- 	    }
- 	} else {
- 	    if (radioButton.checked) return radioButton.value;
- 	}
- 	return selection;
-     }
-     function pullDownSelection(selectOne) {
- 	var selection="";
- 	if (selectOne.length > 1) {
- 	    for (var i=0; i<selectOne.length; i++) {
- 		if (selectOne[i].selected) {
- 		    return selectOne[i].value;
- 		}
- 	    }
- 	} else {
- 	    if (selectOne.selected) return selectOne.value;
- 	}
-     }
-     function browseAndUpload() {
- 	bNLoad = window.open('', 'BrowseAndUpload', 'toolbar=no,location=no,scrollbars=no,width=550,height=200,screenx=100,screeny=75');
- 	bNLoad.focus();
- 	var lDoc = bNLoad.document;
- 	lDoc.write("<html><head>");
- 	lDoc.write("<title>Browse And Upload</title>");
- 	lDoc.write("<script language=javascript>");
- 	lDoc.write("function checkUpload(formname) {");
- 	lDoc.write("  if (formname.upfile.value == \\"\\") {");
- 	lDoc.write("     alert(\\"Please use the browse button to select a file from your local directory.\\");");
- 	lDoc.write("     return false;");
- 	lDoc.write("   }");
- 	lDoc.write("   var openformname = opener.document.gradingMenu;");
- 	lDoc.write("   formname.saveState.value = \\"saveCmd=\\"+opener.radioSelection(openformname.command)+\\":saveSec=\\"+opener.pullDownSelection(openformname.section)+\\":saveSub=\\"+opener.radioSelection(openformname.submitonly)+\\":saveStatus=\\"+opener.pullDownSelection(openformname.status);");
- 	lDoc.write("   document.gradesupload.submit();");
- 	lDoc.write("   if (navigator.appName !=\\"Netscape\\") {self.close()};");
- 	lDoc.write("   setTimeout('self.close()',750)");
- 	lDoc.write("}");
- 	lDoc.write("<");
- 	lDoc.write("/script>");
- 	lDoc.write("</head><body bgcolor=white>");
- 	lDoc.write("<form method=\\"post\\" enctype=\\"multipart/form-data\\" action=\\"/adm/grades\\" name=\\"gradesupload\\" target=\\"LONcatInfo\\">");
- 	lDoc.write("<input type=\\"hidden\\" name=\\"symb\\"       value=\\"$symb\\">");
- 	lDoc.write("<input type=\\"hidden\\" name=\\"url\\"        value=\\"$url\\">");
- 	lDoc.write("<input type=\\"hidden\\" name=\\"probTitle\\"  value=\\"$probTitle\\">");
- 	lDoc.write("<input type=\\"hidden\\" name=\\"saveState\\"  value=\\"\\">");
- 	lDoc.write("<input type=\\"hidden\\" name=\\"command\\"    value=\\"csvuploadmap\\">");
- 	lDoc.write("<font color=\\"green\\" size=+1>&nbsp;<b>Specify a file containing the class scores for problem - $probTitle</b></font><br><br>");
- 	lDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
- 	lDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- 	lDoc.write("<td>");
- 	lDoc.write("<input type=\\"file\\" name=\\"upfile\\" size=\\"50\\" />");
- 	lDoc.write("<br />Type: <select name=\\"upfiletype\\">");
-         lDoc.write("<option value=\\"csv\\">CSV (comma separated values, spreadsheet)</option>");
-         lDoc.write("<option value=\\"space\\">Space separated</option>");
-         lDoc.write("<option value=\\"tab\\">Tabulator separated</option>");
-         lDoc.write("<option value=\\"xml\\">HTML/XML</option>");
-         lDoc.write("</select>");
-         lDoc.write("</td></tr></table>");
-         lDoc.write("</td></tr></table>&nbsp;");
-         lDoc.write("<input type=\\"button\\" value=\\"Upload Scores\\" onClick=\\"javascript:checkUpload(this.form)\\">&nbsp;&nbsp;");
-         lDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
-         lDoc.write("</form>");
-         lDoc.write("</body></html>");
-   }
  </script>
  GRADINGMENUJS
+     &commonJSfunctions($request);
-     my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>'.
+     my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>';
- 	'<table border="0">'.
+     my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
- 	'<tr><td colspan=3><font size=+1><b>Problem: </b>'.$probTitle.'</font></td></tr>'."\n";
+     $result.=$table;
-     my ($partlist,$handgrade) = &response_type($url);
-     my ($resptype,$hdgrade)=('','no');
-     for (sort keys(%$handgrade)) {
- 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- 	$resptype = $responsetype;
- 	$hdgrade = $handgrade if ($handgrade eq 'yes');
- 	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
- 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-     }
-     $result.='</table>'."\n";
      my (undef,$sections) = &getclasslist('all','0');
      my $savedState = &savedState();
-     my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'pickStudentPage' : $$savedState{'saveCmd'});
+     my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
      my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
-     my $saveSub = ($$savedState{'saveSub'} eq '' ? 'yes' : $$savedState{'saveSub'});
+     my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
      my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
  	'<input type="hidden" name="symb"        value="'.$symb.'" />'."\n".
  	'<input type="hidden" name="url"         value="'.$url.'" />'."\n".
- 	'<input type="hidden" name="response"    value="'.$resptype.'" />'."\n".
  	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
  	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
+ 	'<input type="hidden" name="command"     value="" />'."\n".
  	'<input type="hidden" name="saveState"   value="" />'."\n".
+ 	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
  	'<input type="hidden" name="showgrading" value="yes" />'."\n";
-     $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n".
+     $result.='<table width="100%" border=0><tr><td bgcolor=#777777>'."\n".
- 	'<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n".
+ 	'<table width=100% border=0><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
  	'&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".
- 	'<tr bgcolor=#ffffe6><td>'."\n";
+ 	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
-     $result.='<table width=100% border=0>'.
+     $result.='<table width="100%" border=0>';
- 	'<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
+     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
- 	'<input type="radio" name="command" value="pickStudentPage" '.
+ 	'&nbsp;'.&mt('Select Section').': <select name="section">'."\n";
- 	($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+     if (ref($sections)) {
- 	'Handgrade/View Submission for a student by page/sequence</td></tr>'."\n".
+ 	foreach (sort (@$sections)) {
+ 	    $result.='<option value="'.$_.'" '.
+ 		($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
+ 	}
+     }
+     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
+     $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
- 	'<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+     if (ref($sections) && (grep /no/,@$sections)) {
- 	'<input type="radio" name="command" value="viewgrades" '.
+ 	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />';
+     }
+     $result.='</td></tr>';
+     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ 	'<input type="radio" name="radioChoice" value="submission" '.
+ 	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+ 	' <select name="submitonly">'.
+ 	'<option value="yes" '.
+ 	($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
+ 	'<option value="graded" '.
+ 	($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.
+ 	'<option value="incorrect" '.
+ 	($saveSub eq 'incorrect' ? 'selected="on"' : '').'>with incorrect submissions</option>'.
+ 	'<option value="all" '.
+ 	($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";
+     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ 	'<input type="radio" name="radioChoice" value="viewgrades" '.
  	($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
- 	'Grade by section or class</td></tr>'."\n".
+ 	'<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";
+     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
+ 	'<input type="radio" name="radioChoice" value="pickStudentPage" '.
+ 	($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+ 	'The <b>complete</b> set/page/sequence: For one student</td></tr>'."\n";
+     $result.='<tr bgcolor="#ffffe6"><td><br />'.
+ 	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
+ 	'</td></tr></table>'."\n";
- 	'<tr bgcolor="#ffffe6"valign="top"><td><input type="radio" name="command" value="submission" '.
+     $result.='</td><td valign="top">';
- 	($saveCmd eq 'submission' ? 'checked' : '').'> '.
- 	($hdgrade eq 'yes' ? 'View/Grade essay response of' : 'View').
+     $result.='<table width="100%" border=0>';
- 	' an individual student </td>'."\n".
+     $result.='<tr bgcolor="#ffffe6"><td>'.
- 	'<td>-->&nbsp;For students who has: '.
+ 	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
- 	'<input type="radio" name="submitonly" value="yes" '.
+ 	' '.&mt('scores from file').' </td></tr>'."\n";
- 	($saveSub eq 'yes' ? 'checked' : '').' /> submitted'.
- 	'<input type="radio" name="submitonly" value="all" '.
- 	($saveSub eq 'all' ? 'checked' : '').' /> everybody</td></tr>'."\n".
- 	'<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- 	'<input type="radio" name="command" value="csvupload" '.
- 	($saveCmd eq 'csvupload' ? 'checked' : '').'> '.
- 	'Upload scores from file</td></tr>'."\n";
      $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- 	'<input type="radio" name="command" value="scantron_selectphase" '.
+ 	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
- 	($saveCmd eq 'scantron_selectphase' ? 'checked="on"' : '').' /> '.
+ 	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
-         'Grade scantron forms</td></tr>'."\n";
      if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
  	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- 	    '<input type="radio" name="command" value="verify" onChecked="javascript:this.form.receipt.focus()" '.
+ 	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
- 	    ($saveCmd eq 'verify' ? 'checked' : '').'> '.
+ 	    ' '.&mt('receipt').': '.
- 	    'Verify a submission receipt issued by this server</td>'.
+ 	    &Apache::lonnet::recprefix($ENV{'request.course.id'}).
- 	    '<td>-->&nbsp;Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
  	    '-<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"><br />'."\n".
+     $result.='</form></td></tr></table>'."\n".
- 	'&nbsp;Select section: <select name="section">'."\n";
-     if (ref($sections)) {
- 	foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
- 					 ($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
-     }
-     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
-     $result.='Student Status:</b><select name="status">'.
- 	'<option value="Active" '.($saveStatus eq 'Active' ? 'selected' : '').'>Active</option>'.
- 	'<option value="Expired" '.($saveStatus eq 'Expired' ? 'selected' : '').'>Expired</option>'.
- 	'<option value="Any" '.($saveStatus eq 'Any' ? 'selected' : '').'>Any</option>'.
- 	'</select>';
-     $result.=' &nbsp; <font color="red">(Applies to the first three options only.)</font>'."\n";
-     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"><td colspan="2"><br />'.
- 	'<input type="button" onClick="javascript:checkChoice(this.form);" value="View/Grade" />'."\n".
- 	'</form></td></tr></table>'."\n".
  	'</td></tr></table>'."\n".
  	'</td></tr></table>'."\n";
      return $result;
- Line 3276  GRADINGMENUJS
+ Line 4765  GRADINGMENUJS
  sub handler {
      my $request=$_[0];
+     undef(%perm);
      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 $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'};
      }
      &send_header($request);
-     if ($url eq '' && $symb eq '') {
+     if ($url eq '' && $symb eq '' && $command eq '') {
  	if ($ENV{'user.adv'}) {
  	    if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
  		($ENV{'form.codethree'})) {
- Line 3303  sub handler {
+ Line 4797  sub handler {
  		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(
+ 			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
- 					&Apache::lonnet::ssi('/res/'.$url,
+ 					  ('grade_username' => $tuname,
- 							     ('grade_username' => $tuname,
+ 					   'grade_domain' => $tudom,
- 							      'grade_domain' => $tudom,
+ 					   'grade_courseid' => $tcrsid,
- 							      'grade_courseid' => $tcrsid,
+ 					   'grade_symb' => $tsymb)));
- 							      'grade_symb' => $tsymb)));
  		    } else {
  			$request->print('<h3>Not authorized: '.$token.'</h3>');
  		    }
  		} else {
  		    $request->print('<h3>Not a valid DocID: '.$token.'</h3>');
  		}
- Line 3322  sub handler {
+ Line 4815  sub handler {
  	    }
  	}
      } else {
- 	$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ 	if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {
- 	if ($command eq 'submission') {
+ 	    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));
- 	} elsif ($command eq 'pickStudentPage') {
+ 	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
  	    &pickStudentPage($request);
- 	} elsif ($command eq 'displayPage') {
+ 	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
  	    &displayPage($request);
- 	} elsif ($command eq 'gradeByPage') {
+ 	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
  	    &updateGradeByPage($request);
- 	} elsif ($command eq 'processGroup') {
+ 	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
  	    &processGroup($request);
- 	} elsif ($command eq 'gradingmenu') {
+ 	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
  	    $request->print(&gradingmenu($request));
- 	} elsif ($command eq 'viewgrades') {
+ 	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
  	    $request->print(&viewgrades($request));
- 	} elsif ($command eq 'handgrade') {
+ 	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
  	    $request->print(&processHandGrade($request));
- 	} elsif ($command eq 'editgrades') {
+ 	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
  	    $request->print(&editgrades($request));
- 	} elsif ($command eq 'verify') {
+ 	} elsif ($command eq 'verify' && $perm{'vgr'}) {
  	    $request->print(&verifyreceipt($request));
- 	} elsif ($command eq 'csvform') {
+ 	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
  	    $request->print(&upcsvScores_form($request));
- 	} elsif ($command eq 'csvupload') {
+ 	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
  	    $request->print(&csvupload($request));
- 	} elsif ($command eq 'viewclasslist') {
+ 	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
- 	    $request->print(&viewclasslist($request));
- 	} elsif ($command eq 'csvuploadmap') {
  	    $request->print(&csvuploadmap($request));
- 	} elsif ($command eq 'csvuploadassign') {
+ 	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'}) {
  	    if ($ENV{'form.associate'} ne 'Reverse Association') {
  		$request->print(&csvuploadassign($request));
  	    } else {
- Line 3362  sub handler {
+ Line 4866  sub handler {
  		}
  		$request->print(&csvuploadmap($request));
  	    }
- 	} elsif ($command eq 'scantron_selectphase') {
+ 	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
  	    $request->print(&scantron_selectphase($request));
- 	} elsif ($command eq 'scantron_process') {
+  	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+  	    $request->print(&scantron_validate_file($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));
- 	} else {
+  	} elsif ($command eq 'scantronupload' &&
- 	    $request->print("Unknown action: $command:");
+  		 (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})||
+ 		  &Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
+  	    $request->print(&scantron_upload_scantron_data($request));
+  	} elsif ($command eq 'scantronupload_save' &&
+  		 (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})||
+ 		  &Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
+  	    $request->print(&scantron_upload_scantron_data_save($request));
+  	} elsif ($command eq 'scantrondownload' &&
+ 		 &Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
+  	    $request->print(&scantron_download_scantron_data($request));
+ 	} elsif ($command) {
+ 	    $request->print("Access Denied ($command)");
  	}
      }
      &send_footer($request);
- Line 3383  sub send_header {
+ Line 4902  sub send_header {
  #remotewindow.close();
  #</script>");
      $request->print(&Apache::loncommon::bodytag('Grading'));
+     $request->rflush();
  }
  sub send_footer {

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

Removed from v.1.82
changed lines
	Added in v.1.199