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.340 and 1.342

version 1.340, 2016/04/02 04:30:39	version 1.342, 2016/04/06 00:34:12
Line 1059 sub decideoutput {	Line 1059 sub decideoutput {
#	#

my $computer = ($handgrade \|\| $nocorrect)? ''	my $computer = ($handgrade \|\| $nocorrect)? ''
: " ".&mt("Computer's answer now shown above.");	: &mt("Computer's answer now shown above.");
&Apache::lonxml::debug("handgrade has :$handgrade:");	&Apache::lonxml::debug("handgrade has :$handgrade:");

if ($previous) { $previousmsg=&mt('You have entered that answer before'); }	if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
Line 1083 sub decideoutput {	Line 1083 sub decideoutput {
$message = '\textbf{'.$message.'}';	$message = '\textbf{'.$message.'}';
} else {	} else {
$message = "<b>".$message."</b>";	$message = "<b>".$message."</b>";
$message.= $computer;	if ($computer) {
	$message = "$computer $message";
	}
}	}
$added_computer_text=1;	$added_computer_text=1;
if ($awarded > 0) {	if ($awarded > 0) {
Line 1127 sub decideoutput {	Line 1129 sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';	$message = '\textbf{'.&mt('You are correct.').'}';
} else {	} else {
$message = "<b>".&mt('You are correct.')."</b>";	$message = "<b>".&mt('You are correct.')."</b>";
$message.= $computer;	if ($computer) {
	$message = "$computer $message";
	}
}	}
$added_computer_text=1;	$added_computer_text=1;
if ($awarded > 0	if ($awarded > 0
Line 1346 sub decideoutput {	Line 1350 sub decideoutput {
}	}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&	if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
!$added_computer_text && $target ne 'tex') {	!$added_computer_text && $target ne 'tex') {
$message.= $computer;	if ($computer) {
	$message = "$computer $message";
	}
$added_computer_text=1;	$added_computer_text=1;
}	}
if ($Apache::lonhomework::type eq 'practice') {	if ($Apache::lonhomework::type eq 'practice') {
Line 1684 sub get_grade_messages {	Line 1690 sub get_grade_messages {
$trial.="/".$Apache::inputtags::params{'maxtries'};	$trial.="/".$Apache::inputtags::params{'maxtries'};
}	}
}	}
$trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
	unless (($env{'request.state'} ne "construct") &&
	($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
	(!$env{'request.role.adv'})) {
	$trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>';
	}
	$trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>';
}	}
}	}

Line 1751 sub gradestatus {	Line 1763 sub gradestatus {
}	}

}	}
my $output= $previousmsg.$latemessage.$message;	my $output= $previousmsg.$latemessage.$message.$trystr;
my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
unless ($crstype eq 'Placement') {
$output .= $trystr;
}
if ($output =~ /^\s*$/) {	if ($output =~ /^\s*$/) {
return $button;	return $button;
} else {	} else {
Line 1764 sub gradestatus {	Line 1772 sub gradestatus {
} else {	} else {
$output =	$output =
'<table><tr><td>'.$button.'</td>'.$output;	'<table><tr><td>'.$button.'</td>'.$output;
if ((!$no_previous) && ($crstype ne 'Placement')) {	if ((!$no_previous) &&
	(($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') \|\|
	($env{'request.role.adv'}))) {
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';	$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
}	}
$output.= '</tr></table>';	$output.= '</tr></table>';

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

Removed from v.1.340
changed lines
	Added in v.1.342