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

Diff for /loncom/homework/rankresponse.pm between versions 1.39 and 1.55

version 1.39, 2004/10/07 20:28:30 version 1.55, 2007/10/15 09:47:29
Line 67  sub start_rankresponse { Line 67  sub start_rankresponse {
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $part_id="$Apache::inputtags::part.$id";   my $part_id="$Apache::inputtags::part.$id";
  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 105  sub end_foilgroup { Line 107  sub end_foilgroup {
  if (!defined($tol)) { $tol=0; }   if (!defined($tol)) { $tol=0; }
  if ($target eq 'web' || $target eq 'tex') {   if ($target eq 'web' || $target eq 'tex') {
     $result=&displayfoils($target,$max,$randomize,$tol);      $result=&displayfoils($target,$max,$randomize,$tol);
       $Apache::lonxml::post_evaluate=0;
  } elsif ($target eq 'answer' ) {   } elsif ($target eq 'answer' ) {
     $result=&displayanswers($max,$randomize,$tol);      $result=&displayanswers($max,$randomize,$tol);
  } elsif ( $target eq 'grade') {   } elsif ( $target eq 'grade') {
Line 113  sub end_foilgroup { Line 116  sub end_foilgroup {
     my @shown = &whichfoils($max,$randomize);      my @shown = &whichfoils($max,$randomize);
     &Apache::response::analyze_store_foilgroup(\@shown,      &Apache::response::analyze_store_foilgroup(\@shown,
   ['text','value','location']);    ['text','value','location']);
       my $part_id=
    "$Apache::inputtags::part.$Apache::inputtags::response[-1]";
       $Apache::lonhomework::analyze{"$part_id.tol"}=$tol;
    }
    my $part = $Apache::inputtags::part;
    my $id   = $Apache::inputtags::response[-1];
    &Apache::lonxml::increment_counter(&getfoilcounts($max),
      "$part.$id");
    if ($target eq 'analyze') {
       &Apache::lonhomework::set_bubble_lines();
  }   }
  &Apache::lonxml::increment_counter(&getfoilcounts($max));  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
Line 163  sub displayanswers { Line 175  sub displayanswers {
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &whichfoils($max,$randomize);      my @whichfoils = &whichfoils($max,$randomize);
     my $result=&Apache::response::answer_header('rankresponse');  
     my @correctorder=&get_correct_order($tol,@whichfoils);      my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $order (@correctorder) {      my $result;
  $result.=&Apache::response::answer_part('rankresponse',$order);      if ($Apache::lonhomework::type eq 'exam') {
    my @alphabet = ('A'..'Z');
    my $i=0;
    foreach my $order (@correctorder) {
       $result.=&Apache::response::answer_header('rankresponse',$i++);
       $result.=&Apache::response::answer_part('rankresponse',
       $alphabet[$order-1]);
       $result.=&Apache::response::answer_part('rankresponse',$order);
       $result.=&Apache::response::answer_footer('rankresponse');
    }
       } else {
    $result=&Apache::response::answer_header('rankresponse');
    foreach my $order (@correctorder) {
       $result.=&Apache::response::answer_part('rankresponse',$order);
    }
    $result.=&Apache::response::answer_footer('rankresponse');
     }      }
     $result.=&Apache::response::answer_footer('rankresponse');  
     return $result;      return $result;
 }  }
   
 sub check_response_order {  sub check_response_order {
     my (%responsehash)=@_;      my (%responsehash)=@_;
     my @order=sort(values(%responsehash));      my @order=sort( {$a <=> $b} values(%responsehash));
     my $lastvalue=0;      my $lastvalue=0;
     my $expected=1;      my $expected=1;
     my $malformed=0;      my $malformed=0;
Line 192  sub check_response_order { Line 217  sub check_response_order {
 sub grade_response {  sub grade_response {
     my ($max,$randomize,$tol)=@_;      my ($max,$randomize,$tol)=@_;
     my (@whichfoils)=&whichfoils($max,$randomize);      my (@whichfoils)=&whichfoils($max,$randomize);
     if (!defined($ENV{'form.submitted'})) { return; }      if (!&Apache::response::submitted()) { return; }
     my %responsehash;      my %responsehash;
     my %grade;      my %grade;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);      my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
Line 235  sub grade_response { Line 260  sub grade_response {
     $ad='MISSING_ANSWER';      $ad='MISSING_ANSWER';
  }   }
     }      }
       if ($Apache::lonhomework::type eq 'survey' &&
    ($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) {
    $ad='SUBMITTED';
       } else {
    $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
       }
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
  $responsestr;   $responsestr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;  
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
 }  }
   
   sub format_prior_answer {
       my ($mode,$answer,$other_data) = @_;
       my %lastresponse=&Apache::lonnet::str2hash($answer);
       my $foil_order  =$other_data->[0];
       my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
       my $output;
       foreach my $name (@{ $foil_order }) {
    next if (!defined($lastresponse{$name}));
    $output .= '<tr><td>'.$lastresponse{$name}.'</td></tr>';
       }
       return if (!defined($output));
       $output =
    '<table class="LC_prior_rank">'.$output.'</table>';
       return $output;
   }
   
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize,$tol)=@_;      my ($target,$max,$randomize,$tol)=@_;
     my $result;      my $result;
Line 255  sub displayfoils { Line 301  sub displayfoils {
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     my $value=shift(@correctorder);      my $value=shift(@correctorder);
     if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}      if ($target eq 'web') {
     $result.=$value.':'.$text;   $result.='<br /><b>'.$value.':</b> '.$text;
       } else {
    $result.=' \strut\\\\\strut '.$value.':'.$text;
       }
  }   }
     } else {      } else {
  my $i = 0;   my $i = 0;
Line 280  sub displayfoils { Line 329  sub displayfoils {
  }   }
     }      }
     if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {      if ($target ne 'tex' && $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 309  sub displayfoils { Line 359  sub displayfoils {
     $temp++;      $temp++;
  }   }
     }      }
       if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
     [\@whichfoils,
      'submissiongrading']);
       }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}      if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;      return $result;
 }  }
Line 411  sub end_foil { Line 466  sub end_foil {
     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') {   $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 ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $text='\vskip 5mm $\triangleright$ '.$text;
    }
  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);
     &Apache::lonxml::debug("Got a name of :$name:");      &Apache::lonxml::debug("Got a name of :$name:");
     if (!$name) { $name=$Apache::lonxml::curdepth; }      if ($name eq "") {
    &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
    $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 <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
Line 426  sub end_foil { Line 487  sub end_foil {
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {   $Apache::response::conceptgroup{"$name.text"} = $text;
     $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;  
  } else {  
     $Apache::response::conceptgroup{"$name.text"} = $text;  
  }  
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {   $Apache::response::foilgroup{"$name.text"} = $text;
     $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;  
  } else {  
     if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {  
  $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;  
     } else {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     }   
  }  
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
     }      }
  }   }
Removed from v.1.39  
changed lines
  Added in v.1.55

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