--- loncom/homework/grades.pm	2006/10/17 20:19:31	1.380
+++ loncom/homework/grades.pm	2006/10/24 01:03:54	1.382
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.380 2006/10/17 20:19:31 albertel Exp $
+# $Id: grades.pm,v 1.382 2006/10/24 01:03:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1469,7 +1469,8 @@ sub get_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)' : 
@@ -1492,10 +1493,10 @@ sub gradeBox {
     my $increment = &get_increment();
     $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
     while ($thisweight<=$wgt) {
-	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+	$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
 	    $thisweight.')" value="'.$thisweight.'" '.
-	    ($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></nobr></td>\n";
+	    ($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></span></td>\n";
 	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
         $thisweight += $increment;
 	$ctr++;
@@ -1512,14 +1513,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>&nbsp;</option>'.
 	    '<option selected="on">excused</option>';
     } else {
-	$result.='<option selected="on"> </option>'.
+	$result.='<option selected="on">&nbsp;</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="'.
@@ -1569,12 +1570,14 @@ sub handback_box {
 }
 
 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;
@@ -1584,8 +1587,10 @@ sub show_problem {
     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;
@@ -1640,7 +1645,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
@@ -3776,6 +3782,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";
 
@@ -3806,8 +3815,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";
 
@@ -3830,9 +3839,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++;
 	}
     }
@@ -3868,6 +3878,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);
 
@@ -3892,7 +3907,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.
@@ -3917,11 +3937,12 @@ sub displayPage {
 	    $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');
 	    } 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>
@@ -3972,9 +3993,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);
@@ -4200,10 +4221,20 @@ 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);
-		my %record = &Apache::lonnet::restore($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);
 	    }
@@ -4321,14 +4352,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;
 }