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

Diff for /loncom/homework/optionresponse.pm between versions 1.32 and 1.38

version 1.32, 2002/01/18 16:37:05 version 1.38, 2002/04/25 21:35:30
Line 50  sub start_optionresponse { Line 50  sub start_optionresponse {
         &Apache::edit::end_row().          &Apache::edit::end_row().
         &Apache::edit::start_spanning_row().          &Apache::edit::start_spanning_row().
         "\n";          "\n";
     $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').      $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
         &Apache::edit::end_row().          &Apache::edit::end_row().
  &Apache::edit::start_spanning_row();   &Apache::edit::start_spanning_row();
   }    } elsif ($target eq 'modified') {
   if ($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}';}  #  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
   return $result;    return $result;
 }  }
   
Line 73  sub end_optionresponse { Line 74  sub end_optionresponse {
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &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}';}  #  if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;    return $result;
 }  }
   
Line 139  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}';}    if ($target eq 'tex') {$result .= '\begin{enumerate}';}
   return $result;    return $result;
 }  }
   
Line 147  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' || $target eq 'tex') {    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 159  sub end_foilgroup { Line 160  sub end_foilgroup {
       $result.=&displayfoils($target,$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 171  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 191  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 203  sub end_foilgroup { Line 220  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}';}    if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;    return $result;
 }  }
   
Line 329  sub end_conceptgroup { Line 346  sub end_conceptgroup {
   $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 '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 357  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' || $target eq 'tex') {    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 384  sub end_foil { Line 417  sub end_foil {
       $text=&Apache::lonxml::endredirection;         $text=&Apache::lonxml::endredirection; 
   }    }
   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 '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.32  
changed lines
  Added in v.1.38

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