--- loncom/homework/grades.pm	2005/06/03 18:23:19	1.269
+++ loncom/homework/grades.pm	2005/06/05 06:12:16	1.274
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.269 2005/06/03 18:23:19 raeburn Exp $
+# $Id: grades.pm,v 1.274 2005/06/05 06:12:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1352,15 +1352,14 @@ sub gradeBox {
     my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
 
     my $display_part=&get_display_part($partid,undef,$symb);
-    my @partids = ("$partid");
-    my %last_resets = ();
-    &get_last_resets($symb,$env{'request.course.id'},\%last_resets,\@partids);
-    my $aggtries;
+
+    my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+				       [$partid]);
+    my $aggtries = $$record{'resource.'.$partid.'.tries'};
     if ($last_resets{$partid}) {
         $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
-    } else {
-        $aggtries = $$record{'resource.'.$partid.'.tries'};
     }
+
     $result.='<table border="0"><tr><td>'.
 	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
 
@@ -2156,17 +2155,17 @@ sub saveHandGrade {
 	    }
 	    $newrecord{'resource.'.$new_part.'.regrader'}=
 		"$env{'user.name'}:$env{'user.domain'}";
-            my @partids = ("$new_part");
-            my %last_resets = ();
-            &get_last_resets($symb,$env{'request.course.id'},\%last_resets,\@partids);
-            my ($totaltries,$aggtries,$solvedstatus);
-            $totaltries = $record{'resource.'.$part.'.tries'};
+            my $totaltries = $record{'resource.'.$part.'.tries'};
+
+            my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+					       [$new_part]);
+            my $aggtries =$totaltries;
             if ($last_resets{$new_part}) {
-                $aggtries = &get_num_tries(\%record,$last_resets{$new_part},$new_part);
-            } else {
-                $aggtries = $totaltries;
+                $aggtries = &get_num_tries(\%record,$last_resets{$new_part},
+					   $new_part);
             }
-            $solvedstatus = $record{'resource.'.$new_part.'.solved'};
+
+            my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
             if ($aggtries > 0) {
                 &decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
                 $aggregateflag = 1;
@@ -2270,22 +2269,20 @@ sub decrement_aggs {
 
 # ----------- Determine timestamps for last reset of aggregate totals for parts  
 sub get_last_resets {
-    my ($symb,$courseid,$last_resets,$partids) =@_;
+    my ($symb,$courseid,$partids) =@_;
+    my %last_resets;
     my $cdom = $env{'course.'.$courseid.'.domain'};
     my $cname = $env{'course.'.$courseid.'.num'};
-    my %resethash = &Apache::lonnet::restore($symb,'nohist_resourcetracker',$cdom,$cname);
-    if ($resethash{'version'}) {
-        foreach my $part (@{$partids}) {
-            $$last_resets{$part} = '';
-            for (my $version=$resethash{'version'};$version>=1;$version--) {
-                if (exists($resethash{$version.':'.$part."\0".'prev_attempts'})) {
-                    $$last_resets{$part} = $resethash{$version.':timestamp'};
-                    last;
-                }
-            }
-        }
+    my @keys;
+    foreach my $part (@{$partids}) {
+	push(@keys,"$symb\0$part\0resettime");
+    }
+    my %results=&Apache::lonnet::get('nohist_resourcetracker',\@keys,
+				     $cdom,$cname);
+    foreach my $part (@{$partids}) {
+	$last_resets{$part}=$results{"$symb\0$part\0resettime"};
     }
-    return;
+    return %last_resets;
 }
 
 # ----------- Handles creating versions for portfolio files as answers
@@ -2630,9 +2627,8 @@ sub viewgrades {
     }
     $result.='</tr>';
 
-    # retrieve last reset information
-    my %last_resets = ();
-    &get_last_resets($symb,$env{'request.course.id'},\%last_resets,\@partids);
+    my %last_resets = 
+	&get_last_resets($symb,$env{'request.course.id'},\@partids);
 
     #get info for each student
     #list all the students - with points and grade status
@@ -2675,12 +2671,13 @@ sub viewstudentgrade {
         $result.='<td align="middle">';
         my ($aggtries,$totaltries);
         unless (exists($aggregates{$part})) {
-            $totaltries = $record{'resource.'.$part.'.tries'};
+	    $totaltries = $record{'resource.'.$part.'.tries'};
+
+	    $aggtries = $totaltries;
             if ($$last_resets{$part}) {  
-                $aggtries = &get_num_tries(\%record,$$last_resets{$part},$part);
-            } else {
-                $aggtries = $totaltries;
-            } 
+                $aggtries = &get_num_tries(\%record,$$last_resets{$part},
+					   $part);
+            }
             $result.='<input type="hidden" name="'.
                 'GD_'.$student.'_'.$part.'_aggtries" value="'.$aggtries.'" />'."\n";
             $result.='<input type="hidden" name="'.
@@ -3876,12 +3873,12 @@ sub scantron_CODElist {
 
 sub scantron_CODEunique {
     my $result='<nobr>
-                 <input type="radio" name="scantron_CODEunique"
-                        value="Yes" checked="on" /> Yes
+                 <label><input type="radio" name="scantron_CODEunique"
+                        value="Yes" checked="on" /> Yes </label>
                 </nobr>
                 <nobr>
-                 <input type="radio" name="scantron_CODEunique"
-                        value="No" /> No
+                 <label><input type="radio" name="scantron_CODEunique"
+                        value="No" /> No </label>
                 </nobr>';
     return $result;
 }
@@ -3931,8 +3928,8 @@ sub scantron_selectphase {
           <tr bgcolor="#ffffe6">
 	    <td> Options: </td>
             <td>
-                <input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records <br />
-                <input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections
+	       <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
+               <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label>
 	    </td>
           </tr>
           <tr bgcolor="#ffffe6">
@@ -4111,7 +4108,14 @@ sub scantron_fixup_scanline {
 	    &scan_data($scan_data,
 		       "$whichline.no_bubble.".$args->{'question'},'1');
 	} else {
-	    substr($answer,$args->{'response'},1)=$on;
+	    if ($on eq 'letter') {
+		my @alphabet=('A'..'Z');
+		$answer=$alphabet[$args->{'response'}];
+	    } elsif ($on eq 'number') {
+		$answer=$args->{'response'}+1;
+	    } else {
+		substr($answer,$args->{'response'},1)=$on;
+	    }
 	    &scan_data($scan_data,
 		       "$whichline.no_bubble.".$args->{'question'},undef,'1');
 	}
@@ -4172,8 +4176,12 @@ 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 || $currentquest eq $$scantron_config{'Qoff'} ||
-		$currentquest !~ /^[A-Z]$/) {
+	    if ($currentquest eq '?') {
+		push(@{$record{'scantron.doubleerror'}},$questnum);
+		$record{"scantron.$questnum.answer"}='';
+	    } elsif (!$currentquest 
+		     || $currentquest eq $$scantron_config{'Qoff'}
+		     || $currentquest !~ /^[A-Z]$/) {
 		$record{"scantron.$questnum.answer"}='';
 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
 		    push(@{$record{"scantron.missingerror"}},$questnum);
@@ -4182,8 +4190,12 @@ sub scantron_parse_scanline {
 		$record{"scantron.$questnum.answer"}=$currentquest;
 	    }
 	} elsif ($$scantron_config{'Qon'} eq 'number') {
-	    if (!$currentquest || $currentquest eq $$scantron_config{'Qoff'} ||
-		$currentquest !~ /^\d$/) {
+	    if ($currentquest eq '?') {
+		push(@{$record{'scantron.doubleerror'}},$questnum);
+		$record{"scantron.$questnum.answer"}='';
+		} elsif (!$currentquest 
+			 || $currentquest eq $$scantron_config{'Qoff'} 
+			 || $currentquest !~ /^\d$/) {
 		$record{"scantron.$questnum.answer"}='';
 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
 		    push(@{$record{"scantron.missingerror"}},$questnum);
@@ -4738,19 +4750,22 @@ sub scantron_get_correction {
 	$r->print("<p>How should I handle this? <br /> \n");
 	$r->print("\n<br /> ");
 	my $i=0;
-	if ($error eq 'incorrectCODE') {
+	if ($error eq 'incorrectCODE' 
+	    && $$scan_record{'scantron.CODE'}=~/\S/ ) {
 	    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("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
 		$r->print("\n<br />");
 		$i++;
 	    }
 	}
-	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 />");
+	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
+	    my $checked; if (!$i) { $checked=' checked="on" '; }
+	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
+	    $r->print("\n<br />");
+	}
 
 	$r->print(<<ENDSCRIPT);
 <script type="text/javascript">
@@ -4769,9 +4784,9 @@ ENDSCRIPT
 	   "&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("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
 	$r->print("\n<br />");
-	$r->print("<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("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
 	$r->print("\n<br /><br />");
     } elsif ($error eq 'doublebubble') {
 	$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
@@ -4804,21 +4819,26 @@ ENDSCRIPT
 sub scantron_bubble_selector {
     my ($r,$scan_config,$quest,@selected)=@_;
     my $max=$$scan_config{'Qlength'};
+
+    my $scmode=$$scan_config{'Qon'};
+    if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }	     
+
     my @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">');
+	$r->print("\n".'<td align="center">');
 	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
 	else { $r->print('&nbsp;'); }
 	$r->print('</td>');
     }
-    $r->print('<td></td></tr><tr>');
+    $r->print('</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("\n".
+		  '<td><label><input type="radio" name="scantron_correct_Q_'.
+		  $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
     }
-    $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
-	      '" value="none" /> No bubble </td>');
+    $r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
+	      $quest.'" value="none" /> No bubble </label></td>');
     $r->print('</tr></table>');
 }