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

Diff for /loncom/homework/optionresponse.pm between versions 1.138 and 1.151.2.1

version 1.138, 2007/03/01 02:33:28 version 1.151.2.1, 2008/12/11 01:59:01
Line 45  sub start_optionresponse { Line 45  sub start_optionresponse {
   %Apache::hint::option=();    %Apache::hint::option=();
   undef(%Apache::response::foilnames);    undef(%Apache::response::foilnames);
   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 ".         .'<tr><td><span class="LC_nobreak">'.&mt('Multiple Option Response Question').'</span> '
  &Apache::loncommon::help_open_topic('Option_Response_Problems')."</td><td>Delete:".         .&Apache::loncommon::help_open_topic('Option_Response_Problems')."</td>"
  &Apache::edit::deletelist($target,$token)         .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
  ."</td><td>&nbsp;".         .&Apache::edit::deletelist($target,$token)
         &Apache::edit::end_row().         .'</span></td>'
         &Apache::edit::start_spanning_row().         ."<td>&nbsp;"
         "\n";         .&Apache::edit::end_row()
          .&Apache::edit::start_spanning_row()
          ."\n";
     $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',      $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
      $token,'4').       $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order','randomize',          &Apache::edit::select_arg('Randomize Foil Order:','randomize',
   ['yes','no'],$token).    ['yes','no'],$token).
         &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',          &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
   [['horizontal',&mt('Normal list')],    [['horizontal','Normal list'],
    ['vertical',&mt('Listed in a vertical column')]],$token).     ['vertical','Listed in a vertical column']],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();          &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,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
Line 70  sub start_optionresponse { Line 72  sub start_optionresponse {
     $result=&Apache::response::meta_package_write('optionresponse');      $result=&Apache::response::meta_package_write('optionresponse');
   } elsif ($target eq 'analyze') {    } elsif ($target eq 'analyze') {
     my $part_id="$Apache::inputtags::part.$id";      my $part_id="$Apache::inputtags::part.$id";
       $Apache::lonhomework::analyze{"$part_id.type"} = 'optionresponse';
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
       push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
   
   }    }
   return $result;    return $result;
 }  }
Line 275  sub end_foilgroup { Line 280  sub end_foilgroup {
  }   }
       }        }
     }      }
     &Apache::lonxml::increment_counter(&getfoilcounts($max));      my $part_id     = $Apache::inputtags::part;
       my $response_id = $Apache::inputtags::response[-1];
       &Apache::lonxml::increment_counter(&getfoilcounts($max),
          "$part_id.$response_id");
       if ($target eq 'analyze') {
    &Apache::lonhomework::set_bubble_lines();
       }
   
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();      $result.=&Apache::edit::end_table();
   }    }
Line 355  sub check_for_invalid { Line 367  sub check_for_invalid {
     }      }
 }  }
   
 sub setup_prior_tries_hash {  
     my ($whichopt) = @_;  
     my $part=$Apache::inputtags::part;  
     my $id=$Apache::inputtags::response[-1];  
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {  
  my $key = "$i:resource.$part.$id.submission";  
  next if (!exists($Apache::lonhomework::history{"$key"}));  
  my %lastresponse=  
     &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});  
  my $output;  
  foreach my $name (@$whichopt) {  
     next if (!defined($lastresponse{$name}));  
     $output .= '<td>'.$lastresponse{$name}.'</td>';  
  }  
  next if (!defined($output));  
  $output =  
     '<table class="LC_optres_prior"><tr>'.$output.'</tr></table>';  
  $Apache::inputtags::submission_display{$key} = $output;  
     }  
 }  
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;    my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
Line 444  sub displayfoils { Line 435  sub displayfoils {
       }        }
       if ($target ne 'tex') {        if ($target ne 'tex') {
   if ($Apache::lonhomework::type ne 'exam') {    if ($Apache::lonhomework::type ne 'exam') {
       $optionlist='<select name="HWVAL_'.        $optionlist='<select onchange="javascript:setSubmittedPart(\''.
     $part.'\');" name="HWVAL_'.
   $Apache::inputtags::response['-1'].':'.$temp.'">'.    $Apache::inputtags::response['-1'].':'.$temp.'">'.
   $optionlist."</select>\n";    $optionlist."</select>\n";
   } else {    } else {
Line 498  sub displayfoils { Line 490  sub displayfoils {
   }    }
   
   if ($target eq 'web') {    if ($target eq 'web') {
       &setup_prior_tries_hash(\@whichopt);        &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,
    [\@whichopt,
    'submissiongrading']);
   }    }
   
   if ($target ne 'tex') {    if ($target ne 'tex') {
Line 511  sub displayfoils { Line 505  sub displayfoils {
   
 sub optionlist_correction {  sub optionlist_correction {
     my ($TeXlayout,@options) = @_;      my ($TeXlayout,@options) = @_;
     my $texoptionlist='\\item [] Choices: ';      my $texoptionlist='\\item [] '.&mt('Choices:').' ';
     if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}      if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
     if (scalar(@options) > 0) {      if (scalar(@options) > 0) {
  foreach my $option (@options) {   foreach my $option (@options) {
Line 559  sub webbubbles { Line 553  sub webbubbles {
   
   
 sub bubbles {  sub bubbles {
     my ($ralphabet,$ropt,$response) = @_;      my ($ralphabet,$ropt,$response, $max_width) = @_;
     my @alphabet = @$ralphabet;      my @alphabet = @$ralphabet;
     my @opt = @$ropt;      my @opt = @$ropt;
     my ($result,$head,$line) =('','','');      my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;      my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;      my $current_length = 0;
     my $textwidth;      my $textwidth;
     if ($env{'form.textwidth'} ne '') {      if (defined($max_width)) {
    $textwidth=$max_width;
    &Apache::lonxml::debug("Max width passed in: $max_width");
       } elsif ($env{'form.textwidth'} ne '') {
  $env{'form.textwidth'}=~/(\d+)/;   $env{'form.textwidth'}=~/(\d+)/;
  $textwidth=$1;   $textwidth=$1;
    &Apache::lonxml::debug("Max width from form: $textwidth");
     } else {      } else {
  $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;   $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1.'.'.$2;   $textwidth=$1.'.'.$2;
    &Apache::lonxml::debug("Max width defaults? $textwidth");
     }      }
       &Apache::lonxml::debug("Final maxwidth: $textwidth");
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
  my $leftmargin;   my $leftmargin;
  $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);   $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
  if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}   if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
  if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}   if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
   
  $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;   $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
  if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {   if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
     $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';      $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
Line 685  sub end_foil { Line 686  sub end_foil {
       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:");        &Apache::lonxml::debug("Got a name of :$name:");
       if ($name eq "") {        if ($name eq "") {
   &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");    &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
   $name=$Apache::lonxml::curdepth;    $name=$Apache::lonxml::curdepth;
       }        }
       &Apache::lonxml::debug("Using a name of :$name:");        &Apache::lonxml::debug("Using a name of :$name:");
       if (defined($Apache::response::foilnames{$name})) {        if (defined($Apache::response::foilnames{$name})) {
   &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));    &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
       }        }
       $Apache::response::foilnames{$name}++;        $Apache::response::foilnames{$name}++;
       my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);        my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
Line 716  sub end_foil { Line 717  sub end_foil {
   
 sub start_drawoptionlist {  sub start_drawoptionlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if (($target ne 'meta')  && ($target ne 'answer')) {      if ($target !~ /^(?:meta|answer|modified|edit)$/) {
  return $token->[4];   return $token->[4];
     }      }
 }  }
   
 sub end_drawoptionlist {  sub end_drawoptionlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if (($target ne 'meta') && ($target ne 'answer')) {      if ($target !~ /^(?:meta|answer|modified|edit)$/) {
  return $token->[2];   return $token->[2];
     }      }
 }  }
   
 sub insert_foil {  sub insert_foil {
   return '      return '
 <foil name="" value="unused">  <foil name="" value="unused">
 <startouttext />  <startouttext />
 <endouttext />  <endouttext />
 </foil>';  </foil>';
 }  }
   
   sub insert_drawoptionlist {
       return '<drawoptionlist />';
   }
 1;  1;
 __END__  __END__
     
Removed from v.1.138  
changed lines
  Added in v.1.151.2.1

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