--- loncom/homework/optionresponse.pm 2001/05/31 22:34:33 1.9
+++ loncom/homework/optionresponse.pm 2001/06/16 20:33:33 1.16
@@ -10,26 +10,29 @@ 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);
if ($target eq 'edit') {
- $result.="<table width=\"100%\" border=\"2\"><tr><td>Multiple Option Response Question</td>
+ $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
<td>Delete:".
&Apache::edit::deletelist($target,$token)
-."</td></tr><tr><td colspan=\"3\">\n";
+."</td><td> </td></tr><tr><td colspan=\"3\">\n";
}
return $result;
}
sub end_optionresponse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
pop @Apache::lonxml::namespace;
- return '';
+ my $result;
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ return $result;
}
sub insert_optionresponse {
@@ -42,25 +45,81 @@ sub insert_optionresponse {
%Apache::response::foilgroup={};
sub start_foilgroup {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+ my $result='';
%Apache::response::foilgroup={};
$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=0;
+ 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);
+ $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') {
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);
} elsif ( $target eq 'grade') {
@@ -94,14 +153,15 @@ sub end_foilgroup {
}
}
}
+ if ($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 $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);
@@ -154,14 +214,27 @@ 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') {
+ my $insertlist=&Apache::edit::insertlist($target,$token);
+ $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
+ my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+ $result.="Concept: <input name=\"$Apache::lonxml::curdepth.concept\" type=\"text\" value=\"$concept\" /></td></tr><tr><td colspan=\"3\">";
+ }
+ 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;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::optionresponse::conceptgroup=0;
+ my $result='';
if ($target eq 'web' || $target eq 'grade') {
my @names = @{ $Apache::response::conceptgroup{'names'} };
my $pick=int rand $#names+1;
@@ -169,31 +242,64 @@ sub end_conceptgroup {
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);
+ 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="\t\t<conceptgroup concept=\"\">\n".&insert_foil()."\t\t</conceptgroup>\n";
+ return $result;
}
sub start_foil {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
if ($target eq 'web') { &Apache::lonxml::startredirection; }
- return '';
+ if ($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);
+ my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval);
+ my $optionlist="<option>unused</option>\n";
+ foreach my $option (@opt) {
+ if ( $value eq $option ) {
+ $optionlist.="<option selected=\"on\">$option</option>\n";
+ } else {
+ $optionlist.="<option>$option</option>\n";
+ }
+ }
+ my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
+ $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" value=\"$name\" />".
+ "Correct Option:
+ <select name=\"$Apache::lonxml::curdepth.value\">
+ $optionlist
+ </select></td></tr><tr><td colspan=\"3\">";
+ }
+ if ($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);
+ 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);
+ if (!$name) { $name=$Apache::lonxml::curdepth; }
if ( $Apache::optionresponse::conceptgroup ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
@@ -206,19 +312,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;