--- loncom/homework/grades.pm	2006/03/13 21:10:34	1.334
+++ loncom/homework/grades.pm	2007/03/14 19:15:37	1.392
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.334 2006/03/13 21:10:34 albertel Exp $
+# $Id: grades.pm,v 1.392 2007/03/14 19:15:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,10 +36,14 @@ use Apache::lonhtmlcommon;
 use Apache::lonnavmaps;
 use Apache::lonhomework;
 use Apache::loncoursedata;
-use Apache::lonmsg qw(:user_normal_msg);
+use Apache::lonmsg();
 use Apache::Constants qw(:common);
 use Apache::lonlocal;
+use Apache::lonenc;
 use String::Similarity;
+use lib '/home/httpd/lib/perl';
+use LONCAPA;
+
 use POSIX qw(floor);
 
 my %oldessays=();
@@ -109,35 +113,38 @@ sub nameUserString {
 #--- Indicate if a response type is coded handgraded or not. ---
 sub response_type {
     my ($symb) = shift;
-    my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
-    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,%responseType);
-    foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
-	if (/^\w+response_.*/) {
-	    my ($responsetype,$part) = split(/_/,$_,2);
-	    my ($partid,$respid) = split(/_/,$part);
-	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
-		next;
-	    }
-	    if (%vPart && !exists($vPart{$partid})) {
-		next;
-	    }
-	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
-	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
-	    $handgrade{$part} = ($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,\%responseType);
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $res = $navmap->getBySymb($symb);
+    my $partlist = $res->parts();
+    my %vPart = 
+	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
+    my (%response_types,%handgrade);
+    foreach my $part (@{ $partlist }) {
+	next if (%vPart && !exists($vPart{$part}));
+
+	my @types = $res->responseType($part);
+	my @ids = $res->responseIds($part);
+	for (my $i=0; $i < scalar(@ids); $i++) {
+	    $response_types{$part}{$ids[$i]} = $types[$i];
+	    $handgrade{$part.'_'.$ids[$i]} = 
+		&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
+				     '.handgrade',$symb);
+	}
+    }
+    return ($partlist,\%handgrade,\%response_types);
+}
+
+sub flatten_responseType {
+    my ($responseType) = @_;
+    my @part_response_id =
+	map { 
+	    my $part = $_;
+	    map {
+		[$part,$_]
+		} sort(keys(%{ $responseType->{$part} }));
+	} sort(keys(%$responseType));
+    return @part_response_id;
 }
 
 sub get_display_part {
@@ -164,25 +171,26 @@ sub showResourceInfo {
     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>";
+    foreach my $partID (sort keys(%$responseType)) {
+	foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
+	    my $handgrade=$$handgrade{$partID.'_'.$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;
 	    }
-	    $partsseen{$partID}=1;
-	}
-	my $display_part=&get_display_part($partID,$symb);
-	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
-	    $resID.'</font></td>'.
-	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
+	    my $display_part=&get_display_part($partID,$symb);
+	    $result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
+		$resID.'</font></td>'.
+		'<td><b>Type: </b>'.$responsetype.'</td></tr>';
 #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+	}
     }
     $result.='</table>'."\n";
     return $result,$responseType,$hdgrade,$partlist,$handgrade;
@@ -205,9 +213,11 @@ sub get_order {
     return ($analyze{"$partid.$respid.shown"});
 }
 #--- Clean response type for display
-#--- Currently filters option/rank/radiobutton/match/essay response types only.
+#--- Currently filters option/rank/radiobutton/match/essay/Task
+#        response types only.
 sub cleanRecord {
-    my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+    my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
+	$uname,$udom) = @_;
     my $grayFont = '<font color="#999999">';
     if ($response =~ /^(option|rank)$/) {
 	my %answer=&Apache::lonnet::str2hash($answer);
@@ -288,6 +298,37 @@ sub cleanRecord {
 	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
 	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
 	return $result;
+    } elsif ( $response eq 'Task') {
+	if ( $answer eq 'SUBMITTED') {
+	    my $files = $record->{$version."resource.$respid.$partid.bridgetask.portfiles"};
+	    my $result = &Apache::bridgetask::file_list($files,$uname,$udom);
+	    return $result;
+	} elsif ( grep(/^\Q$version\E.*?\.instance$/, keys(%{$record})) ) {
+	    my @matches = grep(/^\Q$version\E.*?\.instance$/,
+			       keys(%{$record}));
+	    return join('<br />',($version,@matches));
+			       
+			       
+	} else {
+	    my $result =
+		'<p>'
+		.&mt('Overall result: [_1]',
+		     $record->{$version."resource.$respid.$partid.status"})
+		.'</p>';
+	    
+	    $result .= '<ul>';
+	    my @grade = grep(/^\Q${version}resource.$respid.$partid.\E[^.]*[.]status$/,
+			     keys(%{$record}));
+	    foreach my $grade (sort(@grade)) {
+		my ($dim) = ($grade =~/[.]([^.]+)[.]status$/);
+		$result.= '<li>'.&mt("Dimension: [_1], status [_2] ",
+				     $dim, $record->{$grade}).
+			  '</li>';
+	    }
+	    $result.='</ul>';
+	    return $result;
+	}
+       
     }
     return $answer;
 }
@@ -552,7 +593,7 @@ sub verifyreceipt {
     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
 	$env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;
-    my $symb     = &Apache::lonnet::symbread();
+    my ($symb)   = &get_symb($request);
 
     my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
 	$receipt.'</h3></font>'."\n".
@@ -562,7 +603,8 @@ sub verifyreceipt {
     my (undef,undef,$fullname) = &getclasslist('all','0');
     
     my $receiptparts=0;
-    if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+    if ($env{"course.$courseid.receiptalg"} eq 'receipt2' ||
+	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
     if ($receiptparts) { ($parts)=&response_type($symb); }
     foreach (sort 
@@ -688,7 +730,14 @@ LISTJAVASCRIPT
     $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".
+	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
+        '&nbsp;<b>Grading Increments:</b> <select name="increment">'.
+        '<option value="1">Whole Points</option>'.
+        '<option value=".5">Half Points</option>'.
+        '<option value=".25">Quarter Points</option>'.
+        '<option value=".1">Tenths of a Point</option>'.
+        '</select>'.
+
 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
 	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
@@ -1101,6 +1150,81 @@ sub sub_page_kw_js {
     my $request = shift;
     my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);
+
+    my $inner_js_msg_central=<<INNERJS;
+    <script text="text/javascript">
+    function checkInput() {
+      opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
+      var nmsg   = opener.document.SCORE.savemsgN.value;
+      var usrctr = document.msgcenter.usrctr.value;
+      var newval = opener.document.SCORE["newmsg"+usrctr];
+      newval.value = opener.checkEntities(document.msgcenter.newmsg.value);
+
+      var msgchk = "";
+      if (document.msgcenter.subchk.checked) {
+         msgchk = "msgsub,";
+      }
+      var includemsg = 0;
+      for (var i=1; i<=nmsg; i++) {
+          var opnmsg = opener.document.SCORE["savemsg"+i];
+          var frmmsg = document.msgcenter["msg"+i];
+          opnmsg.value = opener.checkEntities(frmmsg.value);
+          var showflg = opener.document.SCORE["shownOnce"+i];
+          showflg.value = "1";
+          var chkbox = document.msgcenter["msgn"+i];
+          if (chkbox.checked) {
+             msgchk += "savemsg"+i+",";
+             includemsg = 1;
+          }
+      }
+      if (document.msgcenter.newmsgchk.checked) {
+         msgchk += "newmsg"+usrctr;
+         includemsg = 1;
+      }
+      imgformname = opener.document.SCORE["mailicon"+usrctr];
+      imgformname.src = "$iconpath/"+((includemsg) ? "mailto.gif" : "mailbkgrd.gif");
+      var includemsg = opener.document.SCORE["includemsg"+usrctr];
+      includemsg.value = msgchk;
+
+      self.close()
+
+    }
+    </script>
+INNERJS
+
+    my $inner_js_highlight_central=<<INNERJS;
+ <script type="text/javascript">
+    function updateChoice(flag) {
+      opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+      opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+      opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+      opener.document.SCORE.refresh.value = "on";
+      if (opener.document.SCORE.keywords.value!=""){
+         opener.document.SCORE.submit();
+      }
+      self.close()
+    }
+</script>
+INNERJS
+
+    my $start_page_msg_central = 
+        &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
+				       {'js_ready'  => 1,
+					'only_body' => 1,
+					'bgcolor'   =>'#FFFFFF',});
+    my $end_page_msg_central = 
+	&Apache::loncommon::end_page({'js_ready' => 1});
+
+
+    my $start_page_highlight_central = 
+        &Apache::loncommon::start_page('Highlight Central',
+				       $inner_js_highlight_central,
+				       {'js_ready'  => 1,
+					'only_body' => 1,
+					'bgcolor'   =>'#FFFFFF',});
+    my $end_page_highlight_central = 
+	&Apache::loncommon::end_page({'js_ready' => 1});
+
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;
     $request->print(<<SUBJAVASCRIPT);
@@ -1216,51 +1340,7 @@ sub sub_page_kw_js {
     pWin.focus();
     pDoc = pWin.document;
     pDoc.$docopen;
-    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 = opener.checkEntities(document.msgcenter.msgsub.value);");
-    pDoc.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
-    pDoc.write("  var usrctr = document.msgcenter.usrctr.value;");
-    pDoc.write("  var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
-    pDoc.write("  newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");
-
-    pDoc.write("  var msgchk = \\"\\";");
-    pDoc.write("  if (document.msgcenter.subchk.checked) {");
-    pDoc.write("     msgchk = \\"msgsub,\\";");
-    pDoc.write("  }");
-    pDoc.write("  var includemsg = 0;");
-    pDoc.write("  for (var i=1; i<=nmsg; i++) {");
-    pDoc.write("      var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
-    pDoc.write("      var frmmsg = document.msgcenter[\\"msg\\"+i];");
-    pDoc.write("      opnmsg.value = opener.checkEntities(frmmsg.value);");
-    pDoc.write("      var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
-    pDoc.write("      showflg.value = \\"1\\";");
-    pDoc.write("      var chkbox = document.msgcenter[\\"msgn\\"+i];");
-    pDoc.write("      if (chkbox.checked) {");
-    pDoc.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
-    pDoc.write("         includemsg = 1;");
-    pDoc.write("      }");
-    pDoc.write("  }");
-    pDoc.write("  if (document.msgcenter.newmsgchk.checked) {");
-    pDoc.write("     msgchk += \\"newmsg\\"+usrctr;");
-    pDoc.write("     includemsg = 1;");
-    pDoc.write("  }");
-    pDoc.write("  imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
-    pDoc.write("  imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
-    pDoc.write("  var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
-    pDoc.write("  includemsg.value = msgchk;");
-
-    pDoc.write("  self.close()");
-
-    pDoc.write("}");
-
-    pDoc.write("<");
-    pDoc.write("/script>");
-
-    pDoc.write("</head><body bgcolor=white>");
+    pDoc.write('$start_page_msg_central');
 
     pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
@@ -1301,7 +1381,7 @@ sub sub_page_kw_js {
     pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
     pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
     pDoc.write("</form>");
-    pDoc.write("</body></html>");
+    pDoc.write('$end_page_msg_central');
     pDoc.close();
 }
 
@@ -1347,26 +1427,7 @@ sub sub_page_kw_js {
     hwdWin.focus();
     var hDoc = hwdWin.document;
     hDoc.$docopen;
-    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 = opener.radioSelection(document.hlCenter.kwdclr);");
-    hDoc.write("  opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
-    hDoc.write("  opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
-    hDoc.write("  opener.document.SCORE.refresh.value = \\"on\\";");
-    hDoc.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
-    hDoc.write("     opener.document.SCORE.submit();");
-    hDoc.write("  }");
-    hDoc.write("  self.close()");
-    hDoc.write("}");
-
-    hDoc.write("<");
-    hDoc.write("/script>");
-
-    hDoc.write("</head><body bgcolor=white>");
-
+    hDoc.write('$start_page_highlight_central');
     hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
     hDoc.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br /><br />");
 
@@ -1394,7 +1455,7 @@ sub sub_page_kw_js {
     hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
     hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
     hDoc.write("</form>");
-    hDoc.write("</body></html>");
+    hDoc.write('$end_page_highlight_central');
     hDoc.close();
   }
 
@@ -1402,10 +1463,20 @@ sub sub_page_kw_js {
 SUBJAVASCRIPT
 }
 
+sub get_increment {
+    my $increment = $env{'form.increment'};
+    if ($increment != 1 && $increment != .5 && $increment != .25 &&
+        $increment != .1) {
+        $increment = 1;
+    }
+    return $increment;
+}
+
 #--- displays the grading box, used in essay type problem and grading by page/sequence
 sub gradeBox {
     my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
-    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+    my $checkIcon = '<img alt="'.&mt('Check Mark').
+	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
     my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
     my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 
@@ -1424,13 +1495,16 @@ sub gradeBox {
     $result.='<table border="0"><tr><td>'.
 	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
     my $ctr = 0;
+    my $thisweight = 0;
+    my $increment = &get_increment();
     $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
-    while ($ctr<=$wgt) {
-	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+    while ($thisweight<=$wgt) {
+	$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
-	    $ctr.')" value="'.$ctr.'" '.
-	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";
+	    $thisweight.')" value="'.$thisweight.'" '.
+	    ($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></span></td>\n";
 	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+        $thisweight += $increment;
 	$ctr++;
     }
     $result.='</tr></table>';
@@ -1445,14 +1519,14 @@ sub gradeBox {
     $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
 	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
-	$result.='<option> </option>'.
+	$result.='<option></option>'.
 	    '<option selected="on">excused</option>';
     } else {
-	$result.='<option selected="on"> </option>'.
+	$result.='<option selected="on"></option>'.
 	    '<option>excused</option>';
     }
     $result.='<option>reset status</option></select>'."\n";
-    $result.="&nbsp&nbsp\n";
+    $result.="&nbsp;&nbsp;\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
 	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
 	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
@@ -1470,10 +1544,11 @@ sub handback_box {
     my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
     my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my (@respids);
-    foreach my $part_resp (sort(keys(%$handgrade))) {
-        my ($part,$resp) = split(/_/,$part_resp);
+     my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($part,$resp) = @{ $part_response_id };
         if ($part eq $partid) {
-            push @respids,$resp;
+            push(@respids,$resp);
         }
     }
     my $result;
@@ -1483,35 +1558,45 @@ sub handback_box {
 	next if (!@$files);
 	my $file_counter = 1;
 	foreach my $file (@$files) {
-	    my ($file_disp) = ($file =~ m|.+/(.+)$|);
-	    $result.=&mt('Return commented version of [_1] to student.',
-			 '<span class="filename">'.$file_disp.'</span>');
-	    $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
-	    $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
-	    $file_counter++;
+	    if ($file =~ /\/portfolio\//) {
+    	        my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
+    	        my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+    	        $file_disp = "$name.$ext";
+    	        $file = $file_path.$file_disp;
+    	        $result.=&mt('Return commented version of [_1] to student.',
+    			 '<span class="LC_filename">'.$file_disp.'</span>');
+    	        $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
+    	        $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
+    	        $result.='(File will be uploaded when you click on Save & Next below.)<br />';
+    	        $file_counter++;
+	    }
 	}
     }
     return $result;    
 }
 
 sub show_problem {
-    my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
+    my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode,$form) = @_;
     my $rendered;
+    my %form = ((ref($form) eq 'HASH')? %{$form} : ());
     &Apache::lonxml::remember_problem_counter();
     if ($mode eq 'both' or $mode eq 'text') {
 	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
-					     $env{'request.course.id'});
+						       $env{'request.course.id'},
+						       undef,\%form);
     }
     if ($removeform) {
 	$rendered=~s|<form(.*?)>||g;
 	$rendered=~s|</form>||g;
-	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+	$rendered=~s|(<input[^>]*name\s*=\s*"?)(\w+)("?)|$1would_have_been_$2$3|g;
     }
     my $companswer;
     if ($mode eq 'both' or $mode eq 'answer') {
 	&Apache::lonxml::restore_problem_counter();
-	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
-						    $env{'request.course.id'});
+	$companswer=
+	    &Apache::loncommon::get_student_answers($symb,$uname,$udom,
+						    $env{'request.course.id'},
+						    %form);
     }
     if ($removeform) {
 	$companswer=~s|<form(.*?)>||g;
@@ -1566,7 +1651,8 @@ sub submission {
     if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
     if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
     my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+    my $checkIcon = '<img alt="'.&mt('Check Mark').
+	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
 
     # header info
@@ -1678,8 +1764,8 @@ KEYWORDS
 # Load the other essays for similarity check
 #
             my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
-	    my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
-	    $apath=&Apache::lonnet::escape($apath);
+	    my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
+	    $apath=&escape($apath);
 	    $apath=~s/\W/\_/gs;
 	    %oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
         }
@@ -1784,8 +1870,9 @@ KEYWORDS
 	    $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
 	} else {
 	    my %seenparts;
-	    for my $part (sort keys(%$handgrade)) {
-		my ($partid,$respid) = split(/_/,$part);
+	    my @part_response_id = &flatten_responseType($responseType);
+	    foreach my $part (@part_response_id) {
+		my ($partid,$respid) = @{ $part };
 		my $display_part=&get_display_part($partid,$symb);
 		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
 		    if (exists($seenparts{$partid})) { next; }
@@ -1809,7 +1896,7 @@ KEYWORDS
 		}
 		foreach (@$string) {
 		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
-		    if ($part ne ($partid.'_'.$respid)) { next; }
+		    if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
 		    my ($ressub,$subval) = split(/:/,$_,2);
 		    # Similarity check
 		    my $similar='';
@@ -1829,7 +1916,7 @@ KEYWORDS
 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
 		    if ($env{'form.lastSub'} eq 'lastonly' || 
 			($env{'form.lastSub'} eq 'hdgrade' && 
-			 $$handgrade{$part} eq 'yes')) {
+			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
 			my $display_part=&get_display_part($partid,$symb);
 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
 			    $display_part.' <font color="#999999">( ID '.$respid.
@@ -1841,7 +1928,7 @@ KEYWORDS
 			    foreach my $file (@$files) {
 			        $file_counter ++;
 				&Apache::lonnet::allowuploaded('/adm/grades',$file);
-				$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0"> '.$file.'</a>';
+				$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
 			    }
 			    $lastsubonly.='<br />';
 			}
@@ -1897,8 +1984,8 @@ KEYWORDS
 	    '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
 	$result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
 	    ',\''.$msgfor.'\')"; TARGET=_self>'.
-	    &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.
-	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.
+	    &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
+	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
 	    '<img src="'.$request->dir_config('lonIconsURL').
 	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
 	    '<br />&nbsp;('.
@@ -1919,8 +2006,10 @@ KEYWORDS
     my %seen = ();
     my @partlist;
     my @gradePartRespid;
-    for my $part_resp (sort(keys(%$handgrade))) {
-	my ($partid,$respid) = split(/_/, $part_resp);
+    my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($partid,$respid) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
 	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
@@ -1958,6 +2047,8 @@ KEYWORDS
 	    '<input type="button" value="Next" '.
 	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;';
 	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
+        $endform.="<input type='hidden' value='".&get_increment().
+            "' name='increment' />";
 	$endform.='</td><tr></table></form>';
 	$endform.=&show_grading_menu_form($symb);
 	$request->print($endform);
@@ -2031,9 +2122,22 @@ sub processHandGrade {
 	    }
 	    my $includemsg = $env{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
+            my $restitle = &Apache::lonnet::gettitle($symb);
+            my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
+                                                $symb,$udom,$uname);
+            my ($feedurl,$baseurl,$showsymb,$messagetail);
+            $feedurl = &Apache::lonnet::clutter($url);
+            if ($encrypturl =~ /^yes$/i) {
+                $baseurl = &Apache::lonenc::encrypted($feedurl,1);
+                $showsymb = &Apache::lonenc::encrypted($symb,1);
+            } else {
+                $baseurl = $feedurl;
+                $showsymb = $symb;
+            }
 	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
 		$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
 		unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
+		$subject.=' ['.$restitle.']';
 		my (@msgnum) = split(/,/,$includemsg);
 		foreach (@msgnum) {
 		    $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
@@ -2041,14 +2145,16 @@ sub processHandGrade {
 		$message =&Apache::lonfeedback::clear_out_html($message);
 		if ($env{'form.withgrades'.$ctr}) {
 		    $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
-		    $message.=" for <a href=\"".
-		    &Apache::lonnet::clutter($url).
-		    "?symb=$symb\">$env{'form.probTitle'}</a>";
-		}
-		$msgstatus = &Apache::lonmsg::user_normal_msg($uname,$udom,
-							      $subject.' ['.
-							      &Apache::lonnet::declutter($url).']',$message);
-		$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
+		    $messagetail = " for <a href=\"".
+		                   $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
+		}
+		$msgstatus = 
+                    &Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
+						     $message.$messagetail,
+                                                     undef,$baseurl,undef,
+                                                     undef,undef,$showsymb,
+                                                     $restitle);
+		$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
 				$msgstatus);
 	    }
 	    if ($env{'form.collaborator'.$ctr}) {
@@ -2060,11 +2166,27 @@ sub processHandGrade {
 			    &saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
 					   $env{'form.unamedom'.$ctr},$part);
 			if ($errorflag eq 'not_allowed') {
-			    $request->print("<font color=\"red\">Not allowed to modify grades for $collaborator:$udom</font>");
+			    $request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
 			    next;
 			} else {
 			    if ($message ne '') {
-				$msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$env{'form.msgsub'},$message);
+                                $encrypturl=
+                                  &Apache::lonnet::EXT('resource.0.encrypturl',
+                                                       $symb,$udom,$collaborator);
+                                if ($encrypturl =~ /^yes$/i) {
+                                    $baseurl = &Apache::lonenc::encrypted($feedurl,1);
+                                    $showsymb = &Apache::lonenc::encrypted($symb,1);
+                                } else {
+                                    $baseurl = $feedurl;
+                                    $showsymb = $symb;
+                                }
+                                if ($env{'form.withgrades'.$ctr}) {
+                                    $messagetail = " for <a href=\"".
+                                    $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
+
+                                }
+				$msgstatus = 
+                                    &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
 			    }
 			}
 		    }
@@ -2235,20 +2357,19 @@ sub processHandGrade {
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
     my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
-    my @v_flag;
+    my @version_parts;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
 					   $env{'request.course.id'});
     if (!&canmodify($usec)) { return('not_allowed'); }
-    my %record     = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
+    my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
     my @parts_graded;
     my %newrecord  = ();
     my ($pts,$wgt) = ('','');
     my %aggregate = ();
     my $aggregateflag = 0;
-
     my @parts = split(/:/,$env{'form.partlist'.$newflg});
     foreach my $new_part (@parts) {
-	#collaborator may vary for different parts
+	#collaborator ($submi may vary for different parts
 	if ($submitter && $new_part ne $part) { next; }
 	my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
 	if ($dropMenu eq 'excused') {
@@ -2257,7 +2378,7 @@ sub saveHandGrade {
 		if (exists($record{'resource.'.$new_part.'.awarded'})) {
 		    $newrecord{'resource.'.$new_part.'.awarded'} = '';
 		}
-	    $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
+	        $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
 	    }
 	} elsif ($dropMenu eq 'reset status'
 		 && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
@@ -2293,6 +2414,7 @@ sub saveHandGrade {
 	    my $partial= $pts/$wgt;
 	    if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
 		#do not update score for part if not changed.
+                &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
 		next;
 	    } else {
 	        push @parts_graded, $new_part;
@@ -2317,60 +2439,31 @@ sub saveHandGrade {
 	    $newrecord{'resource.'.$new_part.'.regrader'}=
 		"$env{'user.name'}:$env{'user.domain'}";
 	}
-	my ($partlist,$handgrade,$responseType) = &response_type($symb);
-	foreach my $part_resp (sort(keys(%$handgrade))) {
-	    my ($part_id, $resp_id) = split(/_/,$part_resp);
-            if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
-                # if multiple files are uploaded names will be 'returndoc2','returndoc3'
-                my $file_counter = 1;
-                while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
-                    my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
-                    $newrecord{"resource.$new_part.$resp_id.handback"} = $env{'form.returndocorig'.$file_counter};
-                    # set the filename to match the submitted file name
-                    $env{'form.'.$newflg.'_'.$part_resp.'_returndoc1.filename'} = $env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter};
-                    my $result=&Apache::lonnet::userfileupload($newflg.'_'.$part_resp.'_returndoc'.$file_counter,'',
-	        	 'portfolio',undef,undef,undef,$stuname,$domain);
-                   if ($result !~ m|^/uploaded/|) {
-                        $request->print('<font color="red"> An errror occured ('.$result.
-	                    ') while trying to upload '.&display_file().'</font><br />');
-	                # $request->print(&done('Back'));
-	            }
-                    $request->print("<br />".$fname." will be the uploaded file name");
-                    $request->print("<font color=\"red\">Will upload document</font>".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
-                    $file_counter++;
-                }
-            }
-        }
-	
 	# unless problem has been graded, set flag to version the submitted files
 	unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/  || 
 	        $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
 	        $dropMenu eq 'reset status')
 	   {
-	    push (@v_flag,$new_part);
+	    push (@version_parts,$new_part);
 	}
     }
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
-    if (scalar(keys(%newrecord)) > 0) {
-        if (scalar(@v_flag)) {
-            &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
+    if (%newrecord) {
+        if (@version_parts) {
+            my @changed_keys = &version_portfiles(\%record, \@parts_graded, 
+                                $env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts);
+	    @newrecord{@changed_keys} = @record{@changed_keys};
+	    foreach my $new_part (@version_parts) {
+		&handback_files($request,$symb,$stuname,$domain,$newflg,
+				$new_part,\%newrecord);
+	    }
         }
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$env{'request.course.id'},$domain,$stuname);
-	
-	my @ungraded_parts;
-	foreach my $part (@parts) {
-	    if ( !defined($record{'resource.'.$part.'.awarded'})
-		 && !defined($newrecord{'resource.'.$part.'.awarded'}) ) {
-		push(@ungraded_parts, $part);
-	    }
-	}
-	if ( !@ungraded_parts ) {
-	    &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
-						   $cnum,$domain,$stuname);
-	}
+	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
+				     $cdom,$cnum,$domain,$stuname);
     }
     if ($aggregateflag) {
         &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
@@ -2379,6 +2472,97 @@ sub saveHandGrade {
     return ('',$pts,$wgt);
 }
 
+sub check_and_remove_from_queue {
+    my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
+    my @ungraded_parts;
+    foreach my $part (@{$parts}) {
+	if (    $record->{   'resource.'.$part.'.awarded'} eq ''
+	     && $record->{   'resource.'.$part.'.solved' } ne 'excused'
+	     && $newrecord->{'resource.'.$part.'.awarded'} eq ''
+	     && $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
+		) {
+	    push(@ungraded_parts, $part);
+	}
+    }
+    if ( !@ungraded_parts ) {
+	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
+					       $cnum,$domain,$stuname);
+    }
+}
+
+sub handback_files {
+    my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
+    my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
+
+    my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($part_id,$resp_id) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
+            if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
+                # if multiple files are uploaded names will be 'returndoc2','returndoc3'
+                my $file_counter = 1;
+		my $file_msg;
+                while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
+                    my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
+                    my ($directory,$answer_file) = 
+                        ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/);
+                    my ($answer_name,$answer_ver,$answer_ext) =
+		        &file_name_version_ext($answer_file);
+		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
+		    my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
+		    my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+                    # fix file name
+                    my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
+                    my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
+            	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
+            	                                $save_file_name);
+                    if ($result !~ m|^/uploaded/|) {
+                        $request->print('<font color="red"> An errror occured ('.$result.
+                        ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</font><br />');
+                    } else {
+                        # mark the file as read only
+                        my @files = ($save_file_name);
+                        my @what = ($symb,$env{'request.course.id'},'handback');
+                        &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
+			if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
+			    $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
+			}
+                        $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
+			$file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />";
+
+                    }
+                    $request->print("<br />".$fname." will be the uploaded file name");
+                    $request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
+                    $file_counter++;
+                }
+		my $subject = "File Handed Back by Instructor ";
+		my $message = "A file has been returned that was originally submitted in reponse to: <br />";
+		$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
+		$message .= ' The returned file(s) are named: '. $file_msg;
+		$message .= " and can be found in your portfolio space.";
+		my $url = (&Apache::lonnet::decode_symb($symb))[2];
+		my $feedurl = &Apache::lonnet::clutter($url);
+                my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
+                                                    $symb,$domain,$stuname);
+                my ($baseurl,$showsymb);
+                if ($encrypturl =~ /^yes$/i) {
+                    $baseurl = &Apache::lonenc::encrypted($feedurl,1);
+                    $showsymb = &Apache::lonenc::encrypted($symb,1);
+                } else {
+                    $baseurl = $feedurl;
+                    $showsymb = $symb;
+                }
+                my $restitle = &Apache::lonnet::gettitle($symb);
+		my $msgstatus = 
+                   &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
+			 ' (File Returned) ['.$restitle.']',$message,undef,
+                         $baseurl,undef,undef,undef,$showsymb,$restitle);
+            }
+        }
+    return;
+}
+
 sub get_submitted_files {
     my ($udom,$uname,$partid,$respid,$record) = @_;
     my @files;
@@ -2457,40 +2641,39 @@ sub get_last_resets {
 sub version_portfiles {
     my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
     my $version_parts = join('|',@$v_flag);
+    my @returned_keys;
     my $parts = join('|', @$parts_graded);
-    my $portfolio_root = &Apache::loncommon::propath($domain,
-						 $stu_name).
-						'/userfiles/portfolio';
+    my $portfolio_root = &propath($domain,$stu_name).
+	'/userfiles/portfolio';
     foreach my $key (keys(%$record)) {
         my $new_portfiles;
         if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
-            my @v_portfiles;
-            my @portfiles = split(/,/,$$record{$key});
+            my @versioned_portfiles;
+            my @portfiles = split(/\s*,\s*/,$$record{$key});
             foreach my $file (@portfiles) {
                 &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
                 my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
-                my $version = 0;
 		my ($answer_name,$answer_ver,$answer_ext) =
 		    &file_name_version_ext($answer_file);
                 my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
-                $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+                my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                 my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
                 if ($new_answer ne 'problem getting file') {
-                    push(@v_portfiles, $directory.$new_answer);
+                    push(@versioned_portfiles, $directory.$new_answer);
                     &Apache::lonnet::mark_as_readonly($domain,$stu_name,
-                        ['/portfolio'.$directory.$new_answer],
+                        [$directory.$new_answer],
                         [$symb,$env{'request.course.id'},'graded']);
                 }
-                
             }
-            $$record{$key} = join(',',@v_portfiles);
+            $$record{$key} = join(',',@versioned_portfiles);
+            push(@returned_keys,$key);
         }
     } 
-    return 'ok';   
+    return (@returned_keys);   
 }
 
 sub get_next_version {
-    my ($answer_name, $answer_ext, $dir_list);
+    my ($answer_name, $answer_ext, $dir_list) = @_;
     my $version;
     foreach my $row (@$dir_list) {
         my ($file) = split(/\&/,$row,2);
@@ -2760,16 +2943,18 @@ sub viewgrades {
 	'<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($symb);
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my %weight = ();
     my $ctsparts = 0;
     $result.='<table border="0">';
     my %seen = ();
-    for (sort keys(%$handgrade)) {
-	my ($partid,$respid) = split (/_/,$_,2);
+    my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($partid,$respid) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
 	next if $seen{$partid};
 	$seen{$partid}++;
-	my $handgrade=$$handgrade{$_};
+	my $handgrade=$$handgrade{$part_resp};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -2804,7 +2989,7 @@ sub viewgrades {
     }
     $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
-    $result.='<input type="button" value="Reset" '.
+    $result.='<input type="button" value="Revert to Default" '.
 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
 
     #table listing all the students in a section/class
@@ -3328,9 +3513,10 @@ sub upcsvScores_form {
     $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'.
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource').
 	'.</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+    my $upload=&mt("Upload Scores");
     my $upfile_select=&Apache::loncommon::upfile_select_html();
     my $ignore=&mt('Ignore First Line');
     $result.=<<ENDUPFORM;
@@ -3340,11 +3526,13 @@ sub upcsvScores_form {
 <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
 <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 $upfile_select
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
+<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
 <label><input type="checkbox" name="noFirstLine" />$ignore</label>
 </form>
 ENDUPFORM
-    $result.='</td></tr></table>'."\n";
+    $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+                           &mt("How do I create a CSV file from a spreadsheet"))
+    .'</td></tr></table>'."\n";
     $result.='</td></tr></table><br /><br />'."\n";
     $result.=&show_grading_menu_form($symb);
     return $result;
@@ -3460,6 +3648,7 @@ sub csvuploadassign {
     my ($request)= @_;
     my ($symb)=&get_symb($request);
     if (!$symb) {return '';}
+    my $error_msg = '';
     &Apache::loncommon::load_tmp_file($request);
     my @gradedata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@gradedata); }
@@ -3512,12 +3701,20 @@ sub csvuploadassign {
 		my $part=$1;
 		my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
 					      $symb,$domain,$username);
-		$entries{$fields{$dest}}=~s/\s//g;
-		my $pcr=$entries{$fields{$dest}} / $wgt;
-		my $award='correct_by_override';
-		$grades{"resource.$part.awarded"}=$pcr;
-		$grades{"resource.$part.solved"}=$award;
-		$points{$part}=1;
+                if ($wgt) {
+                    $entries{$fields{$dest}}=~s/\s//g;
+                    my $pcr=$entries{$fields{$dest}} / $wgt;
+                    my $award='correct_by_override';
+                    $grades{"resource.$part.awarded"}=$pcr;
+                    $grades{"resource.$part.solved"}=$award;
+                    $points{$part}=1;
+                } else {
+                    $error_msg = "<br />" .
+                        &mt("Some point values were assigned"
+                            ." for problems with a weight "
+                            ."of zero. These values were "
+                            ."ignored.");
+                }
 	    } else {
 		if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
 		if ($dest=~/stores_(.*)_solved/)  { if ($points{$1}) {next;} }
@@ -3557,7 +3754,7 @@ sub csvuploadassign {
     }
     $request->print("<br />\n");
     $request->print(&show_grading_menu_form($symb));
-    return '';
+    return $error_msg;
 }
 #------------- end of section for handling csv file upload ---------
 #
@@ -3633,6 +3830,9 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
 
+    $result.='&nbsp;<b>'.&mt('Use CODE:').' </b>'.
+	'<input type="text" name="CODE" value="" /><br />'."\n";
+
     $result.='&nbsp;<input type="button" '.
 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
 
@@ -3663,8 +3863,8 @@ LISTJAVASCRIPT
 	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
 	$ptr++;
     }
-    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%2 == 0);
-    $studentTable.='</td></tr></table></td></tr></table>'."\n";
+    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td></tr>' if ($ptr%2 == 0);
+    $studentTable.='</table></td></tr></table>'."\n";
     $studentTable.='<input type="button" '.
 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
 
@@ -3687,9 +3887,10 @@ sub getSymbMap {
 					       1,0,1);
     for my $sequence ($navmap->getById('0.0'), @sequences) {
 	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
-	    my $title = $minder.'.'.$sequence->compTitle();
-	    push @titles, $title; # minder in case two titles are identical
-	    $symbx{$title} = $sequence->symb();
+	    my $title = $minder.'.'.
+		&HTML::Entities::encode($sequence->compTitle(),'"\'&');
+	    push(@titles, $title); # minder in case two titles are identical
+	    $symbx{$title} = &HTML::Entities::encode($sequence->symb(),'"\'&');
 	    $minder++;
 	}
     }
@@ -3725,6 +3926,11 @@ sub displayPage {
     my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
 	'</h3>'."\n";
+    if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+	$result.='<h3>&nbsp;CODE: '.$env{'form.CODE'}.'</h3>'."\n";
+    } else {
+	delete($env{'form.CODE'});
+    }
     &sub_page_js($request);
     $request->print($result);
 
@@ -3749,7 +3955,12 @@ sub displayPage {
 	'<input type="hidden" name="overRideScore" value="no" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
 
-    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+    if (defined($env{'form.CODE'})) {
+	$studentTable.=
+	    '<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
+    }
+    my $checkIcon = '<img alt="'.&mt('Check Mark').
+	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
 
     $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
@@ -3767,18 +3978,19 @@ sub displayPage {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+        if (ref($curRes) && $curRes->is_problem()) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
 	    $studentTable.='<td valign="top">';
+	    my %form = ('CODE' => $env{'form.CODE'},);
 	    if ($env{'form.vProb'} eq 'yes' ) {
 		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
-					     undef,'both');
+					     undef,'both',\%form);
 	    } else {
-		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'});
+		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
 		$companswer =~ s|<form(.*?)>||g;
 		$companswer =~ s|</form>||g;
 #		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
@@ -3829,9 +4041,9 @@ sub displayPage {
         $curRes = $iterator->next();
     }
 
-    $studentTable.='</td></tr></table></td></tr></table>'."\n".
+    $studentTable.='</table></td></tr></table>'."\n".
 	'<input type="button" value="Save" '.
-	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
+	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
 	'</form>'."\n";
     $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
@@ -3842,6 +4054,7 @@ sub displayPage {
 sub displaySubByDates {
     my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
     my $isCODE=0;
+    my $isTask = ($symb =~/\.task$/);
     if (exists($record->{'resource.CODE'})) { $isCODE=1; }
     my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
 	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
@@ -3856,8 +4069,17 @@ sub displaySubByDates {
     if (!exists($$record{'1:timestamp'})) {
 	return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />';
     }
+
+    my $interaction;
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+	if (exists($$record{$version.':resource.0.version'})) {
+	    $interaction = $$record{$version.':resource.0.version'};
+	}
+
+	my $where = ($isTask ? "$version:resource.$interaction"
+		             : "$version:resource");
+	#&Apache::lonnet::logthis(" got $where");
 	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
 	if ($isCODE) {
 	    $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
@@ -3865,40 +4087,57 @@ sub displaySubByDates {
 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
-	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
+	    my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
+			            : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
+	    
+
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
 	    my $display_part=&get_display_part($partid,$symb);
 	    foreach my $matchKey (@matchKey) {
 		if (exists($$record{$version.':'.$matchKey}) &&
 		    $$record{$version.':'.$matchKey} ne '') {
-		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+
+		    my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
+				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
+		    #&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey});
 		    $displaySub[0].='<b>Part:</b>&nbsp;'.$display_part.'&nbsp;';
 		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
 			$responseId.')</font>&nbsp;<b>';
-		    if ($$record{"$version:resource.$partid.tries"} eq '') {
+		    if ($$record{"$where.$partid.tries"} eq '') {
 			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
 		    } else {
 			$displaySub[0].='Trial&nbsp;'.
-			    $$record{"$version:resource.$partid.tries"};
+			    $$record{"$where.$partid.tries"};
 		    }
-		    my $responseType=$responseType->{$partid}->{$responseId};
+		    my $responseType=($isTask ? 'Task'
+                                              : $responseType->{$partid}->{$responseId});
 		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
 		    if (!exists($orders{$partid}->{$responseId})) {
 			$orders{$partid}->{$responseId}=
 			    &get_order($partid,$responseId,$symb,$uname,$udom);
 		    }
 		    $displaySub[0].='</b>&nbsp; '.
-			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';
+			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
 		}
 	    }
-	    if (exists $$record{"$version:resource.$partid.award"}) {
+	    if (exists($$record{"$where.$partid.checkedin"})) {
+		$displaySub[1].='Checked in by '.
+		    $$record{"$where.$partid.checkedin"}.' into slot '.
+		    $$record{"$where.$partid.checkedin.slot"}.
+		    '<br />';
+	    }
+	    if (exists $$record{"$where.$partid.award"}) {
 		$displaySub[1].='<b>Part:</b>&nbsp;'.$display_part.' &nbsp;'.
-		    lc($$record{"$version:resource.$partid.award"}).' '.
-		    $mark{$$record{"$version:resource.$partid.solved"}}.
+		    lc($$record{"$where.$partid.award"}).' '.
+		    $mark{$$record{"$where.$partid.solved"}}.
 		    '<br />';
 	    }
-	    if (exists $$record{"$version:resource.$partid.regrader"}) {
-		$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+	    if (exists $$record{"$where.$partid.regrader"}) {
+		$displaySub[2].=$$record{"$where.$partid.regrader"}.
+		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+	    } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
+		$displaySub[2].=
+		    $$record{"$version:resource.$partid.regrader"}.
 		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
 	    }
 	}
@@ -3964,7 +4203,7 @@ sub updateGradeByPage {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+        if (ref($curRes) && $curRes->is_problem()) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
@@ -4019,9 +4258,8 @@ sub updateGradeByPage {
 		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
 		     (($score eq 'excused') ? 'excused' : $newpts).
 		    '&nbsp;<br />';
-
 		$question++;
-		next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+		next if ($dropMenu eq 'reset status' || ($newpts eq $oldpts && $score ne 'excused'));
 
 		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
 		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
@@ -4031,9 +4269,24 @@ sub updateGradeByPage {
 		$changeflag++;
 	    }
 	    if (scalar(keys(%newrecord)) > 0) {
+		my %record = 
+		    &Apache::lonnet::restore($symbx,$env{'request.course.id'},
+					     $udom,$uname);
+
+		if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+		    $newrecord{'resource.CODE'} = $env{'form.CODE'};
+		} elsif (&Apache::lonnet::validCODE($record{'resource.CODE'})) {
+		    $newrecord{'resource.CODE'} = '';
+		}
 		&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
 					$udom,$uname);
+		%record = &Apache::lonnet::restore($symbx,
+						   $env{'request.course.id'},
+						   $udom,$uname);
+		&check_and_remove_from_queue($parts,\%record,undef,$symbx,
+					     $cdom,$cnum,$udom,$uname);
 	    }
+	    
             if ($aggregateflag) {
                 &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                       $env{'course.'.$env{'request.course.id'}.'.domain'},
@@ -4096,7 +4349,7 @@ sub scantron_filenames {
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
-				    &Apache::loncommon::propath($cdom,$cname));
+				    &propath($cdom,$cname));
     my @possiblenames;
     foreach my $filename (sort(@files)) {
 	($filename)=split(/&/,$filename);
@@ -4147,14 +4400,14 @@ sub scantron_CODElist {
 }
 
 sub scantron_CODEunique {
-    my $result='<nobr>
+    my $result='<span style="white-space: nowrap;">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="yes" checked="checked" /> Yes </label>
-                </nobr>
-                <nobr>
+                </span>
+                <span style="white-space: nowrap;">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="no" /> No </label>
-                </nobr>';
+                </span>';
     return $result;
 }
 
@@ -4273,6 +4526,7 @@ SCANTRONFORM
     <tr>
       <form action='/adm/grades' name='scantron_download'>
         <td bgcolor="#777777">
+	  $default_form_data
           <input type="hidden" name="command" value="scantron_download" />
           <table width="100%" border="0">
             <tr bgcolor="#e6ffff">
@@ -4389,6 +4643,7 @@ sub scantron_fixup_scanline {
 		$answer=$alphabet[$args->{'response'}];
 	    } elsif ($on eq 'number') {
 		$answer=$args->{'response'}+1;
+		if ($answer == 10) { $answer = '0'; }
 	    } else {
 		substr($answer,$args->{'response'},1)=$on;
 	    }
@@ -4455,10 +4710,11 @@ sub scantron_parse_scanline {
 	substr($questions,0,$$scantron_config{'Qlength'})='';
 	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
 	if ($$scantron_config{'Qon'} eq 'letter') {
-	    if ($currentquest eq '?') {
+	    if ($currentquest eq '?'
+		|| $currentquest eq '*') {
 		push(@{$record{'scantron.doubleerror'}},$questnum);
 		$record{"scantron.$questnum.answer"}='';
-	    } elsif (!$currentquest 
+	    } elsif (!defined($currentquest)
 		     || $currentquest eq $$scantron_config{'Qoff'}
 		     || $currentquest !~ /^[A-Z]$/) {
 		$record{"scantron.$questnum.answer"}='';
@@ -4469,19 +4725,26 @@ sub scantron_parse_scanline {
 		$record{"scantron.$questnum.answer"}=$currentquest;
 	    }
 	} elsif ($$scantron_config{'Qon'} eq 'number') {
-	    if ($currentquest eq '?') {
+	    if ($currentquest eq '?'
+		|| $currentquest eq '*') {
 		push(@{$record{'scantron.doubleerror'}},$questnum);
 		$record{"scantron.$questnum.answer"}='';
-		} elsif (!$currentquest 
-			 || $currentquest eq $$scantron_config{'Qoff'} 
-			 || $currentquest !~ /^\d$/) {
+	    } elsif (!defined($currentquest)
+		     || $currentquest eq $$scantron_config{'Qoff'} 
+		     || $currentquest !~ /^\d$/) {
 		$record{"scantron.$questnum.answer"}='';
 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
 		    push(@{$record{"scantron.missingerror"}},$questnum);
 		}
 	    } else {
-		$record{"scantron.$questnum.answer"}=
-		    $alphabet[$currentquest-1];
+		# wrap zero back to J
+		if ($currentquest eq '0') {
+		    $record{"scantron.$questnum.answer"}=
+			$alphabet[9];
+		} else {
+		    $record{"scantron.$questnum.answer"}=
+			$alphabet[$currentquest-1];
+		}
 	    }
 	} else {
 	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
@@ -4611,21 +4874,29 @@ sub reset_skipping_status {
     &scantron_putfile(undef,$scan_data);
 }
 
-sub allow_skipping {
+sub start_skipping {
     my ($scan_data,$i)=@_;
     my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
-    delete($remembered{$i});
+    if ($env{'form.scantron_options_redo'} =~ /^redo_/) {
+	$remembered{$i}=2;
+    } else {
+	$remembered{$i}=1;
+    }
     &scan_data($scan_data,'remember_skipping',join(':',%remembered));
 }
 
 sub should_be_skipped {
-    my ($scan_data,$i)=@_;
+    my ($scanlines,$scan_data,$i)=@_;
     if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
 	# not redoing old skips
+	if ($scanlines->{'skipped'}[$i]) { return 1; }
 	return 0;
     }
     my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
-    if (exists($remembered{$i})) { return 0; }
+
+    if (exists($remembered{$i}) && $remembered{$i} != 2 ) {
+	return 0;
+    }
     return 1;
 }
 
@@ -4637,7 +4908,7 @@ sub remember_current_skipped {
 	    $to_remember{$i}=1;
 	}
     }
-    &Apache::lonnet::logthis('remembering '.join(':',%to_remember));
+
     &scan_data($scan_data,'remember_skipping',join(':',%to_remember));
     &scantron_putfile(undef,$scan_data);
 }
@@ -4653,15 +4924,15 @@ sub scantron_warning_screen {
     my ($button_text)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
-    my $CODElist="a";
+    my $CODElist;
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
 	$CODElist=$env{'form.scantron_CODElist'};
-	if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
+	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<font color="red">None</font>'; }
 	$CODElist=
 	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
-	    $CODElist.'</tt></td></tr>';
+	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
     }
     return (<<STUFF);
 <p>
@@ -4709,7 +4980,7 @@ $warning
 <input type="hidden" name="command" value="scantron_validate" />
 STUFF
     }
-    $r->print("</form><br />".&show_grading_menu_form($symb)."</body></html>");
+    $r->print("</form><br />".&show_grading_menu_form($symb));
     return '';
 }
 
@@ -4743,7 +5014,6 @@ sub scantron_validate_file {
     }
     if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {
 	&remember_current_skipped();
-	&scantron_remove_file('skipped');
 	$env{'form.scantron_options_redo'}='redo_skipped_ready';
     }
 
@@ -4810,8 +5080,7 @@ STUFF
 	    $r->print(" this scanline saving it for later.");
 	}
     }
-    $r->print(" </form><br />".&show_grading_menu_form($symb).
-	      "</body></html>");
+    $r->print(" </form><br />".&show_grading_menu_form($symb));
     return '';
 }
 
@@ -4914,8 +5183,8 @@ sub scantron_putfile {
 
 sub scantron_get_line {
     my ($scanlines,$scan_data,$i)=@_;
-    if (&should_be_skipped($scan_data,$i)) { return undef; }
-    if ($scanlines->{'skipped'}[$i]) { return undef; }
+    if (&should_be_skipped($scanlines,$scan_data,$i)) { return undef; }
+    #if ($scanlines->{'skipped'}[$i]) { return undef; }
     if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
     return $scanlines->{'orig'}[$i]; 
 }
@@ -4935,12 +5204,21 @@ sub scantron_put_line {
     my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
     if ($skip) {
 	$scanlines->{'skipped'}[$i]=$newline;
-	&allow_skipping($scan_data,$i);
+	&start_skipping($scan_data,$i);
 	return;
     }
     $scanlines->{'corrected'}[$i]=$newline;
 }
 
+sub scantron_clear_skip {
+    my ($scanlines,$scan_data,$i)=@_;
+    if (exists($scanlines->{'skipped'}[$i])) {
+	undef($scanlines->{'skipped'}[$i]);
+	return 1;
+    }
+    return 0;
+}
+
 sub scantron_filter_not_exam {
     my ($curres)=@_;
     
@@ -4972,7 +5250,7 @@ sub scantron_validate_sequence {
 	my @resources=
 	    $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
 	if (@resources) {
-	    $r->print("<p>".&mt('Some resource in the sequece currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
+	    $r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
 	    return (1,$currentphase);
 	}
     }
@@ -5126,11 +5404,11 @@ function change_radio(field) {
 </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'});
+	   "form=".&escape("scantronupload").
+	   "&scantron_format=".&escape($env{'form.scantron_format'}).
+	   "&scantron_CODElist=".&escape($env{'form.scantron_CODElist'}).
+	   "&curCODE=".&escape($$scan_record{'scantron.CODE'}).
+	   "&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
 	if ($env{'form.scantron_CODElist'} =~ /\S/) { 
 	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
 	    $r->print("\n<br />");
@@ -5427,6 +5705,10 @@ SCANTRONFORM
 
 	&Apache::lonxml::clear_problem_counter();
   	&Apache::lonnet::appenv(%$scan_record);
+
+	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
+	    &scantron_putfile($scanlines,$scan_data);
+	}
 	
 	my $i=0;
 	foreach my $resource (@resources) {
@@ -5437,8 +5719,9 @@ SCANTRONFORM
 		      'grade_domain'  =>$udom,
 		      'grade_courseid'=>$env{'request.course.id'},
 		      'grade_symb'    =>$resource->symb());
-	    if (exists($scan_record->{'scantron.CODE'}) &&
-		$scan_record->{'scantron.CODE'}) {
+	    if (exists($scan_record->{'scantron.CODE'})
+		&& 
+		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
 		$form{'CODE'}=$scan_record->{'scantron.CODE'};
 	    } else {
 		$form{'CODE'}='';
@@ -5559,7 +5842,6 @@ sub scantron_upload_scantron_data_save {
 sub valid_file {
     my ($requested_file)=@_;
     foreach my $filename (sort(&scantron_filenames())) {
-	&Apache::lonnet::logthis("$requested_file  $filename");
 	if ($requested_file eq $filename) { return 1; }
     }
     return 0;
@@ -5815,7 +6097,7 @@ sub handler {
     if ($#commands > 0) {
 	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
     }
-    &send_header($request);
+    $request->print(&Apache::loncommon::start_page('Grading'));
     if ($symb eq '' && $command eq '') {
 	if ($env{'user.adv'}) {
 	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
@@ -5906,27 +6188,10 @@ sub handler {
 	    $request->print("Access Denied ($command)");
 	}
     }
-    &send_footer($request);
+    $request->print(&Apache::loncommon::end_page());
     return '';
 }
 
-sub send_header {
-    my ($request)= @_;
-    $request->print(&Apache::lontexconvert::header());
-#  $request->print("
-#<script>
-#remotewindow=open('','homeworkremote');
-#remotewindow.close();
-#</script>"); 
-    $request->print(&Apache::loncommon::bodytag('Grading'));
-    $request->rflush();
-}
-
-sub send_footer {
-    my ($request)= @_;
-    $request->print('</body></html>');
-}
-
 1;
 
 __END__;