--- loncom/homework/inputtags.pm	2003/07/15 21:26:23	1.109
+++ loncom/homework/inputtags.pm	2003/10/13 21:09:47	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.109 2003/07/15 21:26:23 www Exp $
+# $Id: inputtags.pm,v 1.121 2003/10/13 21:09:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::inputtags;
 use HTML::Entities();
 use strict;
 use Apache::loncommon;
+use Apache::lonlocal;
 
 BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
@@ -111,7 +112,7 @@ 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 wrap="hard" name="HWVAL_'.$resid.'" '.
 	    "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	if ($oldresponse ne '') {
 	    #get rid of any startup text if the user has already responded
@@ -332,44 +333,50 @@ sub decideoutput {
 	'not_charged_try' => '#ffffaa',
 	'no_message' => '#fffff',
       );
-  if ($previous) { $previousmsg='You have entered that answer before'; }
+  if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
 
   if      ($solved =~ /^correct/) {
       if ($award eq 'ASSIGNED_SCORE') {
-	  $message = "A score has been assigned.";
+	  $message = &mt("A score has been assigned.");
       } else {
 	  if ($target eq 'tex') {
-	      $message = '\textbf{You are correct}.';
+	      $message = '\textbf{'.&mt('You are correct.').'}';
 	  } else {
-	      $message = "<b>You are correct.</b>";
+	      $message = "<b>".&mt('You are correct.')."</b>";
 	  }
           unless ($ENV{'course.'.
 			   $ENV{'request.course.id'}.
 			   '.disable_receipt_display'} eq 'yes') { 
-	      $message.='<br />Your receipt is '.&Apache::lonnet::receipt().
-		  &Apache::loncommon::help_open_topic('Receipt');
+	      $message.=(($target eq 'web')?'<br />':' ').
+		  &mt('Your receipt is').' '.&Apache::lonnet::receipt().
+       (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
       }
       $bgcolor=$possiblecolors{'correct'};
       $button=0;
       $previousmsg='';
   } elsif ($solved =~ /^excused/) {
-      $message = "<b>You are excused from the problem.</b>";
+      if ($target eq 'tex') {
+	  $message = ' \textbf{'.&mt('You are excused from the problem.').'} ';
+      } else {
+	  $message = "<b>".&mt('You are excused from the problem.')."</b>";
+      }
       $bgcolor=$possiblecolors{'charged_try'};
       $button=0;
       $previousmsg='';
   } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
       if ($solved =~ /^incorrect/ || $solved eq '') {
-	  $message = "Incorrect";
+	  $message = &mt("Incorrect");
 	  $bgcolor=$possiblecolors{'charged_try'};
 	  $button=1;
       } else {
-	  $message = "<b>You are correct.</b>";
+	  $message = "<b>".&mt('You are correct.')."</b>";
           unless ($ENV{'course.'.
 			   $ENV{'request.course.id'}.
 			   '.disable_receipt_display'} eq 'yes') { 
-              $message.='<br />Your receipt is '.&Apache::lonnet::receipt().
-		  &Apache::loncommon::help_open_topic('Receipt');
+	      $message.=(($target eq 'web')?'<br />':' ').
+		  'Your receipt is '.&Apache::lonnet::receipt().
+       (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
 	  $bgcolor=$possiblecolors{'correct'};
 	  $button=0;
@@ -380,58 +387,60 @@ sub decideoutput {
       $bgcolor=$possiblecolors{'no_feedback'};
       $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {
-      $message = 'Some parts were not submitted';
+      $message = &mt('Some parts were not submitted.');
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button = 1;
   } elsif ($award eq 'ERROR') {
-      $message = 'An error occured while grading your answer.';
+      $message = &mt('An error occured while grading your answer.');
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button = 1;
   } elsif ($award eq 'TOO_LONG') {
-      $message = "The submitted answer was too long.";
+      $message = &mt("The submitted answer was too long.");
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'WANTED_NUMERIC') {
-      $message = "This question expects a numeric answer";
+      $message = &mt("This question expects a numeric answer.");
       $bgcolor=$possiblecolors{'not_charged_try'};
       $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').'.';
+      $message = &mt('You have provided an invalid ranking');
+      if ($target ne 'tex') {
+	  $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+      }
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'INVALID_FILETYPE') {
-      $message = 'The filetype extension of the file you uploaded is not allowed.';
+      $message = &mt('The filetype extension of the file you uploaded is not allowed.');
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-      $message = "Please adjust significant figures.";# you provided %s significant figures";
+      $message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures";
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'UNIT_FAIL') {
-      $message = "Units incorrect. ".
-       &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
+      $message = &mt("Units incorrect.");
+      if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s";
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {
-      $message = "Only a number required.";# Computer reads units of %s";
+      $message = &mt("Only a number required.");# Computer reads units of %s";
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'NO_UNIT') {
-      $message = "Units required".
-	  &Apache::loncommon::help_open_topic('Physical_Units');
+      $message = &mt("Units required");
+      if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'BAD_FORMULA') {
-      $message = "Unable to understand formula";
+      $message = &mt("Unable to understand formula");
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'INCORRECT') {
-      $message = "Incorrect";
+      $message = &mt("Incorrect");
       $bgcolor=$possiblecolors{'charged_try'};
       $button=1;
   } elsif ($award eq 'SUBMITTED') {
-      $message = "Your submission has been recorded.";
+      $message = &mt("Your submission has been recorded.");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
   } elsif ($award eq 'DRAFT') {
@@ -443,11 +452,12 @@ sub decideoutput {
       $bgcolor=$possiblecolors{'correct'};
       $button=0;
   } else {
-      $message = "Unknown message: $award";
+      $message = &mt("Unknown message").": $award";
       $button=1;
   }
-  if (lc($Apache::lonhomework::problemstatus) eq 'no') {
-      $message = "Answer Submitted";
+  if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
+      $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
+      $message = &mt("Answer Submitted");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
   }
@@ -508,6 +518,9 @@ sub setgradedata {
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
+      }
       $Apache::lonhomework::results{"resource.$id.solved"} =
 	'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {
@@ -527,6 +540,7 @@ sub setgradedata {
       if (lc($Apache::lonhomework::problemstatus) eq 'no') {
 	  $Apache::lonhomework::results{"resource.$id.tries"} =
 	      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
       }
     }
 
@@ -607,12 +621,13 @@ sub gradestatus {
 
   my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");
-  if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') {  
+  if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&
+       $status ne 'INVALID_ACCESS') {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
     my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
     &Apache::lonxml::debug("Found Award |$award|$solved|");
-    if ( $award ne '' ) {
+    if ( $award ne '' || $solved ne '') {
       &Apache::lonxml::debug('Getting message');
       ($showbutton,$bgcolor,$message,$previousmsg) =
 	&decideoutput($award,$solved,$previous,$target);
@@ -634,18 +649,18 @@ sub gradestatus {
     if ( $showbutton ) {
       if ($target eq 'tex') {
 	  if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
-	      $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
+	      $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
 	  } else {
 	      $trystr = '\vskip 0 mm ';
 	  }
       } else {
-         $trystr = "<td>Tries $tries/$maxtries</td>";
+         $trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>";
       }
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
       if ($target ne 'tex') {
-        $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
+        $button = '<br /><input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
       }
     }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {