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

Diff for /loncom/homework/response.pm between versions 1.172 and 1.213

version 1.172, 2007/06/20 22:36:52 version 1.213, 2009/03/16 18:20:22
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   =pod
   
   =head1 NAME
   
   Apache::resonse.pm
   
   =head1 SYNOPSIS
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 NOTABLE SUBROUTINES
   
   =over
   
   =item 
   
   =back
   
   =cut
   
   
 package Apache::response;  package Apache::response;
 use strict;  use strict;
 use Apache::lonlocal;  use Apache::lonlocal;
Line 216  sub meta_stores_write { Line 239  sub meta_stores_write {
       "></stores>\n";        "></stores>\n";
 }  }
   
   =pod
   
   =item mandatory_part_meta()
   
   Autogenerate metadata for mandatory
   input (from RAT or lonparmset) and
   output (to lonspreadsheet)
   of each part
   
   Note: responseid-specific data 'submission' and 'awarddetail'
   not available to spreadsheet -> skip here
   
   =cut
   
   
 sub mandatory_part_meta {  sub mandatory_part_meta {
 #      return &meta_package_write('part').
 # Autogenerate metadata for mandatory             &meta_stores_write('solved','string','Problem Status').
 # input (from RAT or lonparmset) and              &meta_stores_write('tries','int_zeropos','Number of Attempts').
 # output (to lonspreadsheet)             &meta_stores_write('awarded','float','Partial Credit Factor');
 # of each part  
 #  
     return  
 #    &meta_parameter_write('opendate','date_start','',  
 #                          'Opening Date').  
 #    &meta_parameter_write('duedate','date_end','',  
 #                          'Due Date').  
 #    &meta_parameter_write('answerdate','date_start','',  
 #                          'Show Answer Date').  
 #    &meta_parameter_write('weight','int_zeropos','',  
 #                          'Available Points').  
 #    &meta_parameter_write('maxtries','int_pos','',  
 #                          'Maximum Number of Tries').  
  &meta_package_write('part').  
         &meta_stores_write('solved','string',  
    'Problem Status').  
         &meta_stores_write('tries','int_zeropos',  
    'Number of Attempts').  
         &meta_stores_write('awarded','float',  
    'Partial Credit Factor');  
 #  
 # Note: responseid-specific data 'submission' and 'awarddetail'  
 # not available to spreadsheet -> skip here  
 #  
 }  }
   
 sub meta_part_order {  sub meta_part_order {
Line 269  sub check_for_previous { Line 283  sub check_for_previous {
     my %previous;      my %previous;
     $previous{'used'} = 0;      $previous{'used'} = 0;
     foreach my $key (sort(keys(%Apache::lonhomework::history))) {      foreach my $key (sort(keys(%Apache::lonhomework::history))) {
  if ($key =~ /resource\.$partid\.$id\.submission$/) {   if ($key =~ /resource\.\Q$partid\E\.\Q$id\E\.submission$/) {
     if ( $last && $key =~ /^(\d+):/ ) {      if ( $last && $key =~ /^(\d+):/ ) {
  next if ($1 >= $last);   next if ($1 >= $last);
     }      }
Line 288  sub check_for_previous { Line 302  sub check_for_previous {
     $previous{'last'}='1';      $previous{'last'}='1';
  }   }
  if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; }   if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN'; }
                   if ($previous{'award'} eq 'INTERNAL_ERROR') { $previous{'used'}=0; }
  &Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:");   &Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:");
     }      }
  }   }
Line 451  sub end_customresponse { Line 466  sub end_customresponse {
     }      }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());   &Apache::lonxml::increment_counter(&Apache::response::repetition(),
      "$part.$id");
    if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
       &Apache::lonhomework::set_bubble_lines();
    }
     }      }
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
     pop(@Apache::response::custom_answer);      pop(@Apache::response::custom_answer);
Line 481  sub start_mathresponse { Line 501  sub start_mathresponse {
    $safeeval);     $safeeval);
     $Apache::inputtags::answertxt{$id}=[$answer];      $Apache::inputtags::answertxt{$id}=[$answer];
  }   }
   
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('String to display for answer:',   $result.=&Apache::edit::text_arg('String to display for answer:',
Line 490  sub start_mathresponse { Line 511  sub start_mathresponse {
    ['maxima'],     ['maxima'],
    $token);     $token);
  $result.=&Apache::edit::text_arg('Argument Array:',   $result.=&Apache::edit::text_arg('Argument Array:',
  'args',$token);   'args',$token).
                    &Apache::loncommon::help_open_topic('Maxima_Argument_Array');
           $result.=&Apache::edit::text_arg('Libraries:',
                                            'libraries',$token).
                    &Apache::loncommon::help_open_topic('Maxima_Libraries');
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag;   my $constructtag;
  $constructtag=&Apache::edit::get_new_args($token,$parstack,   $constructtag=&Apache::edit::get_new_args($token,$parstack,
   $safeeval,'answerdisplay','cas','args');    $safeeval,'answerdisplay','cas','args','libraries');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
Line 507  sub start_mathresponse { Line 532  sub start_mathresponse {
     return $result;      return $result;
 }  }
   
   sub edit_mathresponse_button {
       my ($id,$field)=@_;
       my $button=&mt('Edit Answer');
   #    my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
       my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
       return(<<ENDFORMULABUTTON);
   <script type="text/javascript" language="JavaScript">
   function edit_${id}_${field} (textarea) {
       thenumber = textarea;
       thedata = document.forms['lonhomework'].elements[textarea].value;
       newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
   }
   </script>
   <a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$button' title='$button'/></a>
   ENDFORMULABUTTON
   }
   
 sub end_mathresponse {  sub end_mathresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
Line 527  sub end_mathresponse { Line 569  sub end_mathresponse {
     my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);      my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
             if ($cas eq 'maxima') {              if ($cas eq 'maxima') {
                 my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];                  my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
                 $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);                  $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args,
                                                         &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
             }              }
     if (!&Apache::inputtags::valid_award($award)) {      if (!&Apache::inputtags::valid_award($award)) {
  $error = $award;   $error = $award;
Line 544  sub end_mathresponse { Line 587  sub end_mathresponse {
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  &setup_prior_tries_hash(\&format_prior_response_math);   &setup_prior_tries_hash(\&format_prior_response_math);
           my $partid = $Apache::inputtags::part;
           my $id = $Apache::inputtags::response[-1];
           if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')
              && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
               $result.=&edit_mathresponse_button($id,"HWVAL_$id");
           }
     }      }
   
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
Line 569  sub implicit_multiplication { Line 618  sub implicit_multiplication {
     $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;      $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
 # Fill in multiplication signs  # Fill in multiplication signs
 # a b -> a*b;3 b -> 3*b;3 4 -> 3*4  # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
     $expression=~s/(\w)\s+(\w)/$1\*$2/gs;      $expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
 # )( -> )*(; ) ( -> )*(  # )( -> )*(; ) ( -> )*(
     $expression=~s/\)\s*\(/\)\*\(/gs;      $expression=~s/\)\s*\(/\)\*\(/gs;
 # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A  # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
     $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;      $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
 # a ( -> a*(  # a ( -> a*(
     $expression=~s/(\w)\s+\(/$1\*\(/gs;      $expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs;
 # )a -> )*a; )3 -> )*3; ) 3 -> )*3  # )a -> )*a; )3 -> )*3; ) 3 -> )*3
     $expression=~s/\)\s*(\w)/\)\*$1/gs;      $expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs;
 # 3&8 -> 3e8; 3&-4 -> 3e-4  # 3&8 -> 3e8; 3&-4 -> 3e-4
     $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;      $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
     return $expression;      return $expression;
Line 646  sub start_responseparam { Line 695  sub start_responseparam {
     }      }
  }   }
  if (defined($optionlist)) {   if (defined($optionlist)) {
     $result.='Use template: <select name="'.      $result.=&mt('Use template:').' <select name="'.
  &Apache::edit::html_element_name('parameter_package').'">'.   &Apache::edit::html_element_name('parameter_package').'">'.
     '<option value=""></option>'.$optionlist.'</select><br />';      '<option value=""></option>'.$optionlist.'</select><br />';
  }   }
Line 671  sub start_responseparam { Line 720  sub start_responseparam {
  $Apache::lonnet::packagetab{"$tag&$name&display"};   $Apache::lonnet::packagetab{"$tag&$name&display"};
     $token->[2]->{'default'}=      $token->[2]->{'default'}=
  $Apache::lonnet::packagetab{"$tag&$name&default"};   $Apache::lonnet::packagetab{"$tag&$name&default"};
               $token->[3] = ['name','type','description','default'];
     $constructtag=1;      $constructtag=1;
  }   }
  if ($constructtag) {   if ($constructtag) {
Line 795  sub answer_part { Line 845  sub answer_part {
     last;      last;
  }   }
     }      }
     if ($answer ne '') {              my $fullanswer=$answer;
  $answer = '\verb'.$to_use.$answer.$to_use;              $answer='';
     }              foreach my $element (split(/[\;]/,$fullanswer)) {
          if ($element ne '') {
     $answer.= '\verb'.$to_use.$element.$to_use.' \newline';
          }
               }
  }   }
  if ($answer ne '') {   if ($answer ne '') {
     push(@answer_bits,$answer);      push(@answer_bits,$answer);
Line 816  sub answer_footer { Line 870  sub answer_footer {
     my ($type) = @_;      my ($type) = @_;
     my $result;      my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  my $columns = scalar(@answer_bits);   $result  = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline ';
  $result  = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline ';   $result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}';
  $result .= join(' & ',@answer_bits);          for (my $i=1;$i<=$#answer_bits;$i++) {
  $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';              $result.='\item '.$answer_bits[$i].'\vspace*{-7mm}';
           }
    $result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm ';
     } else {      } else {
  $result = '</tr></table>';   if (!$need_row_start) {
       $result .= '</tr>';
    }
    $result .= '</table>';
     }      }
     return $result;      return $result;
 }  }
Line 843  sub showallfoils { Line 902  sub showallfoils {
   
 =pod  =pod
   
 =item &getresponse($offset,$resulttype);  =item &getresponse();
   
 Retreives the current submitted response, helps out in the case of  Retreives the current submitted response, helps out in the case of
 scantron mode.  scantron mode.
Line 865  Optional Arguments: Line 924  Optional Arguments:
                       $lines lines of bubbles.                        $lines lines of bubbles.
   $bubbles_per_line - Must be provided if lines is defined.. number of    $bubbles_per_line - Must be provided if lines is defined.. number of
                       bubbles on a line.                        bubbles on a line.
   
 =cut  =cut
   
 sub getresponse {  sub getresponse {
Line 879  sub getresponse { Line 939  sub getresponse {
     if (!defined($lines)) {      if (!defined($lines)) {
  $lines = 1;   $lines = 1;
     }      }
   
     my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,      my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
     'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,      'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
     'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,      'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,
Line 889  sub getresponse { Line 948  sub getresponse {
  my $id    = $Apache::inputtags::response[-1];   my $id    = $Apache::inputtags::response[-1];
   
  my $line;   my $line;
    my $startline = $env{'form.scantron_questnum_start.'.$part.'.'.$id};
           if (!$startline) {
               $startline = $Apache::lonxml::counter;
           }
  for ($line = 0; $line < $lines; $line++) {   for ($line = 0; $line < $lines; $line++) {
     $response = $env{'scantron.'.              my $theline = $startline+$offset-1+$line;
  ($Apache::lonxml::counter+$offset-1+$line).      $response = $env{"scantron.$theline.answer"};
  '.answer'};      if ((defined($response)) && ($response ne "") && ($response ne " ")) {
     if ($response ne "") {  
  last;   last;
     }      }
        
  }   }
   
    # save bubbled letter for later
    $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
       $response;
  if ($resulttype ne 'letter') {   if ($resulttype ne 'letter') {
     if ($resulttype eq 'A is 1') {      if ($resulttype eq 'A is 1') {
  $response = $let_to_num{$response}+1;   $response = $let_to_num{$response}+1;
Line 912  sub getresponse { Line 978  sub getresponse {
  $response = chr(ord($response) + $line * $bubbles_per_line);   $response = chr(ord($response) + $line * $bubbles_per_line);
     }      }
  }   }
  # save submitted response for later  
  $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=  
     $response;  
   
     } else {      } else {
  $response = $env{$formparm};   $response = $env{$formparm};
Line 947  sub repetition { Line 1010  sub repetition {
   
 =pod  =pod
   
 =item &scored_response($part_id,$response_id);  =item &scored_response();
   
 Sets the results hash elements  Sets the results hash elements
   
Line 1043  sub show_answer { Line 1106  sub show_answer {
     my $award  = $Apache::lonhomework::history{"resource.$part.solved"};      my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
     my $status = $Apache::inputtags::status[-1];      my $status = $Apache::inputtags::status[-1];
     return  ( ($award =~ /^correct/      return  ( ($award =~ /^correct/
        && lc($Apache::lonhomework::problemstatus) ne 'no')         && &Apache::lonhomework::show_problem_status())
       || $status eq "SHOW_ANSWER");        || $status eq "SHOW_ANSWER");
 }  }
   
Line 1104  sub pick_foil_for_concept { Line 1167  sub pick_foil_for_concept {
  $Apache::response::conceptgroup{'names'};   $Apache::response::conceptgroup{'names'};
   
 }  }
 #------------------------------------------------------------  
 #  =pod
 #  Get a parameter associated with a problem.  
 # Parameters:  =item get_response_param()
 #  $id        - the id of the paramater, either a part id,   
 #               or a partid and responspe id joined by _  Get a parameter associated with a problem.
 #  $name      - Name of the parameter to fetch  Parameters:
 #  $default   - Default value for the paramter.   $id        - the id of the paramater, either a part id, 
 #                or a partid and responspe id joined by _
 #     $name      - Name of the parameter to fetch
 #   $default   - Default value for the paramter.
   
   =cut
   
 sub get_response_param {  sub get_response_param {
     my ($id,$name,$default)=@_;      my ($id,$name,$default)=@_;
     my $parameter;      my $parameter;
Line 1148  sub submitted { Line 1214  sub submitted {
     }      }
     # Submit All button on a .page was pressed      # Submit All button on a .page was pressed
     if (defined($env{'form.all_submit'})) { return 1; }      if (defined($env{'form.all_submit'})) { return 1; }
     # otherwise no submission occured      # otherwise no submission occurred
     return 0;      return 0;
 }  }
   
Line 1175  sub add_to_gradingqueue { Line 1241  sub add_to_gradingqueue {
     }      }
 }  }
   
 # basically undef and 0 (both false) mean that they still have work to do  =pod 
 # and all true values mean that they can't do any more work  
 #  =item check_status()
 # a return of undef means it is unattempted  
 # a return of 0 means it is attmpted and wrong but still has tries  basically undef and 0 (both false) mean that they still have work to do
 # a return of 1 means it is marked correct  and all true values mean that they can't do any more work
 # a return of 2 means they have exceed maximum number of tries  
 # a return of 3 means it after the answer date   a return of undef means it is unattempted
    a return of 0 means it is attmpted and wrong but still has tries
    a return of 1 means it is marked correct
    a return of 2 means they have exceed maximum number of tries
    a return of 3 means it after the answer date
   
   =cut
   
 sub check_status {  sub check_status {
     my ($id)=@_;      my ($id)=@_;
     if (!defined($id)) { $id=$Apache::inputtags::part; }      if (!defined($id)) { $id=$Apache::inputtags::part; }
Line 1205  sub check_status { Line 1278  sub check_status {
     return 2;      return 2;
 }  }
   
   =pod
   
   =item setup_prior_tries_hash()
   
     Foreach each past .submission $func is called with 3 arguments
        - the mode to set things up for (currently always 'grade')
        - the stored .submission string
        - The expansion of $data
   
     $data is an array ref containing elements that are either
       - scalars that are other elements of the history hash to pass to $func
       - ref to data to be passed untouched to $func
   
   =cut
   
 sub setup_prior_tries_hash {  sub setup_prior_tries_hash {
     my ($func,$data) = @_;      my ($func,$data) = @_;
     my $part = $Apache::inputtags::part;      my $part = $Apache::inputtags::part;
Line 1235  sub setup_prior_tries_hash { Line 1323  sub setup_prior_tries_hash {
 1;  1;
 __END__  __END__
     
   =pod
   
   =cut
Removed from v.1.172  
changed lines
  Added in v.1.213

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