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

version 1.26, 2001/12/04 14:57:31 version 1.31, 2002/01/17 12:23:31
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # option list style responses  # option list style responses
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 2/21 Guy  # 2/21 Guy
 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;".
           &Apache::edit::end_row().
           &Apache::edit::start_spanning_row().
           "\n";
     $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').      $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
       "</td></tr>";          &Apache::edit::end_row().
     $result.="<tr><td colspan=\"3\">\n";   &Apache::edit::start_spanning_row();
   }    }
   if ($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,
Line 40  sub end_optionresponse { Line 68  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(); }
   return $result;    return $result;
Line 72  sub start_foilgroup { Line 101  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 146  sub end_foilgroup { Line 175  sub end_foilgroup {
   }    }
   $temp++;    $temp++;
  }   }
    my $part=$Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
    my %previous=&Apache::response::check_for_previous($responsestr,
      $part,$id);
  &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");
    my $ad;
  if ($wrong==0 && $ignored==0) {   if ($wrong==0 && $ignored==0) {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';    $ad='EXACT_ANS';
    } elsif ($wrong==0 && $right==0) {
     #nothing submitted
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';    $ad='INCORRECT';
  }   }
    $Apache::lonhomework::results{"resource.$part.$id.submission"}=
     $responsestr;
    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
     $ad;
    &Apache::response::handle_previous(\%previous,$ad);
       }        }
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
Line 206  sub displayfoils { Line 246  sub displayfoils {
   my $result;    my $result;
   my $name;    my $name;
   my @whichopt = &whichfoils($max);    my @whichopt = &whichfoils($max);
   my $optionlist="<option></option>\n";    my $part=$Apache::inputtags::part;
   my $option;    my $id=$Apache::inputtags::response[-1];
   foreach $option (@opt) {    if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     $optionlist.="<option>$option</option>\n";  
   }  
   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";
     }      }
   } else {    } else {
     my $temp=1;      my $temp=1;
       my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
         my $lastopt=$lastresponse{$name};
         my $optionlist="<option></option>\n";
         my $option;
         foreach $option (@opt) {
    if ($option eq $lastopt) {
     $optionlist.="<option selected=\"on\">$option</option>\n";
    } else {
     $optionlist.="<option>$option</option>\n";
    }
         }
       $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"        $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
  .$optionlist   .$optionlist
   ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";    ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
Line 236  sub start_conceptgroup { Line 284  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 288  sub start_foil { Line 336  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); }

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


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