--- loncom/homework/optionresponse.pm 2001/06/12 22:42:55 1.14
+++ loncom/homework/optionresponse.pm 2001/08/06 20:33:23 1.22
@@ -20,24 +20,24 @@ sub start_optionresponse {
$result.=&Apache::edit::start_table($token)."
Multiple Option Response Question
Delete:".
&Apache::edit::deletelist($target,$token)
-." \n";
+ ." \n";
+ $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4')." ";
+ $result.="\n";
+ }
+ if ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
-
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 '
-
-
-
- ';
+ my $result;
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ return $result;
}
%Apache::response::foilgroup={};
@@ -53,9 +53,10 @@ sub start_foilgroup {
my $option;
my @opt;
eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
- my $count=0;
+ my $count=1;
foreach $option (@opt) {
$optionlist.="$option \n";
+ $count++;
}
my $insertlist=&Apache::edit::insertlist($target,$token);
$result.=&Apache::edit::start_table($token);
@@ -77,7 +78,8 @@ ENDTABLE
eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
- splice(@options,$delopt,1);
+ &Apache::lonxml::debug("Deleting :$delopt:");
+ splice(@options,$delopt-1,1);
$optchanged=1;
}
if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
@@ -107,7 +109,7 @@ sub end_foilgroup {
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 }
@@ -148,6 +150,9 @@ sub end_foilgroup {
}
}
}
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::end_table();
+ }
return $result;
}
@@ -206,26 +211,49 @@ 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')." ";
+ $result.="\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,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- $Apache::optionresponse::conceptgroup=0;
+ $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;
- 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");
+ #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");
+ }
+ }
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
- return '';
+ return $result;
+}
+
+sub insert_conceptgroup {
+ my $result="\n\t\t".&insert_foil()."\n\t\t \n";
+ return $result;
}
sub start_foil {
@@ -234,14 +262,17 @@ sub start_foil {
if ($target eq 'web') { &Apache::lonxml::startredirection; }
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,'-2');
- my $optionlist=" \n";
- foreach my $option (@opt) {
- $optionlist.="$option \n";
- }
- $result.="Name: ".
- "Correct Option:$optionlist ";
+ 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 .= ' ';
+ }
+ 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;
}
@@ -255,7 +286,9 @@ sub end_foil {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
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;
@@ -275,7 +308,7 @@ sub end_foil {
sub insert_foil {
return '
-
+
';