--- loncom/homework/inputtags.pm 2006/07/19 20:54:19 1.203
+++ loncom/homework/inputtags.pm 2007/02/27 17:52:16 1.215
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.203 2006/07/19 20:54:19 www Exp $
+# $Id: inputtags.pm,v 1.215 2007/02/27 17:52:16 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -140,9 +140,9 @@ sub start_textfield {
my $resid=$Apache::inputtags::response[-1];
if ($target eq 'web') {
$Apache::lonxml::evaluate--;
+ my $partid=$Apache::inputtags::part;
+ my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
- my $partid=$Apache::inputtags::part;
- my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
if ( $cols eq '') { $cols = 80; }
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
@@ -161,9 +161,13 @@ sub start_textfield {
&Apache::lonxml::get_all_text("/textfield",$parser,$style);
}
} else {
- #right or wrong don't show it
- #$result='
'.$oldresponse.'
';
- $result='';
+ #show past answer in the essayresponse case
+ if ($oldresponse =~ /\S/
+ && &Apache::londefdef::is_inside_of($tagstack,
+ 'essayresponse') ) {
+ $result='
'.
+ $oldresponse.'
';
+ }
#get rid of any startup text
&Apache::lonxml::get_all_text("/textfield",$parser,$style);
}
@@ -279,20 +283,27 @@ sub needs_exam_box {
sub start_textline {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result = "";
+ my $input_id = &start_input($parstack,$safeeval);
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'
- || lc($Apache::lonhomework::problemstatus) eq 'no'
- || ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER'
- && $Apache::lonhomework::history{"resource.$partid.solved"} !~ /^correct/ )) {
+ if (!&Apache::response::show_answer()) {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
my $maxlength;
if ($size eq '') { $size=20; } else {
- if ($size < 20) { $maxlength=$size; }
+ if ($size < 20) {
+ $maxlength = ' maxlength="'.$size.'"';
+ }
+ }
+ my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
+
+ if (ref($oldresponse) eq 'ARRAY') {
+ $oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
}
- my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
+ $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+
if ($Apache::lonhomework::type ne 'exam') {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';
@@ -311,8 +322,8 @@ sub start_textline {
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
}
- $result.= '';
+ $result.= '';
}
if ($Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {
@@ -320,7 +331,8 @@ sub start_textline {
}
} else {
#right or wrong don't show what was last typed in.
- $result=''.$Apache::inputtags::answertxt{$id}.'';
+ my $count = scalar(@Apache::inputtags::inputlist)-1;
+ $result=''.$Apache::inputtags::answertxt{$id}[$count].'';
#$result='';
}
} elsif ($target eq 'edit') {
@@ -355,18 +367,25 @@ sub end_textline {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') { $Apache::lonxml::evaluate++; }
elsif ($target eq 'edit') { return ('','no'); }
+ &end_input();
return "";
}
sub start_hiddenline {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result = "";
+ my $input_id = &start_input($parstack,$safeeval);
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"},'<>&"');
+ my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ if (ref($oldresponse) eq 'ARRAY') {
+ $oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
+ }
+ $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+
if ($Apache::lonhomework::type ne 'exam') {
$result= '';
@@ -389,6 +408,7 @@ sub end_hiddenline {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') { $Apache::lonxml::evaluate++; }
elsif ($target eq 'edit') { return ('','no'); }
+ &end_input();
return "";
}
@@ -418,19 +438,7 @@ sub file_selector {
$result.=&mt('Submit a file: (only one file can be uploaded)').
'
';
- my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
-
- if ($uploadedfile) {
- my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
- &Apache::lonxml::extlink($url);
- &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
- my $icon=&Apache::loncommon::icon($url);
- my $curfile=''.$uploadedfile.'';
- $result.=&mt('Currently submitted: [_1]',$curfile);
- } else {
- #$result.=&mt('(Hand in a file you have prepared on your computer)');
- }
+ $result .= &show_past_file_submission($part,$id);
}
if ( $which eq 'both') {
$result.=' '.''.&mt('OR:').' ';
@@ -440,44 +448,59 @@ sub file_selector {
&mt('Select Portfolio Files').' '.
''.
' ';
- if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
- my (@file_list,@bad_file_list);
- foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
- my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
- my $url="/uploaded/$domain/$user/portfolio$file";
- my $icon=&Apache::loncommon::icon($url);
- push(@file_list,''.$file.'');
- if (! &Apache::lonnet::stat_file($url)) {
- &Apache::lonnet::logthis("bad file is $url");
- push(@bad_file_list,''.$file.'');
- }
- }
- my $files = ''.
- join(', ',@file_list).
- '';
- $result.=&mt("Portfolio files previously selected: [_1]",$files);
- if (@bad_file_list) {
- my $bad_files = ''.
- join(', ',@bad_file_list).
- '';
- $result.=' '.&mt('These file(s) don\'t exist: [_1]',$bad_files);
- }
- }
+ $result .= &show_past_portfile_submission($part,$id);
+
}
$result.='';
return $result;
}
-sub checkstatus {
- my ($value,$awardref,$msgref)=@_;
- for (my $i=0;$i<=$#$awardref;$i++) {
- if ($$awardref[$i] eq $value) {
- return ($$awardref[$i],$$msgref[$i]);
- }
+sub show_past_file_submission {
+ my ($part,$id) = @_;
+ my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+
+ return if (!$uploadedfile);
+
+ my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ &Apache::lonxml::extlink($url);
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+ my $icon=&Apache::loncommon::icon($url);
+ my $curfile=''.$uploadedfile.'';
+ return &mt('Currently submitted: [_1]',$curfile);
+
+}
+
+sub show_past_portfile_submission {
+ my ($part,$id) = @_;
+ if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){
+ return;
+ }
+ my (@file_list,@bad_file_list);
+ foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+ my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
+ my $url="/uploaded/$domain/$user/portfolio$file";
+ my $icon=&Apache::loncommon::icon($url);
+ push(@file_list,''.$file.'');
+ if (! &Apache::lonnet::stat_file($url)) {
+ &Apache::lonnet::logthis("bad file is $url");
+ push(@bad_file_list,''.$file.'');
+ }
+ }
+ my $files = ''.
+ join(', ',@file_list).
+ '';
+ my $result = &mt("Portfolio files previously selected: [_1]",$files);
+ if (@bad_file_list) {
+ my $bad_files = ''.
+ join(', ',@bad_file_list).
+ '';
+ $result.=' '.&mt('These file(s) don\'t exist: [_1]',$bad_files);
}
- return(undef,undef);
+ return $result;
+
}
sub valid_award {
@@ -497,15 +520,29 @@ sub valid_award {
return 0;
}
+{
+ my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
+ 'TOO_LONG',
+ 'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
+ 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
+ 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
+ 'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
+ 'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+ 'APPROX_ANS', 'EXACT_ANS');
+ my $i=0;
+ my %fwd_awards = map { ($_,$i++) } @awards;
+ my $max=scalar(@awards);
+ @awards=reverse(@awards);
+ $i=0;
+ my %rev_awards = map { ($_,$i++) } @awards;
+
sub finalizeawards {
my ($awardref,$msgref,$nameref,$reverse)=@_;
- my $result=undef;
- my $award;
- my $msg;
+ my $result;
if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
if ($result eq '' ) {
my $blankcount;
- foreach $award (@$awardref) {
+ foreach my $award (@$awardref) {
if ($award eq '') {
$result='MISSING_ANSWER';
$blankcount++;
@@ -513,25 +550,31 @@ sub finalizeawards {
}
if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
}
- if (defined($result)) { return ($result,$msg); }
+ if (defined($result)) { return ($result); }
# these awards are ordered from most important error through best correct
-
- my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
- 'TOO_LONG',
- 'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
- 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
- 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
- 'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
- 'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
- 'APPROX_ANS', 'EXACT_ANS');
- if ($reverse) { @awards=reverse(@awards); }
- foreach my $possibleaward (@awards) {
- ($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
- if (defined($result)) { return ($result,$msg); }
+ my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
+
+ my $best = $max;
+ my $j=0;
+ my $which;
+ foreach my $award (@$awardref) {
+ if ($awards->{$award} < $best) {
+ $best = $awards->{$award};
+ $which = $j;
+ }
+ $j++;
+ }
+ if (defined($which)) {
+ if (ref($nameref)) {
+ return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
+ } else {
+ return ($$awardref[$which],$$msgref[$which]);
+ }
}
return ('ERROR',undef);
}
+}
sub decideoutput {
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
@@ -580,9 +623,10 @@ sub decideoutput {
$message.= $computer;
}
$added_computer_text=1;
- unless ($env{'course.'.
+ if ((!$env{'course.'.
$env{'request.course.id'}.
- '.disable_receipt_display'} eq 'yes') {
+ '.disable_receipt_display'} eq 'yes')&&
+ $env{'request.course.id'}) {
$message.=(($target eq 'web')?' ':' ').
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
@@ -660,10 +704,8 @@ sub decideoutput {
$button=1;
} elsif ($award eq 'SIG_FAIL') {
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);
+ my $word = ($used < $min) ? 'more' : 'fewer';
+ $message = &mt("Submission not graded. Use $word digits.",$used);
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
@@ -726,7 +768,7 @@ sub decideoutput {
$message = &mt("Unknown message").": $award";
$button=1;
}
- my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
+ my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
foreach my $resid(@Apache::inputtags::response){
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
$message.=' ';
@@ -1024,7 +1066,7 @@ sub gradestatus {
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button = '';
+ $button = '';
}
}
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {