version 1.229, 2011/11/29 17:43:30
|
version 1.234, 2013/12/28 23:16:02
|
Line 469 sub end_customresponse {
|
Line 469 sub end_customresponse {
|
$error = $award; |
$error = $award; |
$award = 'ERROR'; |
$award = 'ERROR'; |
} |
} |
|
if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' || |
|
$award eq 'EXACT_ANS')) { |
|
if ($Apache::lonhomework::type eq 'survey') { |
|
$award='SUBMITTED'; |
|
} elsif ($Apache::lonhomework::type eq 'surveycred') { |
|
$award='SUBMITTED_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$award='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$award='ANONYMOUS_CREDIT'; |
|
} |
|
} |
&Apache::response::handle_previous(\%previous,$award); |
&Apache::response::handle_previous(\%previous,$award); |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
$award; |
$award; |
Line 574 sub edit_mathresponse_button {
|
Line 586 sub edit_mathresponse_button {
|
function edit_${id}_${field} (textarea) { |
function edit_${id}_${field} (textarea) { |
thenumber = textarea; |
thenumber = textarea; |
thedata = document.forms['lonhomework'].elements[textarea].value; |
thedata = document.forms['lonhomework'].elements[textarea].value; |
newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable"); |
newwin = window.open("/adm/dragmath/MaximaPopup.html","","width=565,height=400,resizable"); |
} |
} |
</script> |
</script> |
<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a> |
<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a> |
Line 614 sub end_mathresponse {
|
Line 626 sub end_mathresponse {
|
$error = $award; |
$error = $award; |
$award = 'ERROR'; |
$award = 'ERROR'; |
} |
} |
|
if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' || |
|
$award eq 'EXACT_ANS')) { |
|
if ($Apache::lonhomework::type eq 'survey') { |
|
$award='SUBMITTED'; |
|
} elsif ($Apache::lonhomework::type eq 'surveycred') { |
|
$award='SUBMITTED_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$award='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$award='ANONYMOUS_CREDIT'; |
|
} |
|
} |
&Apache::response::handle_previous(\%previous,$award); |
&Apache::response::handle_previous(\%previous,$award); |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
$award; |
$award; |
Line 1135 sub scored_response {
|
Line 1159 sub scored_response {
|
sub whichorder { |
sub whichorder { |
my ($max,$randomize,$showall,$hash,$rndseed)=@_; |
my ($max,$randomize,$showall,$hash,$rndseed)=@_; |
#&Apache::lonxml::debug("man $max randomize $randomize"); |
#&Apache::lonxml::debug("man $max randomize $randomize"); |
if (!defined(@{ $$hash{'names'} })) { return; } |
my @names; |
my @names = @{ $$hash{'names'} }; |
if (ref($hash->{'names'}) eq 'ARRAY') { |
|
@names = @{$hash->{'names'}}; |
|
} |
|
return if (!@names); |
my @whichopt =(); |
my @whichopt =(); |
my (%top,@toplist,%bottom,@bottomlist); |
my (%top,@toplist,%bottom,@bottomlist); |
if (!($showall || ($randomize eq 'no'))) { |
if (!($showall || ($randomize eq 'no'))) { |
Line 1189 sub show_answer {
|
Line 1216 sub show_answer {
|
my $status = $Apache::inputtags::status[-1]; |
my $status = $Apache::inputtags::status[-1]; |
my $canshow = 0; |
my $canshow = 0; |
if ($award =~ /^correct/) { |
if ($award =~ /^correct/) { |
if ((&Apache::inputtags::grading_is_nonlenient($part)) || |
if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) || |
($Apache::lonhomework::history{"resource.$part.awarded"} == 1)) { |
(&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) { |
$canshow = 1; |
$canshow = 1; |
} |
} |
} |
} |
Line 1223 sub check_if_computed {
|
Line 1250 sub check_if_computed {
|
|
|
sub pick_foil_for_concept { |
sub pick_foil_for_concept { |
my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_; |
my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_; |
if (not defined(@{ $Apache::response::conceptgroup{'names'} })) { return; } |
my @names; |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
if (ref($Apache::response::conceptgroup{'names'}) eq 'ARRAY') { |
|
@names = @{ $Apache::response::conceptgroup{'names'} }; |
|
} |
|
return if (!@names); |
my $pick=int(&Math::Random::random_uniform() * ($#names+1)); |
my $pick=int(&Math::Random::random_uniform() * ($#names+1)); |
my $name=$names[$pick]; |
my $name=$names[$pick]; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |