Diff for /loncom/homework/optionresponse.pm between versions 1.14 and 1.26

version 1.14, 2001/06/12 22:42:55 version 1.26, 2001/12/04 14:57:31
Line 17  sub start_optionresponse { Line 17  sub start_optionresponse {
   push (@Apache::lonxml::namespace,'optionresponse');    push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>      $result.=&Apache::edit::start_table($token).
 <td>Delete:".        "<tr><td>Multiple Option Response Question</td><td>Delete:".
   &Apache::edit::deletelist($target,$token)   &Apache::edit::deletelist($target,$token)
 ."</td></tr><tr><td colspan=\"3\">\n";    ."</td><td>&nbsp;</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;    return $result;
 }  }
   
 sub end_optionresponse {  sub end_optionresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
   return '';    my $result;
 }    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     return $result;
 sub insert_optionresponse {  
   return '  
 <optionresponse max="10">  
     <foilgroup options=\"\">  
     </foilgroup>  
 </optionresponse>';  
 }  }
   
 %Apache::response::foilgroup={};  %Apache::response::foilgroup={};
Line 53  sub start_foilgroup { Line 58  sub start_foilgroup {
     my $option;      my $option;
     my @opt;      my @opt;
     eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
     my $count=0;      my $count=1;
     foreach $option (@opt) {      foreach $option (@opt) {
       $optionlist.="<option value=\"$count\">$option</option>\n";        $optionlist.="<option value=\"$count\">$option</option>\n";
         $count++;
     }      }
     my $insertlist=&Apache::edit::insertlist($target,$token);      my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::start_table($token);      $result.=&Apache::edit::start_table($token);
Line 77  ENDTABLE Line 83  ENDTABLE
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {      if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
       my $delopt=$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;        $optchanged=1;
     }      }
     if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {      if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
Line 107  sub end_foilgroup { Line 114  sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       
   my $result;    my $result;
   if ($target ne 'meta') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
     my $name;      my $name;
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);      my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max }       if ($count>$max) { $count=$max } 
Line 116  sub end_foilgroup { Line 123  sub end_foilgroup {
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     &Apache::lonxml::debug("Options are $#opt");      &Apache::lonxml::debug("Options are $#opt");
     if ($target eq 'web') {      if ($target eq 'web') {
       $result=&displayfoils($count,@opt);        $result.=&displayfoils($count,@opt);
       } elsif ( $target eq 'answer') {
         $result.=&displayanswers($count,@opt);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {        if ( defined $ENV{'form.submitted'}) {
  my @whichopt = &whichfoils($count);   my @whichopt = &whichfoils($count);
  my $temp=1;my $name;   my $temp=1;my $name;
  my $allresponse;   my %responsehash;
  my $right=0;   my $right=0;
  my $wrong=0;   my $wrong=0;
  my $ignored=0;   my $ignored=0;
  foreach $name (@whichopt) {   foreach $name (@whichopt) {
   my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};    my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
   $allresponse.="$response:";    $responsehash{$name}=$response;
   if ( $response =~ /[^\s]/) {    if ( $response =~ /[^\s]/) {
     &Apache::lonxml::debug("submitted a $response<br />\n");      &Apache::lonxml::debug("submitted a $response<br />\n");
     my $value=$Apache::response::foilgroup{$name.'.value'};      my $value=$Apache::response::foilgroup{$name.'.value'};
Line 138  sub end_foilgroup { Line 147  sub end_foilgroup {
   $temp++;    $temp++;
  }   }
  my $id = $Apache::inputtags::response['-1'];   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");   &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
  if ($wrong==0 && $ignored==0) {   if ($wrong==0 && $ignored==0) {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
Line 147  sub end_foilgroup { Line 156  sub end_foilgroup {
  }   }
       }        }
     }      }
     } elsif ($target eq 'edit') {
       $result.=&Apache::edit::end_table();
   }    }
   return $result;    return $result;
 }  }
Line 174  sub whichfoils { Line 185  sub whichfoils {
   return @whichopt;    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 {  sub displayfoils {
   my ($max,@opt)=@_;    my ($max,@opt)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
Line 187  sub displayfoils { Line 211  sub displayfoils {
   foreach $option (@opt) {    foreach $option (@opt) {
     $optionlist.="<option>$option</option>\n";      $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) {      foreach $name (@whichopt) {
       $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.        $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
  ":".$Apache::response::foilgroup{$name.'.text'}."\n";   ":".$Apache::response::foilgroup{$name.'.text'}."\n";
Line 206  sub displayfoils { Line 230  sub displayfoils {
   
   
 sub start_conceptgroup {  sub start_conceptgroup {
   $Apache::optionresponse::conceptgroup=1;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::optionresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};    %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 {  sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=0;      $Apache::optionresponse::conceptgroup=0;
   if ($target eq 'web' || $target eq 'grade') {    my $result='';
     my @names = @{ $Apache::response::conceptgroup{'names'} };    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $pick=int rand $#names+1;      #if not there aren't any foils to display and thus no question
     my $name=$names[$pick];      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     push @{ $Apache::response::foilgroup{'names'} }, $name;        my @names = @{ $Apache::response::conceptgroup{'names'} };
     $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};        my $pick=int rand $#names+1;
     $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};        my $name=$names[$pick];
     my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);        push @{ $Apache::response::foilgroup{'names'} }, $name;
     $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
     &Apache::lonxml::debug("Selecting $name in $concept");        $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 {  sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   if ($target eq 'web') { &Apache::lonxml::startredirection; }    if ($target eq 'web') {
   if ($target eq 'edit') {      &Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");      $result=&Apache::edit::tag_start($target,$token,"Foil");
       my $level='-2';
       if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
     my @opt;      my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,'-2');      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     my $optionlist="<option></option>\n";      $result.=&Apache::edit::text_arg('Name:','name',$token);
     foreach my $option (@opt) {      $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
       $optionlist.="<option>$option</option>\n";      $result .= '</td></tr><tr><td colspan="3">';
     }    } elsif ($target eq 'modified') {
     $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" />".      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
       "Correct Option:<select>$optionlist</select></td></tr><tr><td colspan=\"3\">";      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    }
   return $result;    return $result;
 }  }
Line 251  sub end_foil { Line 301  sub end_foil {
   my $text ='';    my $text ='';
   my $result = '';    my $result = '';
   if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }    if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {      if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);        my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
         &Apache::lonxml::debug("Got a name of :$name:");
       if (!$name) { $name=$Apache::lonxml::curdepth; }        if (!$name) { $name=$Apache::lonxml::curdepth; }
         &Apache::lonxml::debug("Using a name of :$name:");
       if ( $Apache::optionresponse::conceptgroup ) {        if ( $Apache::optionresponse::conceptgroup ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
Line 275  sub end_foil { Line 327  sub end_foil {
   
 sub insert_foil {  sub insert_foil {
   return '    return '
 <foil name="" value="">  <foil name="" value="unused">
 <startouttext />  <startouttext />
 <endouttext />  <endouttext />
 </foil>';  </foil>';

Removed from v.1.14  
changed lines
  Added in v.1.26


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>