loncom/homework/inputtags.pm - diff

Return to inputtags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.230 and 1.254

version 1.230, 2007/09/18 22:18:41	version 1.254, 2008/12/15 20:24:53
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# http://www.lon-capa.org/

	=pod

	=head1 NAME

	Apache::inputtags

	=head1 SYNOPSIS



	This is part of the LearningOnline Network with CAPA project
	described at http://www.lon-capa.org.


	=head1 NOTABLE SUBROUTINES

	=over

	=item

	=back

	=cut

package Apache::inputtags;	package Apache::inputtags;
use HTML::Entities();	use HTML::Entities();
use strict;	use strict;
Line 38 BEGIN {	Line 62 BEGIN {
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));	&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
}	}

# Initializes a set of global variables used during the parse of the problem.	=pod
#
# @Apache::inputtags::input - List of current input ids.	=item initialize_inputtags()
# @Apache::inputtags::inputlist - List of all input ids seen this problem.
# @Apache::inputtags::response - List of all current resopnse ids.	Initializes a set of global variables used during the parse of the problem.
# @Apache::inputtags::responselist - List of all response ids seen this
# problem.	@Apache::inputtags::input - List of current input ids.
# @Apache::inputtags::hint - List of all hint ids.	@Apache::inputtags::inputlist - List of all input ids seen this problem.
# @Apache::inputtags::hintlist - List of all hint ids seen this problem.	@Apache::inputtags::response - List of all current resopnse ids.
# @Apache::inputtags::previous - List describing if specific responseds	@Apache::inputtags::responselist - List of all response ids seen this
# have been used	problem.
# @Apache::inputtags::previous_version - Submission responses were used in.	@Apache::inputtags::hint - List of all hint ids.
# $Apache::inputtags::part - Current part id (valid only in	@Apache::inputtags::hintlist - List of all hint ids seen this problem.
# <problem>)	@Apache::inputtags::previous - List describing if specific responseds
# 0 if not in a part.	have been used
# @Apache::inputtags::partlist - List of part ids seen in the current	@Apache::inputtags::previous_version - Submission responses were used in.
# <problem>	$Apache::inputtags::part - Current part id (valid only in
# @Apache::inputtags::status - List of problem statuses. First	<problem>)
# element is the status of the <problem>	0 if not in a part.
# the remainder are for individual <part>s.	@Apache::inputtags::partlist - List of part ids seen in the current
# %Apache::inputtags::params - Hash of defined parameters for the	<problem>
# current response.	@Apache::inputtags::status - List of problem statuses. First
# @Apache::inputtags::import - List of all ids for <import> thes get	element is the status of the <problem>
# join()ed and prepended.	the remainder are for individual <part>s.
# @Apache::inputtags::importlist - List of all import ids seen.	%Apache::inputtags::params - Hash of defined parameters for the
# $Apache::inputtags::response_with_no_part	current response.
# - Flag set true if we have seen a response	@Apache::inputtags::import - List of all ids for <import> thes get
# that is not inside a <part>	join()ed and prepended.
# %Apache::inputtags::answertxt - <*response> tags store correct	@Apache::inputtags::importlist - List of all import ids seen.
# answer strings for display by <textline/>	$Apache::inputtags::response_with_no_part
# in this hash.	- Flag set true if we have seen a response
# %Apache::inputtags::submission_display	that is not inside a <part>
# - <*response> tags store improved display	%Apache::inputtags::answertxt - <*response> tags store correct
# of submission strings for display by part	answer strings for display by <textline/>
# end.	in this hash.
	%Apache::inputtags::submission_display
	- <*response> tags store improved display
	of submission strings for display by part
	end.

	=cut

sub initialize_inputtags {	sub initialize_inputtags {
@Apache::inputtags::input=();	@Apache::inputtags::input=();
Line 306 sub start_textline {	Line 336 sub start_textline {
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];	$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
}	}
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');	$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
	$oldresponse =~ s/^\s+//;
	$oldresponse =~ s/\s+$//;
	$oldresponse =~ s/\s+/ /g;
if ($Apache::lonhomework::type ne 'exam') {	if ($Apache::lonhomework::type ne 'exam') {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);	my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';	$result='';
Line 356 sub start_textline {	Line 388 sub start_textline {
&& $Apache::lonhomework::type ne 'exam') {	&& $Apache::lonhomework::type ne 'exam') {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
$result='\framebox['.$size.'][s]{\tiny\strut}';	if ($env{'form.pdfFormFields'} eq 'yes') {
	my $fieldname = $env{'request.symb'}.
	'&part_'. $Apache::inputtags::part.
	'&textresponse'.
	'&HWVAL_' . $Apache::inputtags::response['-1'];
	$result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
	} else {
	$result='\framebox['.$size.'][s]{\tiny\strut}';
	}
} elsif ($target eq 'tex'	} elsif ($target eq 'tex'
&& $Apache::lonhomework::type eq 'exam'	&& $Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {	&& &needs_exam_box($tagstack)) {
Line 415 sub end_hiddenline {	Line 454 sub end_hiddenline {
return "";	return "";
}	}

# $part -> partid	=pod
# $id -> responseid
# $uploadefiletypes -> comma seperated list of extensions allowed or * for any	=item file_selector()
# $which -> 'uploadedonly' -> only newly uploaded files
# 'portfolioonly' -> only allow files from portfolio	$part -> partid
# 'both' -> allow files from either location	$id -> responseid
# $extratext -> additional text to go between the link and the input box	$uploadefiletypes -> comma seperated list of extensions allowed or * for any
# returns a table row <tr>	$which -> 'uploadonly' -> only newly uploaded files
	'portfolioonly' -> only allow files from portfolio
	'both' -> allow files from either location
	$extratext -> additional text to go between the link and the input box
	$maxfilesize -> maximum cumulative filesize for submitted files (in MB).
	returns a table row <tr>

	=cut

sub file_selector {	sub file_selector {
my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;	my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_;
if (!$uploadedfiletypes) { return ''; }	if (!$uploadedfiletypes) { return ''; }

my $jspart=$part;	my $jspart=$part;
Line 433 sub file_selector {	Line 480 sub file_selector {
my $result;	my $result;

$result.='<tr><td>';	$result.='<tr><td>';
if ($uploadedfiletypes ne '*') {	if (($uploadedfiletypes ne '*') \|\| ($maxfilesize)) {
$result.=	if ($uploadedfiletypes ne '*') {
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';	$result.=
	&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
	}
	if ($maxfilesize) {
	$result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',
	'<b>'.$maxfilesize.'</b>').'<br />';
	}
	$result .= '<br />';
}	}
if ($which eq 'uploadonly' \|\| $which eq 'both') {	if ($which eq 'uploadonly' \|\| $which eq 'both') {
$result.=&mt('Submit a file: (only one file can be uploaded)').	$result.=&mt('Submit a file: (only one file can be uploaded)').
Line 452 sub file_selector {	Line 506 sub file_selector {
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.	'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
'<br />';	'<br />';
$result .= &show_past_portfile_submission($part,$id);	$result .= &show_past_portfile_submission($part,$id);

}	}
$result.='</td></tr>';	$result.='</td></tr>';
return $result;	return $result;
Line 470 sub show_past_file_submission {	Line 523 sub show_past_file_submission {
my $icon=&Apache::loncommon::icon($url);	my $icon=&Apache::loncommon::icon($url);
my $curfile='<a href="'.$url.'"><img src="'.$icon.	my $curfile='<a href="'.$url.'"><img src="'.$icon.
'" border="0" />'.$uploadedfile.'</a>';	'" border="0" />'.$uploadedfile.'</a>';
return &mt('Currently submitted: <tt>[_1]</tt>',$curfile);	return &mt('Currently submitted: [_1]','<tt>'.$curfile.'</tt>');

}	}

Line 500 sub show_past_portfile_submission {	Line 553 sub show_past_portfile_submission {
my $bad_files = '<span class="LC_filename">'.	my $bad_files = '<span class="LC_filename">'.
join('</span>, <span class="LC_filename">',@bad_file_list).	join('</span>, <span class="LC_filename">',@bad_file_list).
'</span>';	'</span>';
$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files);	$result.='<p><span class="LC_error">'
	.&mt("These file(s) don't exist: [_1]",$bad_files)
	.'</span></p>';
}	}
return $result;	return $result;

Line 514 sub valid_award {	Line 569 sub valid_award {
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',	'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
'UNIT_FAIL', 'NO_UNIT',	'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC',	'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT',	'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',	'MISORDERED_RANK', 'INVALID_FILETYPE',
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',	'EXCESS_FILESIZE', 'DRAFT',
	'SUBMITTED', 'ASSIGNED_SCORE',
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {	'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
if ($award eq $possibleaward) { return 1; }	if ($award eq $possibleaward) { return 1; }
}	}
Line 528 sub valid_award {	Line 584 sub valid_award {
'TOO_LONG',	'TOO_LONG',
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',	'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',	'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',	'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',	'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',	'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
'APPROX_ANS', 'EXACT_ANS');	'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
my $i=0;	my $i=0;
my %fwd_awards = map { ($_,$i++) } @awards;	my %fwd_awards = map { ($_,$i++) } @awards;
my $max=scalar(@awards);	my $max=scalar(@awards);
Line 539 sub valid_award {	Line 595 sub valid_award {
$i=0;	$i=0;
my %rev_awards = map { ($_,$i++) } @awards;	my %rev_awards = map { ($_,$i++) } @awards;

	sub awarddetail_to_awarded {
	my ($awarddetail) = @_;
	if ($awarddetail eq 'EXACT_ANS'
	\|\| $awarddetail eq 'APPROX_ANS') {
	return 1;
	}
	return 0;
	}

	sub hide_award {
	my ($award) = @_;
	if (&Apache::lonhomework::show_no_problem_status()) {
	return 1;
	}
	if ($award =~
	/^(?:EXACT_ANS\|APPROX_ANS\|SUBMITTED\|ASSIGNED_SCORE\|INCORRECT)/) {
	return 1;
	}
	return 0;
	}

sub finalizeawards {	sub finalizeawards {
my ($awardref,$msgref,$nameref,$reverse)=@_;	my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_;
my $result;	my $result;
if ($#$awardref == -1) { $result = "NO_RESPONSE"; }	if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
if ($result eq '' ) {	if ($result eq '' ) {
Line 551 sub finalizeawards {	Line 628 sub finalizeawards {
$blankcount++;	$blankcount++;
}	}
}	}
if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }	if ($blankcount == ($#$awardref + 1)) {
	return ('NO_RESPONSE');
	}
	}

	if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; }

	if (!$final_scantron && defined($result)) { return ($result); }

	# if in scantron mode, if the award for any response is
	# assigned score, then the part gets an assigned score
	if ($final_scantron
	&& grep {$_ eq 'ASSIGNED_SCORE'} (@$awardref)) {
	return ('ASSIGNED_SCORE');
}	}
if (defined($result)) { return ($result); }

	# if in scantron mode, if the award for any response is
	# correct and there are non-correct responses,
	# then the part gets an assigned score
	if ($final_scantron
	&& (grep { $_ eq 'EXACT_ANS' \|\|
	$_ eq 'APPROX_ANS' } (@$awardref))
	&& (grep { $_ ne 'EXACT_ANS' &&
	$_ ne 'APPROX_ANS' } (@$awardref))) {
	return ('ASSIGNED_SCORE');
	}
# these awards are ordered from most important error through best correct	# these awards are ordered from most important error through best correct
my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;	my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;

Line 568 sub finalizeawards {	Line 667 sub finalizeawards {
}	}
$j++;	$j++;
}	}

if (defined($which)) {	if (defined($which)) {
if (ref($nameref)) {	if (ref($nameref)) {
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);	return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
Line 581 sub finalizeawards {	Line 681 sub finalizeawards {

sub decideoutput {	sub decideoutput {
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;	my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;

my $message='';	my $message='';
my $button=0;	my $button=0;
my $previousmsg;	my $previousmsg;
Line 595 sub decideoutput {	Line 696 sub decideoutput {
);	);

my $part = $Apache::inputtags::part;	my $part = $Apache::inputtags::part;
my $handgrade =	my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade");
('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));	my $handgrade = ('yes' eq lc($tohandgrade));

my $computer = ($handgrade)? ''	my $computer = ($handgrade)? ''
: " ".&mt("Computer's answer now shown above.");	: " ".&mt("Computer's answer now shown above.");
Line 626 sub decideoutput {	Line 727 sub decideoutput {
$message.= $computer;	$message.= $computer;
}	}
$added_computer_text=1;	$added_computer_text=1;
my ($symb) = &Apache::lonnet::whichuser();	if ($awarded > 0) {
if (($symb ne '')	my ($symb) = &Apache::lonnet::whichuser();
&&	if (($symb ne '')
($env{'course.'.$env{'request.course.id'}.	&&
'.disable_receipt_display'} ne 'yes')) {	($env{'course.'.$env{'request.course.id'}.
$message.=(($target eq 'web')?'<br />':' ').	'.disable_receipt_display'} ne 'yes') &&
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).	($Apache::lonhomework::type ne 'practice')) {
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');	$message.=(($target eq 'web')?'<br />':' ').
	&mt('Your receipt is [_1]',
	(&Apache::lonnet::receipt($Apache::inputtags::part).
	(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
	}
}	}
}	}
$button=0;	$button=0;
Line 660 sub decideoutput {	Line 765 sub decideoutput {
$message.= $computer;	$message.= $computer;
}	}
$added_computer_text=1;	$added_computer_text=1;
unless ($env{'course.'.	if ($awarded > 0
	&& $env{'course.'.
$env{'request.course.id'}.	$env{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {	'.disable_receipt_display'} ne 'yes') {
$message.=(($target eq 'web')?'<br />':' ').	$message.=(($target eq 'web')?'<br />':' ').
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).	&mt('Your receipt is [_1]',
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');	(&Apache::lonnet::receipt($Apache::inputtags::part).
	(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
}	}
$css_class=$possible_class{'correct'};	$css_class=$possible_class{'correct'};
$button=0;	$button=0;
Line 681 sub decideoutput {	Line 788 sub decideoutput {
$button = 1;	$button = 1;
} elsif ($award eq 'MISSING_ANSWER') {	} elsif ($award eq 'MISSING_ANSWER') {
$message = &mt('Some items were not submitted.');	$message = &mt('Some items were not submitted.');
	if ($target ne 'tex') {
	$message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
	}
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button = 1;	$button = 1;
} elsif ($award eq 'ERROR') {	} elsif ($award eq 'ERROR') {
$message = &mt('An error occured while grading your answer.');	$message = &mt('An error occurred while grading your answer.');
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button = 1;	$button = 1;
} elsif ($award eq 'TOO_LONG') {	} elsif ($award eq 'TOO_LONG') {
Line 696 sub decideoutput {	Line 806 sub decideoutput {
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
} elsif ($award eq 'MISORDERED_RANK') {	} elsif ($award eq 'MISORDERED_RANK') {
$message = &mt('You have provided an invalid ranking');	$message = &mt('You have provided an invalid ranking.');
if ($target ne 'tex') {	if ($target ne 'tex') {
$message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');	$message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems')));
}	}
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
	} elsif ($award eq 'EXCESS_FILESIZE') {
	$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
	$css_class=$possible_class{'not_charged_try'};
	$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {	} elsif ($award eq 'INVALID_FILETYPE') {
$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');	$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
Line 709 sub decideoutput {	Line 823 sub decideoutput {
} elsif ($award eq 'SIG_FAIL') {	} elsif ($award eq 'SIG_FAIL') {
my ($used,$min,$max)=split(':',$awardmsg);	my ($used,$min,$max)=split(':',$awardmsg);
my $word = ($used < $min) ? 'more' : 'fewer';	my $word = ($used < $min) ? 'more' : 'fewer';
$message = &mt("Submission not graded. Use $word digits.",$used);	$message = &mt("Submission not graded. Use $word digits.",$used);
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {	} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
Line 741 sub decideoutput {	Line 855 sub decideoutput {
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
} elsif ($award eq 'BAD_FORMULA') {	} elsif ($award eq 'BAD_FORMULA') {
$message = &mt("Unable to understand formula");	$message = &mt("Unable to understand formula").'.';
	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
	} elsif ($award eq 'INTERNAL_ERROR') {
	$message = &mt("An internal error occurred while processing your answer. Please try again later.");
	$css_class=$possible_class{'not_charged_try'};
	$button=1;
} elsif ($award eq 'INCORRECT') {	} elsif ($award eq 'INCORRECT') {
$message = &mt("Incorrect").'.';	$message = &mt("Incorrect").'.';
$css_class=$possible_class{'charged_try'};	$css_class=$possible_class{'charged_try'};
Line 775 sub decideoutput {	Line 894 sub decideoutput {
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();	my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
foreach my $resid(@Apache::inputtags::response){	foreach my $resid(@Apache::inputtags::response){
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {	if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
$message.='<br />';	if ($target eq 'tex') {
	$message.= "\\\\\n";
	} else {
	$message.='<br />';
	}
my @files = split(/\s,\s/,	my @files = split(/\s,\s/,
$Apache::lonhomework::history{"resource.$part.$resid.handback"});	$Apache::lonhomework::history{"resource.$part.$resid.handback"});
my $file_msg;	my $file_msg;
foreach my $file (@files) {	foreach my $file (@files) {
$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';	if ($target eq 'tex') {
	$file_msg.= "\\\\\n".$file;
	} else {
	$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
	}
}	}
$message .= &mt('Returned file(s): [_1]',$file_msg);	$message .= &mt('Returned file(s): [_1]',$file_msg);
	if ($target eq 'tex') {
	$message.= "\\\\\n";
	} else {
	$message.='<br />';
	}
}	}
}	}

if (lc($Apache::lonhomework::problemstatus) eq 'no' &&	if (&Apache::lonhomework::hide_problem_status()
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
	&& &hide_award($award)) {
$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
$css_class=$possible_class{'no_grade'};	$css_class=$possible_class{'no_grade'};
$button=1;	$button=1;
Line 797 sub decideoutput {	Line 930 sub decideoutput {
$message.= $computer;	$message.= $computer;
$added_computer_text=1;	$added_computer_text=1;
}	}
	if ($Apache::lonhomework::type eq 'practice') {
	if ($target eq 'web') {
	$message .= '<br />';
	} else {
	$message .= ' ';
	}
	$message.=&mt('Submissions to practice problems are not permanently recorded.');
	}

return ($button,$css_class,$message,$previousmsg);	return ($button,$css_class,$message,$previousmsg);
}	}

Line 850 sub setgradedata {	Line 992 sub setgradedata {
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;	$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
return '';	return '';
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~	} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
/^correct/ \|\| $Apache::lonhomework::scantronmode \|\|	/^correct/
lc($Apache::lonhomework::problemstatus) eq 'no') {	\|\| $Apache::lonhomework::scantronmode
	\|\| &Apache::lonhomework::hide_problem_status() ) {
# the student doesn't already have it correct,	# the student doesn't already have it correct,
# or we are in a mode (scantron orno problem status) where a correct	# or we are in a mode (scantron orno problem status) where a correct
# can become incorrect	# can become incorrect
Line 873 sub setgradedata {	Line 1016 sub setgradedata {
my $numawards=scalar(@Apache::inputtags::response);	my $numawards=scalar(@Apache::inputtags::response);
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;	$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
foreach my $res (@Apache::inputtags::response) {	foreach my $res (@Apache::inputtags::response) {
$Apache::lonhomework::results{"resource.$id.awarded"}+=	if (defined($Apache::lonhomework::results{"resource.$id.$res.awarded"})) {
$Apache::lonhomework::results{"resource.$id.$res.awarded"};	$Apache::lonhomework::results{"resource.$id.awarded"}+=
	$Apache::lonhomework::results{"resource.$id.$res.awarded"};
	} else {
	$Apache::lonhomework::results{"resource.$id.awarded"}+=
	&awarddetail_to_awarded($Apache::lonhomework::results{"resource.$id.$res.awarddetail"});
	}
}	}
if ($numawards > 0) {	if ($numawards > 0) {
$Apache::lonhomework::results{"resource.$id.awarded"}/=	$Apache::lonhomework::results{"resource.$id.awarded"}/=
Line 889 sub setgradedata {	Line 1037 sub setgradedata {
} elsif ( $award eq 'INCORRECT' ) {	} elsif ( $award eq 'INCORRECT' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =	$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
if (lc($Apache::lonhomework::problemstatus) eq 'no' \|\|	if (&Apache::lonhomework::hide_problem_status()
$Apache::lonhomework::scantronmode) {	\|\| $Apache::lonhomework::scantronmode) {
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;	$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
}	}
$Apache::lonhomework::results{"resource.$id.solved"} =	$Apache::lonhomework::results{"resource.$id.solved"} =
Line 909 sub setgradedata {	Line 1057 sub setgradedata {
} else {	} else {
$Apache::lonhomework::results{"resource.$id.solved"} =	$Apache::lonhomework::results{"resource.$id.solved"} =
'incorrect_attempted';	'incorrect_attempted';
if (lc($Apache::lonhomework::problemstatus) eq 'no' \|\|	if (&Apache::lonhomework::show_no_problem_status()
$Apache::lonhomework::scantronmode) {	\|\| $Apache::lonhomework::scantronmode) {
$Apache::lonhomework::results{"resource.$id.tries"} =	$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;	$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
}	}

	if (&Apache::lonhomework::show_some_problem_status()) {
	# clear out the awarded if they had gotten it wrong/right
	# and are now in an error mode
	$Apache::lonhomework::results{"resource.$id.awarded"} = '';
	}
}	}
if (defined($msg)) {	if (defined($msg)) {
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;	$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;
Line 928 sub setgradedata {	Line 1082 sub setgradedata {
# check if this was a previous submission if it was delete the	# check if this was a previous submission if it was delete the
# unneeded data and update the previously_used attribute	# unneeded data and update the previously_used attribute
if ( $previously_used eq 'PREVIOUSLY_USED') {	if ( $previously_used eq 'PREVIOUSLY_USED') {
if (lc($Apache::lonhomework::problemstatus) ne 'no') {	if (&Apache::lonhomework::show_problem_status()) {
delete($Apache::lonhomework::results{"resource.$id.tries"});	delete($Apache::lonhomework::results{"resource.$id.tries"});
$Apache::lonhomework::results{"resource.$id.previous"} = '1';	$Apache::lonhomework::results{"resource.$id.previous"} = '1';
}	}
Line 1006 sub grade {	Line 1160 sub grade {
&Apache::lonxml::debug("got message $value from $response for $id");	&Apache::lonxml::debug("got message $value from $response for $id");
push (@msgs,$value);	push (@msgs,$value);
}	}
my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs);	my ($finalaward,$msg) =
	&finalizeawards(\@awards,\@msgs,undef,undef,
	$Apache::lonhomework::scantronmode);
my $previously_used;	my $previously_used;
if ( $#Apache::inputtags::previous eq $#awards ) {	if ( $#Apache::inputtags::previous eq $#awards ) {
my ($match) =	my ($match) =
&previous_match(\@Apache::inputtags::previous_version,	&previous_match(\@Apache::inputtags::previous_version,
scalar(@Apache::inputtags::response));	scalar(@Apache::inputtags::response));

if ($match) {	if ($match) {
$previously_used = 'PREVIOUSLY_LAST';	$previously_used = 'PREVIOUSLY_LAST';
foreach my $value (@Apache::inputtags::previous) {	foreach my $value (@Apache::inputtags::previous) {
Line 1080 sub get_grade_messages {	Line 1236 sub get_grade_messages {
$trystr = '\vskip 0 mm ';	$trystr = '\vskip 0 mm ';
}	}
} else {	} else {
$trystr = "<td><nobr>".$tries_text." $tries";	$trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
if ($Apache::lonhomework::parsing_a_task) {	if ($Apache::lonhomework::parsing_a_task) {
} elsif($env{'request.state'} ne 'construct') {	} elsif($env{'request.state'} ne 'construct') {
$trystr.="/$maxtries";	$trystr.="/$maxtries";
Line 1089 sub get_grade_messages {	Line 1245 sub get_grade_messages {
$trystr.="/".$Apache::inputtags::params{'maxtries'};	$trystr.="/".$Apache::inputtags::params{'maxtries'};
}	}
}	}
$trystr.="</nobr></td>";	$trystr.="</span></td>";
}	}
}	}

Line 1185 sub previous_tries {	Line 1341 sub previous_tries {
my $previous = $count_lookup{$which};	my $previous = $count_lookup{$which};
$message =~ s{(</td>)}{ as submission \# $previous $1};	$message =~ s{(</td>)}{ as submission \# $previous $1};
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {	} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
if (!(lc($Apache::lonhomework::problemstatus) eq 'no'	if (!(&Apache::lonhomework::hide_problem_status()
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/	&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
) {	) {

	my $txt_correct = &mt('Correct');
$message =~ s{(<td.?>)(.?)(</td>)}	$message =~ s{(<td.?>)(.?)(</td>)}
{$1 <strong>Correct</strong>. $3}s;	{$1 <strong>$txt_correct</strong>. $3}s;
}	}
my $trystr = "(Try ".	my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
$Apache::lonhomework::history{"$prefix.tries"}.')';
$message =~ s{(</td>)}{ $trystr $1};	$message =~ s{(</td>)}{ $trystr $1};
}	}
my ($class) = ($message =~ m{<td.class="([^"])"}); #"	my ($class) = ($message =~ m{<td.class="([^"])"}); #"
Line 1240 sub previous_tries {	Line 1396 sub previous_tries {
'inherit_jsmath' => 1, });	'inherit_jsmath' => 1, });
my $end_page =	my $end_page =
&Apache::loncommon::end_page({'js_ready' => 1,});	&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.'_'.$env{'form.counter'};
my $result ="<script type=\"text/javascript\">	my $result ="<script type=\"text/javascript\">
// <![CDATA[	// <![CDATA[
function LONCAPA_previous_tries_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}	function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
// ]]>	// ]]>
</script><a href=\"javascript:LONCAPA_previous_tries_$Apache::lonxml::curdepth();void(0);\">".&mt("Previous Tries")."</a><br />";	</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
#use Data::Dumper;	#use Data::Dumper;
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));	#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
return $result;	return $result;
Line 1253 sub previous_tries {	Line 1412 sub previous_tries {

1;	1;
__END__	__END__

	=pod

	=back

	=cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.230
changed lines
	Added in v.1.254