--- loncom/homework/inputtags.pm 2007/04/16 23:15:48 1.222
+++ loncom/homework/inputtags.pm 2007/09/26 19:30:30 1.231
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.222 2007/04/16 23:15:48 albertel Exp $
+# $Id: inputtags.pm,v 1.231 2007/09/26 19:30:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,6 @@ use strict;
use Apache::loncommon;
use Apache::lonlocal;
use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -116,8 +115,7 @@ sub check_for_duplicate_ids {
sub start_input {
my ($parstack,$safeeval)=@_;
- my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ my $id = &Apache::lonxml::get_id($parstack,$safeeval);
push (@Apache::inputtags::input,$id);
push (@Apache::inputtags::inputlist,$id);
return $id;
@@ -449,7 +447,7 @@ sub file_selector {
$result.='
'.''.&mt('OR:').'
';
}
if ($which eq 'portfolioonly' || $which eq 'both') {
- $result.=$extratext.''.
+ $result.=$extratext.''.
&mt('Select Portfolio Files').'
'.
''.
'
';
@@ -629,10 +627,10 @@ sub decideoutput {
}
$added_computer_text=1;
my ($symb) = &Apache::lonnet::whichuser();
- if ((!$env{'course.'.
- $env{'request.course.id'}.
- '.disable_receipt_display'} eq 'yes')&&
- $symb) {
+ if (($symb ne '')
+ &&
+ ($env{'course.'.$env{'request.course.id'}.
+ '.disable_receipt_display'} ne 'yes')) {
$message.=(($target eq 'web')?'
':' ').
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
@@ -1106,7 +1104,7 @@ sub get_grade_messages {
}
sub gradestatus {
- my ($id,$target) = @_;
+ my ($id,$target,$no_previous) = @_;
my $showbutton = 1;
my $message = '';
my $latemessage = '';
@@ -1133,7 +1131,12 @@ sub gradestatus {
}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button = '';
+ $button =
+ '';
}
}
@@ -1145,7 +1148,13 @@ sub gradestatus {
if ($target eq 'tex') {
return $button.' \vskip 0 mm '.$output.' ';
} else {
- return '
'.$button.' | '.$output.''.&previous_tries($id,$target).' |
';
+ $output =
+ ''.$button.' | '.$output;
+ if (!$no_previous) {
+ $output.=''.&previous_tries($id,$target).' | ';
+ }
+ $output.= '
';
+ return $output;
}
}
}
@@ -1174,12 +1183,15 @@ sub previous_tries {
my ($match,$which) = &find_which_previous($i);
$message=$previousmsg;
my $previous = $count_lookup{$which};
- $message =~ s{()}{ as submission # $previous $1};
+ $message =~ s{()}{ as submission \# $previous $1};
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
- if ( $Apache::lonhomework::history{"$prefix.solved"} =~
- /^correct/) {
+ if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
+ && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
+ && $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
+ ) {
+
$message =~ s{()(.*?)()}
- {$1 Correct. $3};
+ {$1 Correct. $3}s;
}
my $trystr = "(Try ".
$Apache::lonhomework::history{"$prefix.tries"}.')';
@@ -1190,7 +1202,7 @@ sub previous_tries {
$output.='';
- $output.=''.$count.' | ';
+ $output.=''.$count.' | ';
$output.=$message;
foreach my $resid (@Apache::inputtags::response) {
@@ -1216,23 +1228,27 @@ sub previous_tries {
&mt('Submitted Answer').'';
$output ='';
#return $output;
- $output=~s/\\/\\\\/g;
- $output=~s/\'/\\\'/g;
- $output=~s/\s+/ /g;
+ $output = &Apache::loncommon::js_ready($output);
+ $output.='
';
+
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
my $start_page =
&Apache::loncommon::start_page('Previous Tries', undef,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'js_ready' => 1,});
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'js_ready' => 1,
+ 'inherit_jsmath' => 1, });
my $end_page =
&Apache::loncommon::end_page({'js_ready' => 1,});
-
+ my $prefix = $env{'form.request.prefix'};
+ $prefix =~ tr{.}{_};
+ my $function_name = "LONCAPA_previous_tries_".$prefix.
+ $Apache::lonxml::curdepth;
my $result ="".&mt("Previous Tries")."
";
+".&mt("Previous Tries")."
";
#use Data::Dumper;
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
return $result;