--- loncom/homework/inputtags.pm	2003/01/13 21:22:43	1.78
+++ loncom/homework/inputtags.pm	2003/05/08 15:33:15	1.100
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.78 2003/01/13 21:22:43 sakharuk Exp $
+# $Id: inputtags.pm,v 1.100 2003/05/08 15:33:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,9 +30,10 @@
 package Apache::inputtags;
 use HTML::Entities();
 use strict;
+use Apache::loncommon;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));
+  &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
 }
 
 
@@ -88,30 +89,30 @@ sub start_textfield {
 	if ( $cols eq '') { $cols = 80; }
 	my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
 	if ( $rows eq '') { $rows = 10; }
-	$result= '<textarea name="HWVAL'.$resid.'" '.
+	$result= '<textarea name="HWVAL_'.$resid.'" '.
 	    "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	if ($oldresponse ne '') {
 	    #get rid of any startup text if the user has already responded
-	    &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+	    &Apache::lonxml::get_all_text("/textfield",$parser);
 	}
     } else {
 	#right or wrong don't show it
 	#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
 	$result='';
 	#get rid of any startup text
-	&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+	&Apache::lonxml::get_all_text("/textfield",$parser);
     }
   } elsif ($target eq 'grade') {
-    my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
-    if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
+    my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
+    if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) {
       # if the seed text is still there it wasn't a real submission
-      $ENV{'form.HWVAL'.$resid}='';
+      $ENV{'form.HWVAL_'.$resid}='';
     }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
     $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
-    my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+    my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -123,11 +124,17 @@ sub start_textfield {
     }
     $result.=&Apache::edit::modifiedfield();
   } elsif ($target eq 'tex') {
+      my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
+      my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
       if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') {
-	  my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval);
 	  $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';
-	for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
-	$result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
+	  for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
+	  $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
+      } else {
+	  my $TeXwidth=$width_of_box/80;
+	  $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';
+	  for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
+	  $result.='}}}\vskip 2 mm ';
       }
   }
   return $result;
@@ -153,17 +160,17 @@ sub start_textline {
   my $result = "";
   if ($target eq 'web') {
     $Apache::lonxml::evaluate--;
+    my $partid=$Apache::inputtags::part;
+    my $id=$Apache::inputtags::response[-1];
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
       my $maxlength;
       if ($size eq '') { $size=20; } else {
 	if ($size < 20) { $maxlength=$size; }
       }
-      my $partid=$Apache::inputtags::part;
-      my $id=$Apache::inputtags::response[-1];
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {
-        $result= '<input type="text" name="HWVAL'.$id.'" value="'.
+        $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
 	    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
       }
     } else {
@@ -193,6 +200,34 @@ sub end_textline {
   return "";
 }
 
+sub start_hiddenline {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result = "";
+    if ($target eq 'web') {
+	$Apache::lonxml::evaluate--;
+	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+	    my $partid=$Apache::inputtags::part;
+	    my $id=$Apache::inputtags::response[-1];
+	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+	    if ($Apache::lonhomework::type ne 'exam') {
+		$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.
+		    $oldresponse.'" />';
+	    }
+	}
+    } elsif ($target eq 'edit') {
+	$result=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::end_table;
+    }
+    return $result;
+}
+
+sub end_hiddenline {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
+  elsif ($target eq 'edit') { return ('','no'); }
+  return "";
+}
+
 sub finalizeawards {
   my $result='';
   my $award;
@@ -239,12 +274,21 @@ sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }
   if ($result eq '' ) {
+      foreach $award (@_) { if ($award eq 'MISORDERED_RANK') {$result=$award; last;} }
+  }
+  if ($result eq '' ) {
+      foreach $award (@_) { if ($award eq 'INVALID_FILETYPE') {$result=$award; last;} }
+  }
+  if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
   }
   if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
   }
   if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} }
+  }
+  if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }
   if ($result eq '' ) { $result='EXACT_ANS'; }
@@ -260,69 +304,98 @@ sub decideoutput {
   if ($previous) { $previousmsg='You have entered that answer before'; }
 
   if      ($solved =~ /^correct/) {
-    if ($target eq 'tex') {
-      $message = '\textbf{You are correct}. Your receipt is '.
-      &Apache::lonnet::receipt;
-    } else {
-      $message = "<b>You are correct.</b> Your receipt is ".
-      &Apache::lonnet::receipt;
-    }
-    $button=0;
-    $previousmsg='';
+      if ($award eq 'ASSIGNED_SCORE') {
+	  $message = "A score has been assigned.";
+      } else {
+	  if ($target eq 'tex') {
+	      $message = '\textbf{You are correct}.';
+	  } else {
+	      $message = "<b>You are correct.</b>";
+	  }
+	  $message=' Your receipt is '.&Apache::lonnet::receipt;
+      }
+      $button=0;
+      $previousmsg='';
   } elsif ($solved =~ /^excused/) {
-    $message = "<b>You are excused from the problem.</b>";
-    $button=0;
-    $previousmsg='';
-  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    if ($solved =~ /^incorrect/ || $solved eq '') {
-      $message = "Incorrect";
-      $button=1;
-    } else {
-      $message = "<b>You are correct.</b> Your receipt is ".
-	&Apache::lonnet::receipt;
+      $message = "<b>You are excused from the problem.</b>";
       $button=0;
       $previousmsg='';
-    }
+  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+      if ($solved =~ /^incorrect/ || $solved eq '') {
+	  $message = "Incorrect";
+	  $button=1;
+      } else {
+	  $message = "<b>You are correct.</b> Your receipt is ".
+	   &Apache::lonnet::receipt;
+	  $button=0;
+	  $previousmsg='';
+      }
   } elsif ($award eq 'NO_RESPONSE') {
-    $message = '';
-    $button=1;
+      $message = '';
+      $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {
-    $message = 'Some parts were not submitted';
-    $button = 1;
+      $message = 'Some parts were not submitted';
+      $button = 1;
   } elsif ($award eq 'WANTED_NUMERIC') {
-    $message = "This question expects a numeric answer";
-    $button=1;
+      $message = "This question expects a numeric answer";
+      $button=1;
+  } elsif ($award eq 'MISORDERED_RANK') {
+      $message = 'You have provided an invalid ranking, please refer to '.
+       &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+      $button=1;
+  } elsif ($award eq 'INVALID_FILETYPE') {
+      $message = 'The filetype extension of the file you uploaded is not allowed.';
+      $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-    $message = "Please adjust significant figures.";# you provided %s significant figures";
-    $button=1;
+      $message = "Please adjust significant figures.";# you provided %s significant figures";
+      $button=1;
   } elsif ($award eq 'UNIT_FAIL') {
-    $message = "Units incorrect."; #Computer reads units as %s";
-    $button=1;
+      $message = "Units incorrect. ".
+       &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
+      $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {
-    $message = "Only a number required.";# Computer reads units of %s";
-    $button=1;
+      $message = "Only a number required.";# Computer reads units of %s";
+      $button=1;
   } elsif ($award eq 'NO_UNIT') {
-    $message = "Units required";
-    $button=1;
+      $message = "Units required".
+       &Apache::loncommon::help_open_topic('Physical_Units');
+      $button=1;
   } elsif ($award eq 'BAD_FORMULA') {
-    $message = "Unable to understand formula";
-    $button=1;
+      $message = "Unable to understand formula";
+      $button=1;
   } elsif ($award eq 'INCORRECT') {
-    $message = "Incorrect";
-    $button=1;
+      $message = "Incorrect";
+      $button=1;
   } elsif ($award eq 'SUBMITTED') {
-    $message = "Your submission has been recorded.";
-    $button=1;
+      $message = "Your submission has been recorded.";
+      $button=1;
   } elsif ($award eq 'DRAFT') {
-    $message = "A draft copy has been saved.";
-    $button=1;
+      $message = "A draft copy has been saved.";
+      $button=1;
+  } elsif ($award eq 'ASSIGNED_SCORE') {
+      $message = "A score has been assigned.";
+      $button=0;
   } else {
-    $message = "Unknown message: $award";
-    $button=1;
+      $message = "Unknown message: $award";
+      $button=1;
+  }
+  if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+      $message = "Answer Submitted";
+      $button=1;
   }
   return ($button,$message,$previousmsg);
 }
 
+sub removealldata {
+    my ($id)=@_;
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
+	    &Apache::lonxml::debug("Removing $key");
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub setgradedata {
   my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status
@@ -331,16 +404,38 @@ sub setgradedata {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
-       /^correct/ ) {
+       /^correct/ || $Apache::lonhomework::scantronmode) {
     #handle assignment of tries and solved status
+    my $solvemsg;
+    if ($Apache::lonhomework::scantronmode) {
+	$solvemsg='correct_by_scantron';
+    } else {
+	$solvemsg='correct_by_student';
+    }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
       $Apache::lonhomework::results{"resource.$id.afterduedate"}='';
     }
-    if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
+    if ( $award eq 'ASSIGNED_SCORE') {
+	$Apache::lonhomework::results{"resource.$id.tries"} =
+	    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+	$Apache::lonhomework::results{"resource.$id.solved"} =
+	    $solvemsg;
+	my $numawards=scalar(@Apache::inputtags::responselist);
+	&Apache::lonxml::debug("Whaaa!");
+	$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
+	foreach my $res (@Apache::inputtags::responselist) {
+	    $Apache::lonhomework::results{"resource.$id.awarded"}+=
+	       $Apache::lonhomework::results{"resource.$id.$res.awarded"};
+	}
+	if ($numawards > 0) {
+	    $Apache::lonhomework::results{"resource.$id.awarded"}/=
+		$numawards;
+	}
+    } elsif ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
       $Apache::lonhomework::results{"resource.$id.solved"} =
-	'correct_by_student';
+	$solvemsg;
       $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
@@ -355,7 +450,9 @@ sub setgradedata {
     } elsif ( $award eq 'DRAFT' ) {
       $Apache::lonhomework::results{"resource.$id.solved"} = '';
     } elsif ( $award eq 'NO_RESPONSE' ) {
-      return '';
+	#no real response so delete any data that got stored
+	&removealldata($id);
+	return '';
     } else {
       $Apache::lonhomework::results{"resource.$id.solved"} =
 	'incorrect_attempted';
@@ -369,17 +466,18 @@ sub setgradedata {
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       #delete all data as they student didn't do anything, but save
       #the list of collaborators.
-      foreach my $key (keys(%Apache::lonhomework::results)) {
-	if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
-	  &Apache::lonxml::debug("Removing $key");
-  delete($Apache::lonhomework::results{$key});
-	}
-      }
+      &removealldata($id);
       #and since they didn't do anything we were never here
       return '';
     } else {
       $Apache::lonhomework::results{"resource.$id.previous"} = '0';
     }
+  } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
+	    /^correct/ ) {
+      #delete all data as they student already has it correct
+      &removealldata($id);
+      #and since they didn't do anything we were never here
+      return '';
   }
   $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }
@@ -460,8 +558,10 @@ sub gradestatus {
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {
       if ($target eq 'tex') {
-	  if ($ENV{'request.state'} ne "construct") {
-	      $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';
+	  if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
+	      $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
+	  } else {
+	      $trystr = '\vskip 0 mm ';
 	  }
       } else {
          $trystr = "<td>Tries $tries/$maxtries</td>";