--- loncom/homework/inputtags.pm	2004/04/29 07:57:47	1.141
+++ loncom/homework/inputtags.pm	2004/06/28 15:01:44	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.141 2004/04/29 07:57:47 albertel Exp $
+# $Id: inputtags.pm,v 1.147 2004/06/28 15:01:44 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,6 +65,9 @@ sub initialize_inputtags {
     @Apache::inputtags::importlist=();
     # just used to note whether we have seen a response that isn't in a part
     $Apache::inputtags::response_with_no_part=0;
+    # storage location so the begin <*response> tag can generate the correct
+    # answer string for display by the <textline />
+    %Apache::inputtags::answertxt=();
 }
 
 sub check_for_duplicate_ids {
@@ -122,15 +125,17 @@ sub start_textfield {
 	    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
 	    if ( $cols eq '') { $cols = 80; }
 	    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
-	    if ( $rows eq '') { $rows = 10; }
+	    if ( $rows eq '') { $rows = 16; }
 	    my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 	    $result='';
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" '.
+	    push @Apache::lonxml::htmlareafields,'HWVAL_'.$resid;
+	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="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);
 	    }
@@ -222,8 +227,8 @@ sub start_textline {
 	    }
 	} else {
 	    #right or wrong don't show what was last typed in.
-	    #$result='<i>'.$oldresponse.'</i>';
-	    $result='';
+	    $result='<i>'.$Apache::inputtags::answertxt{$id}.'</i>';
+	    #$result='';
 	}
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
@@ -342,6 +347,7 @@ sub decideoutput {
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
 	    }
+	    $message.= " ".&mt(" Computer's answer now shown.");
 	    unless ($ENV{'course.'.
 			     $ENV{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') { 
@@ -364,11 +370,16 @@ sub decideoutput {
 	$previousmsg='';
     } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
 	if ($solved =~ /^incorrect/ || $solved eq '') {
-	    $message = &mt("Incorrect");
+	    $message = &mt("Incorrect").".";
 	    $bgcolor=$possiblecolors{'charged_try'};
 	    $button=1;
 	} else {
-	    $message = "<b>".&mt('You are correct.')."</b>";
+	    if ($target eq 'tex') {
+		$message = '\textbf{'.&mt('You are correct.').'}';
+	    } else {
+		$message = "<b>".&mt('You are correct.')."</b>";
+	    }
+	    $message.= " ".&mt(" Computer's answer now shown.");
 	    unless ($ENV{'course.'.
 			     $ENV{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') { 
@@ -412,7 +423,11 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'SIG_FAIL') {
-	$message = &mt("Significant figures are incorrect, you provided [_1] significant figures while [_2] to [_3] were expected. Submission not graded.",(split(/:/,$awardmsg)));
+	my ($used,$min,$max)=split(':',$awardmsg);
+	my $word;
+	if ($used < $min) { $word=&mt('more'); }
+	if ($used > $max) { $word=&mt('fewer'); }
+	$message = &mt("Submission not graded.  Use [_2] digits.",$used,$word);
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
@@ -421,21 +436,21 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {
-	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>');
+	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>.');
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
-	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.','<tt>'.$awardmsg.'</tt>');
+	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units ','<tt>'.$awardmsg.'</tt>.');
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
-	$message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>');
+	$message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>.');
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'NO_UNIT') {
-	$message = &mt("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;
@@ -444,7 +459,7 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'INCORRECT') {
-	$message = &mt("Incorrect");
+	$message = &mt("Incorrect").'.';
 	$bgcolor=$possiblecolors{'charged_try'};
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
@@ -452,13 +467,16 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'correct'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
-	$message = "A draft copy has been saved.";
+	$message = &mt("A draft copy has been saved.");
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'ASSIGNED_SCORE') {
-	$message = "A score has been assigned.";
+	$message = &mt("A score has been assigned.");
 	$bgcolor=$possiblecolors{'correct'};
 	$button=0;
+    } elsif ($award eq '') {
+	$bgcolor=$possiblecolors{'not_charged_try'};
+	$button=1;
     } else {
 	$message = &mt("Unknown message").": $award";
 	$button=1;
@@ -469,6 +487,9 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'correct'};
 	$button=1;
     }
+    if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
+	$message.=" ".&mt("Computer's answer now shown.");
+    }
     return ($button,$bgcolor,$message,$previousmsg);
 }
 
@@ -482,6 +503,20 @@ sub removealldata {
     }
 }
 
+sub hidealldata {
+    my ($id)=@_;
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
+	    &Apache::lonxml::debug("Hidding $key");
+	    my $newkey=$key;
+	    $newkey=~s/^(resource\.\Q$id\E\.[^\.]+\.)(.*)$/${1}hidden${2}/;
+	    $Apache::lonhomework::results{$newkey}=
+		$Apache::lonhomework::results{$key};
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub setgradedata {
     my ($award,$msg,$id,$previously_used) = @_;
     # if the student already has it correct, don't modify the status
@@ -652,7 +687,7 @@ sub gradestatus {
 	my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
 	my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"};
 	&Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg");
-	if ( $award ne '' || $solved ne '') {
+	if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') {
 	    &Apache::lonxml::debug('Getting message');
 	    ($showbutton,$bgcolor,$message,$previousmsg) =
 		&decideoutput($award,$awardmsg,$solved,$previous,$target);
@@ -677,7 +712,7 @@ sub gradestatus {
 	if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
 	if ( $showbutton ) {
 	    if ($target eq 'tex') {
-		if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
+		if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') {
 		    $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
 		} else {
 		    $trystr = '\vskip 0 mm ';