--- loncom/homework/inputtags.pm	2003/09/23 15:44:39	1.114.2.2
+++ loncom/homework/inputtags.pm	2003/12/22 22:24:21	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.114.2.2 2003/09/23 15:44:39 albertel Exp $
+# $Id: inputtags.pm,v 1.125 2003/12/22 22:24:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,13 +24,12 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# 2/19 Guy 
 
 package Apache::inputtags;
 use HTML::Entities();
 use strict;
 use Apache::loncommon;
+use Apache::lonlocal;
 
 BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
@@ -97,6 +96,16 @@ sub end_input {
   return '';
 }
 
+sub addchars {
+    my ($fieldid,$addchars)=@_;
+    my $output='';
+    foreach (split(/\,/,$addchars)) {
+	$output.='<a href="javascript:void(document.forms.lonhomework.'.
+	    $fieldid.'.value+=\''.$_.'\')">'.$_.'</a> ';
+    }
+    return $output;
+}
+
 sub start_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
@@ -111,7 +120,12 @@ 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.'" '.
+	my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
+	$result='';
+        if ($addchars) {
+	    $result.=&addchars('HWVAL_'.$resid,$addchars);
+	}
+	$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
@@ -134,18 +148,19 @@ sub start_textfield {
     $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);
+    $result.=&Apache::edit::text_arg
+	('Click-On Texts (comma sep):','addchars',$token,10);
     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,
-						 $safeeval,'rows','cols');
+					   $safeeval,'rows','cols','addchars');
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
     } else {
       $result=$token->[4];
     }
-    my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
-    $result.=&Apache::edit::modifiedfield();
+    $result.=&Apache::edit::modifiedfield("/textfield",$parser);
   } 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);
@@ -193,7 +208,12 @@ sub start_textline {
       }
       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="'.
+	my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
+	$result='';
+        if ($addchars) {
+	    $result.=&addchars('HWVAL_'.$id,$addchars);
+	}
+        $result.= '<input type="text" name="HWVAL_'.$id.'" value="'.
 	    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
       }
     } else {
@@ -203,10 +223,12 @@ sub start_textline {
     }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
-    $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
+    $result.=&Apache::edit::text_arg('Size:','size',$token,'5').
+	&Apache::edit::text_arg
+	('Click-On Texts (comma sep):','addchars',$token,10)."</td></tr>";
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
-    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
@@ -332,22 +354,22 @@ 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.=(($target eq 'web')?'<br />':' ').
-		  'Your receipt is '.&Apache::lonnet::receipt().
+		  &mt('Your receipt is').' '.&Apache::lonnet::receipt().
        (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
       }
@@ -356,20 +378,20 @@ sub decideoutput {
       $previousmsg='';
   } elsif ($solved =~ /^excused/) {
       if ($target eq 'tex') {
-	  $message = ' \textbf{You are excused from the problem.} ';
+	  $message = ' \textbf{'.&mt('You are excused from the problem.').'} ';
       } else {
-	  $message = "<b>You are excused from the problem.</b>";
+	  $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') { 
@@ -386,60 +408,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';
+      $message = &mt('You have provided an invalid ranking');
       if ($target ne 'tex') {
-	  $message.=', please refer to '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+	  $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. ";
+      $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";
+      $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') {
@@ -451,12 +473,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'  && 
       $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
-      $message = "Answer Submitted";
+      $message = &mt("Answer Submitted");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
   }
@@ -517,7 +539,7 @@ sub setgradedata {
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
-      if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+      if (lc($Apache::lonhomework::problemstatus) eq 'no') {
 	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
       }
       $Apache::lonhomework::results{"resource.$id.solved"} =
@@ -620,7 +642,8 @@ 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"};
@@ -641,24 +664,28 @@ sub gradestatus {
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     &Apache::lonxml::debug("got maxtries of :$maxtries:");
+    #if tries are set to negative turn off the Tries/Button and messages
+    if (defined($maxtries) && $maxtries < 0) { return ''; }
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     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";
+	  if($ENV{'request.state'} ne 'construct') { $trystr.="/$maxtries"; }
+	  $trystr.="</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"}) {