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

Diff for /loncom/homework/matchresponse.pm between versions 1.77 and 1.79

version 1.77, 2009/11/23 12:05:36 version 1.79, 2010/02/28 23:39:00
Line 392  sub grade_response { Line 392  sub grade_response {
  $itemstr;   $itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=      $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
  $gradestr;   $gradestr;
     if ($Apache::lonhomework::type eq 'survey') {      if (($Apache::lonhomework::type eq 'survey') ||
           ($Apache::lonhomework::type eq 'surveycred') ||
           ($Apache::lonhomework::type eq 'anonsurvey') ||
           ($Apache::lonhomework::type eq 'anonsurveycred')) {
  if ($ignored == 0) {   if ($ignored == 0) {
     my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';      my $ad;
               if ($Apache::lonhomework::type eq 'anonsurvey') {
                   $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
               } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
                   $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
               } elsif ($Apache::lonhomework::type eq 'surveycred') {
                   $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
               } else {
                   $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
               }
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
  } elsif ($wrong==0 && $right==0) {   } elsif ($wrong==0 && $right==0) {
  } else {   } else {
Line 500  sub displayfoils { Line 512  sub displayfoils {
  my $temp=1;   my $temp=1;
  my $id=$Apache::inputtags::response[-1];   my $id=$Apache::inputtags::response[-1];
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
  my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};          my $lastresponse;
           unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
       $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
           }
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);       my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
  my @alphabet=('A'..'Z');   my @alphabet=('A'..'Z');
  my @used_letters=sort(keys(%letter_name_map));   my @used_letters=sort(keys(%letter_name_map));
Line 518  sub displayfoils { Line 533  sub displayfoils {
                         my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';                          my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';
                         $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);                          $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
                     } else {                      } else {
  &Apache::lonnet::logthis("Exam2");  
   
                         $optionlist='\framebox[10 mm][s]{\tiny\strut}';                          $optionlist='\framebox[10 mm][s]{\tiny\strut}';
                     }                      }
Line 575  sub displayfoils { Line 589  sub displayfoils {
     $question.="<br />\n".$text;      $question.="<br />\n".$text;
  }   }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     &Apache::lonnet::logthis('webbubbles');  
     my @blank;      my @blank;
     $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);      $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
  }   }
Line 584  sub displayfoils { Line 597  sub displayfoils {
  # confine the bubbles to righttabsize:   # confine the bubbles to righttabsize:
  #   #
  if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {   if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {
     &Apache::lonnet::logthis('exam3');  
     $question.=' '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text."\n";
     my @emptyItems = ();      my @emptyItems = ();
     for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}      for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
Line 599  sub displayfoils { Line 611  sub displayfoils {
     $question .= '\end{list} \vskip -8 mm \strut ';      $question .= '\end{list} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
     &Apache::lonnet::logthis("Exam4");  
                     if($env{'form.pdfFormFields'} eq 'yes'                       if($env{'form.pdfFormFields'} eq 'yes' 
                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {                              && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
                         $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';                          $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
Line 744  sub end_foil { Line 755  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') {
  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
     &Apache::lonnet::logthis('triangleright');  
     $text='\vskip 5mm $\triangleright$ '.$text;      $text='\vskip 5mm $\triangleright$ '.$text;
  }   }
  my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
Line 764  sub end_foil { Line 774  sub end_foil {
      $safeeval);       $safeeval);
     if ( $Apache::matchresponse::conceptgroup      if ( $Apache::matchresponse::conceptgroup
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  &Apache::lonnet::logthis("pushing 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;
  $Apache::response::conceptgroup{"$name.text"} = $text;   $Apache::response::conceptgroup{"$name.text"} = $text;
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
  &Apache::lonnet::logthis("pushing foilgroup.");  
   
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
Removed from v.1.77  
changed lines
  Added in v.1.79

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