--- loncom/homework/inputtags.pm 2003/01/24 22:02:45 1.81
+++ loncom/homework/inputtags.pm 2003/04/07 22:18:11 1.88
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.81 2003/01/24 22:02:45 www Exp $
+# $Id: inputtags.pm,v 1.88 2003/04/07 22:18:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@
package Apache::inputtags;
use HTML::Entities();
use strict;
+use Apache::loncommon;
BEGIN {
&Apache::lonxml::register('Apache::inputtags',('textfield','textline'));
@@ -92,17 +93,17 @@ sub start_textfield {
"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='
';
$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]);
+ 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}='';
@@ -111,7 +112,7 @@ 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);
- 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,
@@ -309,13 +310,15 @@ sub decideoutput {
$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";
+ $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;
} elsif ($award eq 'NO_UNIT') {
- $message = "Units required";
+ $message = "Units required".
+ &Apache::loncommon::help_open_topic('Physical_Units');
$button=1;
} elsif ($award eq 'BAD_FORMULA') {
$message = "Unable to understand formula";
@@ -333,9 +336,20 @@ sub decideoutput {
$message = "Unknown message: $award";
$button=1;
}
+ if ($Apache::lonhomework::type eq 'exam') {$message='';$previousmsg='';}
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
@@ -368,7 +382,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';
@@ -382,17 +398,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;
}
@@ -475,6 +492,8 @@ sub gradestatus {
if ($target eq 'tex') {
if ($ENV{'request.state'} ne "construct") {
$trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';
+ } else {
+ $trystr = '\vskip 0 mm ';
}
} else {
$trystr = "Tries $tries/$maxtries | ";