[BACK]Return to optionresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/optionresponse.pm between versions 1.28 and 1.36

version 1.28, 2001/12/07 23:58:35 version 1.36, 2002/04/01 21:26:57
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 2/21 Guy  # 2/21 Guy
   # 01/18 Alex
 package Apache::optionresponse;  package Apache::optionresponse;
 use strict;  use strict;
 use Apache::response;  use Apache::response;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));    &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
 }  }
   
 sub start_optionresponse {  sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   #when in a radiobutton response use these    #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   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).      $result.=&Apache::edit::start_table($token).
       "<tr><td>Multiple Option Response Question</td><td>Delete:".   "<tr><td>Multiple Option Response Question</td><td>Delete:".
  &Apache::edit::deletelist($target,$token)   &Apache::edit::deletelist($target,$token)
   ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";   ."</td><td>&nbsp;".
     $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').          &Apache::edit::end_row().
       "</td></tr>";          &Apache::edit::start_spanning_row().
     $result.="<tr><td colspan=\"3\">\n";          "\n";
   }      $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
   if ($target eq 'modified') {          &Apache::edit::end_row().
    &Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  $safeeval,'max');   $safeeval,'max');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    } elsif ($target eq 'meta') {
   if ($target eq 'meta') {  
     $result=&Apache::response::meta_package_write('optionresponse');      $result=&Apache::response::meta_package_write('optionresponse');
     } elsif ($target eq 'analyze') {
       my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
       push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }    }
   #  if ($target eq 'tex') {$result .= '\begin{itemize}';}
   return $result;    return $result;
 }  }
   
Line 65  sub end_optionresponse { Line 71  sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;    my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   #  if ($target eq 'tex') {$result .= '\end{itemize}';}
   return $result;    return $result;
 }  }
   
Line 97  sub start_foilgroup { Line 105  sub start_foilgroup {
         </td>          </td>
         <td>Delete an Option:          <td>Delete an Option:
   <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>    <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
         </td>  
      </tr>  
      <tr><td colspan="3">$insertlist<br />  
 ENDTABLE  ENDTABLE
       $result.= &Apache::edit::end_row();
       $result.= &Apache::edit::start_spanning_row();
       $result.= $insertlist.'<br />';
   }    }
   if ($target eq 'modified') {    if ($target eq 'modified') {
     my @options;      my @options;
Line 132  ENDTABLE Line 140  ENDTABLE
       $result.=')">';        $result.=')">';
     } # else nothing changed so just use the default mechanism      } # else nothing changed so just use the default mechanism
   }    }
     if ($target eq 'tex') {$result .= '\begin{itemize}';}
   return $result;    return $result;
 }  }
   
Line 139  sub end_foilgroup { Line 148  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 eq 'grade' || $target eq 'web' || $target eq 'answer') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
     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 147  sub end_foilgroup { Line 156  sub end_foilgroup {
     my @opt;      my @opt;
     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' || $target eq 'tex') {
       $result.=&displayfoils($count,@opt);        $result.=&displayfoils($target,$count,@opt);
     } elsif ( $target eq 'answer') {      } elsif ( $target eq 'answer') {
       $result.=&displayanswers($count,@opt);        $result.=&displayanswers($count,@opt);
       } elsif ( $target eq 'analyze') {
         my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
         foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
    if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
    push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
    $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
     $Apache::response::foilgroup{"$name.value"};
    $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
     $Apache::response::foilgroup{"$name.text"};
         }
         push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
         push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count));
     } 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);
Line 163  sub end_foilgroup { Line 184  sub end_foilgroup {
   my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};    my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
   $responsehash{$name}=$response;    $responsehash{$name}=$response;
   if ( $response =~ /[^\s]/) {    if ( $response =~ /[^\s]/) {
     &Apache::lonxml::debug("submitted a $response<br />\n");  
     my $value=$Apache::response::foilgroup{$name.'.value'};      my $value=$Apache::response::foilgroup{$name.'.value'};
       &Apache::lonxml::debug("submitted a $response for $value<br />\n");
     if ($value eq $response) {$right++;} else {$wrong++;}      if ($value eq $response) {$right++;} else {$wrong++;}
   } else {    } else {
     $ignored++;      $ignored++;
Line 183  sub end_foilgroup { Line 204  sub end_foilgroup {
  } elsif ($wrong==0 && $right==0) {   } elsif ($wrong==0 && $right==0) {
   #nothing submitted    #nothing submitted
  } else {   } else {
   $ad='INCORRECT';    if ($ignored==0) {
       $ad='INCORRECT';
     } else {
       $ad='MISSING_ANSWER';
     }
  }   }
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=   $Apache::lonhomework::results{"resource.$part.$id.submission"}=
   $responsestr;    $responsestr;
Line 194  sub end_foilgroup { Line 219  sub end_foilgroup {
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();      $result.=&Apache::edit::end_table();
   }    }  
     if ($target eq 'tex') {$result .= '\end{itemize}';}
   return $result;    return $result;
 }  }
   
Line 235  sub displayanswers { Line 261  sub displayanswers {
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($max,@opt)=@_;    my ($target,$max,@opt)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my $result;    my $result;
   my $name;    my $name;
     $Apache::optionresponse::displayoptionintex=0;
   my @whichopt = &whichfoils($max);    my @whichopt = &whichfoils($max);
   my $part=$Apache::inputtags::part;    my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];    my $id=$Apache::inputtags::response[-1];
   if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
       $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.        if ($target eq 'web') {
  ":".$Apache::response::foilgroup{$name.'.text'}."\n";    $result.="<br />";
         } elsif ($target eq 'tex') {
    $result.='\newline';
         }
         $result .=$Apache::response::foilgroup{$name.'.value'}.
     ":".$Apache::response::foilgroup{$name.'.text'}."\n";
     }      }
   } else {    } else {
     my $temp=1;      my $temp=1;
Line 263  sub displayfoils { Line 295  sub displayfoils {
   $optionlist.="<option>$option</option>\n";    $optionlist.="<option>$option</option>\n";
  }   }
       }        }
       $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"        if ($target ne 'tex') {
  .$optionlist    $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
   ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";        .$optionlist
       $temp++;    ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
     $temp++;
         } else {
     if ($Apache::optionresponse::displayoptionintex == 0) {
                 my $durtyoptionlist = $optionlist;
         $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
         $durtyoptionlist =~ s/<option>/{\\bf /g;
         $durtyoptionlist =~ s/<\/option>/},/g;
         $durtyoptionlist =~ s/,$/\./g;
         $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
         $Apache::optionresponse::displayoptionintex=1;
     } else {
         $result.= $Apache::response::foilgroup{$name.'.text'};
     }
         } 
     }      }
     } 
     if ($target ne 'tex') {
         return $result."<br />";
     }
     else {
         return $result;
   }    }
   return $result."<br />";  
 }  }
   
   
Line 280  sub start_conceptgroup { Line 331  sub start_conceptgroup {
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");      $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
     $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";      $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
     $result.="<tr><td colspan=\"3\">\n";          &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   }    }
   if ($target eq 'modified') {    if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
Line 294  sub end_conceptgroup { Line 345  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;
   my $result='';    my $result='';
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
         || $target eq 'tex' || $target eq 'analyze') {
     #if not there aren't any foils to display and thus no question      #if not there aren't any foils to display and thus no question
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };        my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int rand $#names+1;        my $pick=int rand $#names+1;
       my $name=$names[$pick];        my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;        push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};        $Apache::response::foilgroup{"$name.value"} =
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};   $Apache::response::conceptgroup{"$name.value"};
         $Apache::response::foilgroup{"$name.text"} =
    $Apache::response::conceptgroup{"$name.text"};
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);        my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");        &Apache::lonxml::debug("Selecting $name in $concept");
         if ($target eq 'analyze') {
    my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
           push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
         $concept);
    $Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
     $Apache::response::conceptgroup{'names'};
    foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
     push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
    $name);
     $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
       $Apache::response::conceptgroup{"$name.value"};
     $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
       $Apache::response::conceptgroup{"$name.text"};
    }
         }
     }      }
   }    } elsif ($target eq 'edit') {
   if ($target eq 'edit') {  
     $result=&Apache::edit::end_table();      $result=&Apache::edit::end_table();
   }    }
   return $result;    return $result;
Line 322  sub insert_conceptgroup { Line 390  sub insert_conceptgroup {
 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') {    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
     &Apache::lonxml::startredirection;      &Apache::lonxml::startredirection;
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");      $result=&Apache::edit::tag_start($target,$token,"Foil");
Line 332  sub start_foil { Line 400  sub start_foil {
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     $result.=&Apache::edit::text_arg('Name:','name',$token);      $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');      $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
     $result .= '</td></tr><tr><td colspan="3">';      $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    } 
     if ($target eq 'tex') {$result .= '\item ';}
   return $result;    return $result;
 }  }
   
Line 344  sub end_foil { Line 413  sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';    my $text ='';
   my $result = '';    my $result = '';
   if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }    if ($target eq 'web' || $target eq 'tex') { 
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {        $text=&Apache::lonxml::endredirection; 
     }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
         || $target eq 'tex' || $target eq 'analyze') {
     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);
Removed from v.1.28  
changed lines
  Added in v.1.36

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