--- loncom/homework/response.pm 2003/04/30 21:19:13 1.73
+++ loncom/homework/response.pm 2003/08/11 19:56:45 1.83
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.73 2003/04/30 21:19:13 albertel Exp $
+# $Id: response.pm,v 1.83 2003/08/11 19:56:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,7 +52,7 @@ sub start_response {
}
sub end_response {
- pop @Apache::inputtags::response;
+ #pop @Apache::inputtags::response;
@Apache::inputtags::inputlist=();
return '';
}
@@ -62,6 +62,7 @@ sub start_hintresponse {
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
push (@Apache::inputtags::response,$id);
+ push (@Apache::inputtags::responselist,$id);
push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
return $id;
}
@@ -83,18 +84,26 @@ sub setrandomnumber {
$rndseed=$ENV{'form.rndseed'};
if (!$rndseed) { $rndseed=time; }
} else {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+ $rndseed=&Apache::lonnet::rndseed();
}
&Apache::lonxml::debug("randseed $rndseed");
# $rndseed=unpack("%32i",$rndseed);
- $rndseed=$rndseed
- +(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+ my $rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
if (defined($Apache::inputtags::response['-1'])) {
- $rndseed=$rndseed
- +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
+ $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
+ }
+ if ($rndseed =~/,/) {
+ {
+ use integer;
+ my ($num1,$num2)=split(/,/,$rndseed);
+ $num1+=$rndmod;
+ $num2+=$rndmod;
+ $rndseed="$num1,$num2";
+ }
+ } else {
+ $rndseed+=$rndmod;
}
- &Math::Random::random_set_seed_from_phrase($rndseed);
+ &Apache::lonnet::setup_random_from_rndseed($rndseed);
&Apache::lonxml::debug("randseed $rndseed");
return '';
}
@@ -269,6 +278,24 @@ sub end_dataresponse {
return $result;
}
+sub decide_package {
+ my ($tagstack)=@_;
+ my $package;
+ if ($$tagstack[-1] eq 'parameter') {
+ $package='part';
+ } else {
+ my $i=-1;
+ while (defined($$tagstack[$i])) {
+ if ($$tagstack[$i] =~ /(response|hint)$/) {
+ $package=$$tagstack[$i];
+ last;
+ }
+ $i--;
+ }
+ }
+ return $package;
+}
+
sub start_responseparam {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
@@ -279,6 +306,19 @@ sub start_responseparam {
$token->[2]->{'description'});
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
+ my $optionlist;
+ my $package=&decide_package($tagstack);
+ foreach my $key (sort(keys(%Apache::lonnet::packagetab))) {
+ if ($key =~ /^\Q$package\E&(.*)&display$/) {
+ $optionlist.='<option value="'.$1.'">'.
+ $Apache::lonnet::packagetab{$key}.'</option>';
+ }
+ }
+ if (defined($optionlist)) {
+ $result.='Use template: <select name="'.
+ &Apache::edit::html_element_name('parameter_package').'">'.
+ '<option value=""></option>'.$optionlist.'</select><br />';
+ }
$result.=&Apache::edit::text_arg('Name:','name',$token).
&Apache::edit::text_arg('Type:','type',$token).
&Apache::edit::text_arg('Description:','description',$token).
@@ -286,9 +326,22 @@ sub start_responseparam {
"</td></tr>";
$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();
@@ -358,9 +411,9 @@ sub setup_params {
sub answer_header {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
- $result = '<table border="1"><tr><th>Answer for Part:'.
- $Apache::inputtags::part. '</th></tr><tr>'."\n";
+ if ($ENV{'form.answer_output_mode'} eq 'tex') {
+ $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: '.
+ $Apache::inputtags::part.' \\\\ \hline ';
} else {
$result = '<table border="1"><tr><td>Answer for Part:'.
$Apache::inputtags::part. '</td>'."\n";
@@ -371,8 +424,8 @@ sub answer_header {
sub answer_part {
my ($type,$answer) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '<td>'.$answer.'</td>';
+ if ($ENV{'form.answer_output_mode'} eq 'tex') {
+ $result = ' \verb|'.$answer.'|\\\\ \hline ';
} else {
$result = '<td>'.$answer.'</td>';
}
@@ -382,8 +435,8 @@ sub answer_part {
sub answer_footer {
my ($type) = @_;
my $result;
- if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
- $result = '</tr></table>';
+ if ($ENV{'form.answer_output_mode'} eq 'tex') {
+ $result = ' \end{tabular} \vskip 0 mm ';
} else {
$result = '</tr></table>';
}
@@ -451,6 +504,58 @@ sub scored_response {
return $repetition;
}
+sub whichorder {
+ my ($max,$randomize,$showall,$hash)=@_;
+ #&Apache::lonxml::debug("man $max randomize $randomize");
+ if (!defined(@{ $$hash{'names'} })) { return; }
+ my @names = @{ $$hash{'names'} };
+ my @whichopt =();
+ my (%top,@toplist,%bottom,@bottomlist);
+ if (!($showall || ($randomize eq 'no'))) {
+ my $current=0;
+ foreach my $name (@names) {
+ $current++;
+ if ($$hash{"$name.location"} eq 'top') {
+ $top{$name}=$current;
+ } elsif ($$hash{"$name.location"} eq 'bottom') {
+ $bottom{$name}=$current;
+ }
+ }
+ }
+ my $topcount=0;
+ my $bottomcount=0;
+ while (((scalar(@whichopt)+$topcount+$bottomcount) < $max || $showall)
+ && ($#names > -1)) {
+ #&Apache::lonxml::debug("Have $#whichopt max is $max");
+ my $aopt;
+ if ($showall || ($randomize eq 'no')) {
+ $aopt=0;
+ } else {
+ $aopt=int(&Math::Random::random_uniform() * ($#names+1));
+ }
+ #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
+ $aopt=splice(@names,$aopt,1);
+ #&Apache::lonxml::debug("Picked $aopt");
+ if ($top{$aopt}) {
+ $toplist[$top{$aopt}]=$aopt;
+ $topcount++;
+ } elsif ($bottom{$aopt}) {
+ $bottomlist[$bottom{$aopt}]=$aopt;
+ $bottomcount++;
+ } else {
+ push (@whichopt,$aopt);
+ }
+ }
+ for (my $i=0;$i<=$#toplist;$i++) {
+ if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
+ }
+ for (my $i=0;$i<=$#bottomlist;$i++) {
+ if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
+ }
+
+ return @whichopt;
+}
+
1;
__END__