--- loncom/homework/response.pm 2003/06/23 20:57:41 1.80
+++ loncom/homework/response.pm 2003/10/06 21:57:54 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.80 2003/06/23 20:57:41 albertel Exp $
+# $Id: response.pm,v 1.86 2003/10/06 21:57:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -93,10 +93,13 @@ sub setrandomnumber {
$rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
}
if ($rndseed =~/,/) {
- my ($num1,$num2)=split(/,/,$rndseed);
- $num1+=$rndmod;
- $num2+=$rndmod;
- $rndseed="$num1,$num2";
+ {
+ use integer;
+ my ($num1,$num2)=split(/,/,$rndseed);
+ $num1+=$rndmod;
+ $num2+=$rndmod;
+ $rndseed="$num1,$num2";
+ }
} else {
$rndseed+=$rndmod;
}
@@ -177,6 +180,16 @@ sub mandatory_part_meta {
#
}
+sub meta_part_order {
+ if (@Apache::inputtags::partlist) {
+ my @parts=@Apache::inputtags::partlist;
+ shift(@parts);
+ return '
';
+ }
$result.=&Apache::edit::text_arg('Name:','name',$token).
&Apache::edit::text_arg('Type:','type',$token).
&Apache::edit::text_arg('Description:','description',$token).
@@ -292,9 +336,22 @@ sub start_responseparam {
"";
$result.=&Apache::edit::end_table;
} elsif ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'name','type','description',
- 'default');
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name','type',
+ 'description','default');
+ my $element=&Apache::edit::html_element_name('parameter_package');
+ if (defined($ENV{"form.$element"}) && $ENV{"form.$element"} ne '') {
+ my $name=$ENV{"form.$element"};
+ my $tag=&decide_package($tagstack);
+ $token->[2]->{'name'}=$name;
+ $token->[2]->{'type'}=
+ $Apache::lonnet::packagetab{"$tag&$name&type"};
+ $token->[2]->{'description'}=
+ $Apache::lonnet::packagetab{"$tag&$name&display"};
+ $token->[2]->{'default'}=
+ $Apache::lonnet::packagetab{"$tag&$name&default"};
+ $constructtag=1;
+ }
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
@@ -365,8 +422,8 @@ sub answer_header {
my ($type) = @_;
my $result;
if ($ENV{'form.answer_output_mode'} eq 'tex') {
- $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: '.
- $Apache::inputtags::part.' \\\\ \hline ';
+ $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.
+ $Apache::inputtags::part.'| \\\\ \hline ';
} else {
$result = '
Answer for Part:'. $Apache::inputtags::part. ' | '."\n"; @@ -378,7 +435,7 @@ sub answer_part { my ($type,$answer) = @_; my $result; if ($ENV{'form.answer_output_mode'} eq 'tex') { - $result = ' '.$answer.'\\\\ \hline '; + $result = ' \verb|'.$answer.'|\\\\ \hline '; } else { $result = ''.$answer.' | '; } @@ -509,6 +566,14 @@ sub whichorder { return @whichopt; } +sub show_answer { + my $part = $Apache::inputtags::part; + my $award = $Apache::lonhomework::history{"resource.$part.solved"}; + my $status = $Apache::inputtags::status[-1]; + return ( ($award =~ /^correct/ + && lc($Apache::lonhomework::problemstatus) ne 'no') + || $status eq "SHOW_ANSWER"); +} 1; __END__