--- loncom/homework/optionresponse.pm 2001/05/21 19:45:28 1.8
+++ loncom/homework/optionresponse.pm 2001/12/04 14:57:31 1.26
@@ -10,62 +10,133 @@ sub BEGIN {
}
sub start_optionresponse {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
#when in a radiobutton response use these
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
- return '';
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::start_table($token).
+ "<tr><td>Multiple Option Response Question</td><td>Delete:".
+ &Apache::edit::deletelist($target,$token)
+ ."</td><td> </td></tr><tr><td colspan=\"3\">\n";
+ $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
+ "</td></tr>";
+ $result.="<tr><td colspan=\"3\">\n";
+ }
+ if ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'max');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ if ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write('optionresponse');
+ }
+ return $result;
}
sub end_optionresponse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
pop @Apache::lonxml::namespace;
- return '';
-}
-
-sub insert_optionresponse {
- return '
-<optionresponse max="10">
- <foilgroup options=\"\">
- </foilgroup>
-</optionresponse>';
+ my $result;
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ return $result;
}
%Apache::response::foilgroup={};
sub start_foilgroup {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+ my $result='';
%Apache::response::foilgroup={};
- $Apache::optionresponse::conceptgroup=0;
+ $Apache::optionresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
- return '';
+ if ($target eq 'edit') {
+ my $optionlist="<option></option>\n";
+ my $option;
+ my @opt;
+ eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
+ my $count=1;
+ foreach $option (@opt) {
+ $optionlist.="<option value=\"$count\">$option</option>\n";
+ $count++;
+ }
+ my $insertlist=&Apache::edit::insertlist($target,$token);
+ $result.=&Apache::edit::start_table($token);
+ $result.= (<<ENDTABLE);
+ <tr><td>Select Options</td>
+ <td>
+ Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
+ </td>
+ <td>Delete an Option:
+ <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
+ </td>
+ </tr>
+ <tr><td colspan="3">$insertlist<br />
+ENDTABLE
+ }
+ if ($target eq 'modified') {
+ my @options;
+ my $optchanged=0;
+ eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+ if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+ my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+ &Apache::lonxml::debug("Deleting :$delopt:");
+ splice(@options,$delopt-1,1);
+ $optchanged=1;
+ }
+ if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
+ my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+ if ($options[0]) {
+ push(@options,$newopt);
+ } else {
+ $options[0]=$newopt;
+ }
+ $optchanged=1;
+ }
+ if ($optchanged) {
+ $result = "<foilgroup options=\"(";
+ foreach my $option (@options) {
+ $option=~s/\'/\\\'/;
+ &Apache::lonxml::debug("adding option :$option:");
+ $result .="'".$option."',";
+ }
+ chop $result;
+ $result.=')">';
+ } # else nothing changed so just use the default mechanism
+ }
+ return $result;
}
sub end_foilgroup {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target ne 'meta') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
my $name;
my ($count,$max) = &getfoilcounts($parstack,$safeeval);
if ($count>$max) { $count=$max }
&Apache::lonxml::debug("Count is $count from $max");
- my $args ='';
- if ( $#$parstack > 0 ) { $args=$$parstack['-1']; }
my @opt;
- eval '@opt ='.&Apache::run::run("{$args;".'return $options}',$safeeval);
+ eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+ &Apache::lonxml::debug("Options are $#opt");
if ($target eq 'web') {
- $result=&displayfoils($count,@opt);
+ $result.=&displayfoils($count,@opt);
+ } elsif ( $target eq 'answer') {
+ $result.=&displayanswers($count,@opt);
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my @whichopt = &whichfoils($count);
my $temp=1;my $name;
- my $allresponse;
+ my %responsehash;
my $right=0;
my $wrong=0;
my $ignored=0;
foreach $name (@whichopt) {
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
- $allresponse.="$response:";
+ $responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
&Apache::lonxml::debug("submitted a $response<br />\n");
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -76,7 +147,7 @@ sub end_foilgroup {
$temp++;
}
my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse;
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
if ($wrong==0 && $ignored==0) {
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
@@ -85,16 +156,17 @@ sub end_foilgroup {
}
}
}
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_table();
}
return $result;
}
sub getfoilcounts {
my ($parstack,$safeeval)=@_;
- my $rrargs ='';
- if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
- my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
- my $count = $#{ $Apache::response::foilgroup{'names'} };
+ my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+ # +1 since instructors will count from 1
+ my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
return ($count,$max);
}
@@ -102,8 +174,9 @@ sub whichfoils {
my ($max)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
my @whichopt =();
- while ((($#whichopt) < $max) && ($#names > -1)) {
- my $aopt=int rand $#names;
+ while ((($#whichopt+1) < $max) && ($#names > -1)) {
+ &Apache::lonxml::debug("Have $#whichopt max is $max");
+ my $aopt=int(rand($#names+1));
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);
&Apache::lonxml::debug("Picked $aopt");
@@ -112,6 +185,19 @@ sub whichfoils {
return @whichopt;
}
+sub displayanswers {
+ my ($max,@opt)=@_;
+ my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @whichopt = &whichfoils($max);
+ my $result=&Apache::response::answer_header('optionresponse');
+ foreach my $name (@whichopt) {
+ $result.=&Apache::response::answer_part('optionresponse',
+ $Apache::response::foilgroup{$name.'.value'})
+ }
+ $result.=&Apache::response::answer_footer('optionresponse');
+ return $result;
+}
+
sub displayfoils {
my ($max,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -125,7 +211,7 @@ sub displayfoils {
foreach $option (@opt) {
$optionlist.="<option>$option</option>\n";
}
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+ if (($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
foreach $name (@whichopt) {
$result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -144,46 +230,84 @@ sub displayfoils {
sub start_conceptgroup {
- $Apache::optionresponse::conceptgroup=1;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::optionresponse::conceptgroup=1;
%Apache::response::conceptgroup={};
- return '';
+ my $result;
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
+ $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
+ $result.="<tr><td colspan=\"3\">\n";
+ }
+ if ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
}
sub end_conceptgroup {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- $Apache::optionresponse::conceptgroup=0;
- if ($target eq 'web' || $target eq 'grade') {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int rand $#names+1;
- my $name=$names[$pick];
- push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
- $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
- my $args;
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
- $Apache::response::foilgroup{"$name.concept"} = $concept;
- &Apache::lonxml::debug("Selecting $name in $concept");
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::optionresponse::conceptgroup=0;
+ my $result='';
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ #if not there aren't any foils to display and thus no question
+ if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+ my @names = @{ $Apache::response::conceptgroup{'names'} };
+ my $pick=int rand $#names+1;
+ my $name=$names[$pick];
+ push @{ $Apache::response::foilgroup{'names'} }, $name;
+ $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
+ $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
+ my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+ $Apache::response::foilgroup{"$name.concept"} = $concept;
+ &Apache::lonxml::debug("Selecting $name in $concept");
+ }
}
- return '';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+sub insert_conceptgroup {
+ my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
+ return $result;
}
sub start_foil {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web') { &Apache::lonxml::startredirection; }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'web') {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,"Foil");
+ my $level='-2';
+ if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
+ my @opt;
+ eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
+ $result .= '</td></tr><tr><td colspan="3">';
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
}
sub end_foil {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
+ my $result = '';
if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
- if ($target eq 'web' || $target eq 'grade') {
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
- my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+ my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::lonxml::debug("Got a name of :$name:");
+ if (!$name) { $name=$Apache::lonxml::curdepth; }
+ &Apache::lonxml::debug("Using a name of :$name:");
if ( $Apache::optionresponse::conceptgroup ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
@@ -196,19 +320,16 @@ sub end_foil {
}
}
if ($target eq 'edit') {
- my $args ='';
- if ( $#$parstack > 1 ) { $args=$$parstack['-2']; }
- my $options=&Apache::run::run("{$args;".'return $options}',$safeeval);
- if (!$options && $#$parstack > 2 ) { $args=$$parstack['-2']; }
- my @opt;
- #eval '@opt ='.
+ $result.= &Apache::edit::tag_end($target,$token,'');
}
- return '';
+ return $result;
}
sub insert_foil {
return '
-<foil name="" value="">
+<foil name="" value="unused">
+<startouttext />
+<endouttext />
</foil>';
}
1;