Diff for /loncom/homework/optionresponse.pm between versions 1.6 and 1.20

version 1.6, 2001/05/04 21:19:37 version 1.20, 2001/07/18 20:27:21
Line 10  sub BEGIN { Line 10  sub BEGIN {
 }  }
   
 sub start_optionresponse {  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    #when in a radiobutton response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
     push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';    if ($target eq 'edit') {
       $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
   <td>Delete:".
     &Apache::edit::deletelist($target,$token)
       ."</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); }
     }
     return $result;
 }  }
   
 sub end_optionresponse {  sub end_optionresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;    &Apache::response::end_response;
   return '';    pop @Apache::lonxml::namespace;
     my $result;
     if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     return $result;
 }  }
   
 %Apache::response::foilgroup={};  %Apache::response::foilgroup={};
 sub start_foilgroup {  sub start_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $result='';
   %Apache::response::foilgroup={};    %Apache::response::foilgroup={};
   $Apache::optionresponse::conceptgroup=0;      $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &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=1;
       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,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 {  sub end_foilgroup {
   my ($target,$token,$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') {
     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 } 
     &Apache::lonxml::debug("Count is $count from $max");      &Apache::lonxml::debug("Count is $count from $max");
     my $args ='';  
     if ( $#$parstack > 0 ) { $args=$$parstack['-1']; }  
     my @opt;      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') {      if ($target eq 'web') {
       $result=&displayfoils($count,@opt);        $result=&displayfoils($count,@opt);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
Line 52  sub end_foilgroup { Line 126  sub end_foilgroup {
  my $allresponse;   my $allresponse;
  my $right=0;   my $right=0;
  my $wrong=0;   my $wrong=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:";    $allresponse.="$response:";
Line 59  sub end_foilgroup { Line 134  sub end_foilgroup {
     &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'};
     if ($value eq $response) {$right++;} else {$wrong++;}      if ($value eq $response) {$right++;} else {$wrong++;}
     } else {
       $ignored++;
   }    }
   $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"}=$allresponse;
  &Apache::lonxml::debug("Got $right right and $wrong wrong");   &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
  if ($wrong==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';
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
Line 73  sub end_foilgroup { Line 150  sub end_foilgroup {
       }        }
     }      }
   }    }
     if ($target eq 'edit') {
       $result.=&Apache::edit::end_table();
     }
   return $result;    return $result;
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($parstack,$safeeval)=@_;    my ($parstack,$safeeval)=@_;
   my $rrargs ='';    my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }    # +1 since instructors will count from 1
   my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);    my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
   my $count = $#{ $Apache::response::foilgroup{'names'} };  
   return ($count,$max);    return ($count,$max);
 }  }
   
Line 89  sub whichfoils { Line 168  sub whichfoils {
   my ($max)=@_;    my ($max)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();    my @whichopt =();
   while ((($#whichopt) < $max) && ($#names > -1)) {    while ((($#whichopt+1) < $max) && ($#names > -1)) {
     my $aopt=int rand $#names;      &Apache::lonxml::debug("Have $#whichopt max is $max");
       my $aopt=int(rand($#names+1));
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");      &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);      $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");      &Apache::lonxml::debug("Picked $aopt");
Line 131  sub displayfoils { Line 211  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,$parstack,$parser,$safeeval,$style)=@_;    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') {    if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };      #if not there aren't any foils to display and thus no question
     my $pick=int rand $#names+1;      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     my $name=$names[$pick];        my @names = @{ $Apache::response::conceptgroup{'names'} };
     push @{ $Apache::response::foilgroup{'names'} }, $name;        my $pick=int rand $#names+1;
     $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};        my $name=$names[$pick];
     $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};        push @{ $Apache::response::foilgroup{'names'} }, $name;
     my $args;        $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }        $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
     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::response::foilgroup{"$name.concept"} = $concept;
     &Apache::lonxml::debug("Selecting $name in $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<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
     return $result;
 }  }
   
 sub start_foil {  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; }    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);
       $result.=&Apache::edit::text_arg('Name:','name',$token);
       $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
       $result .= '</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 {  sub end_foil {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';    my $text ='';
     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') {
     my $args ='';      my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }  
     my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);  
     if ($value ne 'unused') {      if ($value ne 'unused') {
       my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);        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 ) {        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 183  sub end_foil { Line 301  sub end_foil {
     }      }
   }    }
   if ($target eq 'edit') {    if ($target eq 'edit') {
     my $args ='';      $result.= &Apache::edit::tag_end($target,$token,'');
     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 ='.  
   }    }
   return '';    return $result;
 }  }
   
   sub insert_foil {
     return '
   <foil name="" value="unused">
   <startouttext />
   <endouttext />
   </foil>';
   }
 1;  1;
 __END__  __END__
     

Removed from v.1.6  
changed lines
  Added in v.1.20


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