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

Diff for /loncom/homework/inputtags.pm between versions 1.248.4.2 and 1.249

version 1.248.4.2, 2009/09/14 17:03:42 version 1.249, 2008/11/25 13:16:17
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
   
   =pod
   
   =head1 NAME
   
   Apache::inputtags
   
   =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::inputtags;  package Apache::inputtags;
 use HTML::Entities();  use HTML::Entities();
 use strict;  use strict;
Line 38  BEGIN { Line 62  BEGIN {
     &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));      &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
 }  }
   
 #   Initializes a set of global variables used during the parse of the problem.  =pod
 #  
 #  @Apache::inputtags::input        - List of current input ids.  =item initialize_inputtags()
 #  @Apache::inputtags::inputlist    - List of all input ids seen this problem.  
 #  @Apache::inputtags::response     - List of all current resopnse ids.  Initializes a set of global variables used during the parse of the problem.
 #  @Apache::inputtags::responselist - List of all response ids seen this   
 #                                       problem.  @Apache::inputtags::input        - List of current input ids.
 #  @Apache::inputtags::hint         - List of all hint ids.  @Apache::inputtags::inputlist    - List of all input ids seen this problem.
 #  @Apache::inputtags::hintlist     - List of all hint ids seen this problem.  @Apache::inputtags::response     - List of all current resopnse ids.
 #  @Apache::inputtags::previous     - List describing if specific responseds  @Apache::inputtags::responselist - List of all response ids seen this 
 #                                       have been used                                       problem.
 #  @Apache::inputtags::previous_version - Submission responses were used in.  @Apache::inputtags::hint         - List of all hint ids.
 #  $Apache::inputtags::part         - Current part id (valid only in   @Apache::inputtags::hintlist     - List of all hint ids seen this problem.
 #                                       <problem>)  @Apache::inputtags::previous     - List describing if specific responseds
 #                                     0 if not in a part.                                       have been used
 #  @Apache::inputtags::partlist     - List of part ids seen in the current  @Apache::inputtags::previous_version - Submission responses were used in.
 #                                       <problem>  $Apache::inputtags::part         - Current part id (valid only in 
 #  @Apache::inputtags::status       - List of problem  statuses. First                                        <problem>)
 #                                     element is the status of the <problem>                                     0 if not in a part.
 #                                     the remainder are for individual <part>s.  @Apache::inputtags::partlist     - List of part ids seen in the current
 #  %Apache::inputtags::params       - Hash of defined parameters for the                                       <problem>
 #                                     current response.  @Apache::inputtags::status       - List of problem  statuses. First 
 #  @Apache::inputtags::import       - List of all ids for <import> thes get                                     element is the status of the <problem>
 #                                     join()ed and prepended.                                     the remainder are for individual <part>s.
 #  @Apache::inputtags::importlist   - List of all import ids seen.  %Apache::inputtags::params       - Hash of defined parameters for the
 #  $Apache::inputtags::response_with_no_part                                     current response.
 #                                   - Flag set true if we have seen a response  @Apache::inputtags::import       - List of all ids for <import> thes get
 #                                     that is not inside a <part>                                     join()ed and prepended.
 #  %Apache::inputtags::answertxt    - <*response> tags store correct  @Apache::inputtags::importlist   - List of all import ids seen.
 #                                     answer strings for display by <textline/>  $Apache::inputtags::response_with_no_part
 #                                     in this hash.                                   - Flag set true if we have seen a response
 #  %Apache::inputtags::submission_display                                     that is not inside a <part>
 #                                   - <*response> tags store improved display  %Apache::inputtags::answertxt    - <*response> tags store correct
 #                                     of submission strings for display by part                                     answer strings for display by <textline/>
 #                                     end.                                     in this hash.
   %Apache::inputtags::submission_display
                                    - <*response> tags store improved display
                                      of submission strings for display by part
                                      end.
   
   =cut
   
 sub initialize_inputtags {  sub initialize_inputtags {
     @Apache::inputtags::input=();      @Apache::inputtags::input=();
Line 424  sub end_hiddenline { Line 454  sub end_hiddenline {
     return "";      return "";
 }  }
   
 # $part -> partid  =pod
 # $id -> responseid  
 # $uploadefiletypes -> comma seperated list of extensions allowed or * for any  =item file_selector()
 # $which -> 'uploadonly'  -> only newly uploaded files  
 #           'portfolioonly' -> only allow files from portfolio  $part -> partid
 #           'both' -> allow files from either location  $id -> responseid
 # $extratext -> additional text to go between the link and the input box  $uploadefiletypes -> comma seperated list of extensions allowed or * for any
 # $maxfilesize -> maximum cumulative filesize for submitted files (in MB).  $which -> 'uploadedonly'  -> only newly uploaded files
 # returns a table row <tr>             'portfolioonly' -> only allow files from portfolio
             'both' -> allow files from either location
   $extratext -> additional text to go between the link and the input box
   returns a table row <tr> 
   
   =cut
   
 sub file_selector {  sub file_selector {
     my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_;      my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;
     if (!$uploadedfiletypes) { return ''; }      if (!$uploadedfiletypes) { return ''; }
   
     my $jspart=$part;      my $jspart=$part;
Line 443  sub file_selector { Line 479  sub file_selector {
     my $result;      my $result;
           
     $result.='<tr><td>';      $result.='<tr><td>';
     if (($uploadedfiletypes ne '*') || ($maxfilesize)) {      if ($uploadedfiletypes ne '*') {
         if ($uploadedfiletypes ne '*') {   $result.=
             $result.=      &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
                 &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';  
         }  
         if ($maxfilesize) {  
             $result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',  
                          '<b>'.$maxfilesize.'</b>').'<br />';  
         }  
         $result .= '<br />';  
     }      }
     if ($which eq 'uploadonly' || $which eq 'both') {       if ($which eq 'uploadonly' || $which eq 'both') { 
  $result.=&mt('Submit a file: (only one file can be uploaded)').   $result.=&mt('Submit a file: (only one file can be uploaded)').
Line 469  sub file_selector { Line 498  sub file_selector {
     '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.      '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
     '<br />';      '<br />';
  $result .= &show_past_portfile_submission($part,$id);   $result .= &show_past_portfile_submission($part,$id);
   
     }      }
     $result.='</td></tr>';       $result.='</td></tr>'; 
     return $result;      return $result;
Line 530  sub valid_award { Line 560  sub valid_award {
        'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',         'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
        'UNIT_FAIL', 'NO_UNIT',         'UNIT_FAIL', 'NO_UNIT',
        'UNIT_NOTNEEDED', 'WANTED_NUMERIC',         'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
        'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',          'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', 
        'MISORDERED_RANK', 'INVALID_FILETYPE',         'MISORDERED_RANK', 'INVALID_FILETYPE',
                                'EXCESS_FILESIZE', 'DRAFT',                                 'EXCESS_FILESIZE', 'DRAFT',
        'SUBMITTED', 'ASSIGNED_SCORE',         'SUBMITTED', 'ASSIGNED_SCORE',
Line 545  sub valid_award { Line 575  sub valid_award {
   'TOO_LONG',    'TOO_LONG',
   'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',    'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
   'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',    'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
   'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',    'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
   'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',    'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
   'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',    'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
                   'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');                    'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
Line 593  sub finalizeawards { Line 623  sub finalizeawards {
     return ('NO_RESPONSE');      return ('NO_RESPONSE');
  }   }
     }      }
   
     if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; }  
   
     if (!$final_scantron && defined($result)) { return ($result); }      if (!$final_scantron && defined($result)) { return ($result); }
   
     # if in scantron mode, if the award for any response is       # if in scantron mode, if the award for any response is 
Line 776  sub decideoutput { Line 803  sub decideoutput {
         $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');          $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
         $css_class=$possible_class{'not_charged_try'};          $css_class=$possible_class{'not_charged_try'};
         $button=1;          $button=1;
   
     } elsif ($award eq 'INVALID_FILETYPE') {      } elsif ($award eq 'INVALID_FILETYPE') {
  $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');   $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
  $css_class=$possible_class{'not_charged_try'};   $css_class=$possible_class{'not_charged_try'};
Line 819  sub decideoutput { Line 847  sub decideoutput {
         if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};          if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
  $css_class=$possible_class{'not_charged_try'};   $css_class=$possible_class{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'INTERNAL_ERROR') {  
         $message = &mt("An internal error occurred while processing your answer. Please try again later.");  
         $css_class=$possible_class{'not_charged_try'};  
         $button=1;  
     } elsif ($award eq 'INCORRECT') {      } elsif ($award eq 'INCORRECT') {
  $message = &mt("Incorrect").'.';   $message = &mt("Incorrect").'.';
  $css_class=$possible_class{'charged_try'};   $css_class=$possible_class{'charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'SUBMITTED') {      } elsif ($award eq 'SUBMITTED') {
  $message = &mt("Your submission has been recorded.");   $message = &mt("Your submission has been recorded.");
         if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {  
             if ($target eq 'web') {  
                 $message .= '<br />'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');  
             }  
         }  
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     } elsif ($award eq 'DRAFT') {      } elsif ($award eq 'DRAFT') {
Line 859  sub decideoutput { Line 878  sub decideoutput {
     my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();      my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
     foreach my $resid(@Apache::inputtags::response){      foreach my $resid(@Apache::inputtags::response){
         if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {          if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
             if ($target eq 'tex') {      $message.='<br />';
                 $message.= "\\\\\n";  
             } else {  
                 $message.='<br />';  
             }  
     my @files = split(/\s*,\s*/,      my @files = split(/\s*,\s*/,
       $Apache::lonhomework::history{"resource.$part.$resid.handback"});        $Apache::lonhomework::history{"resource.$part.$resid.handback"});
     my $file_msg;      my $file_msg;
     foreach my $file (@files) {      foreach my $file (@files) {
                 if ($target eq 'tex') {   $file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
                     $file_msg.= "\\\\\n".$file;  
                 } else {  
                     $file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';  
                 }  
     }      }
     $message .= &mt('Returned file(s): [_1]',$file_msg);      $message .= &mt('Returned file(s): [_1]',$file_msg);
             if ($target eq 'tex') {  
                 $message.= "\\\\\n";  
             } else {  
                 $message.='<br />';  
             }  
  }   }
     }      }
   
     if (&Apache::lonhomework::hide_problem_status()      if (&Apache::lonhomework::hide_problem_status()
  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'   && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
  && &hide_award($award)) {   && &hide_award($award)) {
         if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {   $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
             if ($target eq 'web') {  
                 $message = &mt("Your submission has been recorded.").'<br />'.  
                            &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');  
             }  
         } else {  
             $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");  
         }  
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     }      }
Line 1208  sub get_grade_messages { Line 1207  sub get_grade_messages {
  $trystr = '\vskip 0 mm ';   $trystr = '\vskip 0 mm ';
     }      }
  } else {   } else {
             $trystr = '<td><span class="LC_nobreak">';      $trystr = "<td><nobr>".$tries_text." $tries";
             my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});      if ($Apache::lonhomework::parsing_a_task) {
             if ($parmhash{'suppress_tries'} ne 'yes') {      } elsif($env{'request.state'} ne 'construct') {
                 $trystr .= "$tries_text $tries";   $trystr.="/$maxtries";
         if ($Apache::lonhomework::parsing_a_task) {      } else {
         } elsif($env{'request.state'} ne 'construct') {   if (defined($Apache::inputtags::params{'maxtries'})) {
     $trystr.="/$maxtries";      $trystr.="/".$Apache::inputtags::params{'maxtries'};
         } else {   }
     if (defined($Apache::inputtags::params{'maxtries'})) {      }
         $trystr.="/".$Apache::inputtags::params{'maxtries'};      $trystr.="</nobr></td>";
     }  
         }  
             }  
     $trystr.="</span></td>";  
  }   }
     }      }
   
Line 1261  sub gradestatus { Line 1256  sub gradestatus {
  if ( $status eq 'SHOW_ANSWER') {   if ( $status eq 'SHOW_ANSWER') {
     undef($previousmsg);      undef($previousmsg);
  }   }
  if ( $showbutton ) {   if ( $showbutton ) { 
             if ($target ne 'tex') {      if ($target ne 'tex') {
                 my $submit_text = &mt('Submit Answer');  
                 if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {  
                     $submit_text = &mt('Submit Questions');  
                 }  
  $button =    $button = 
     '<input       '<input 
                           onmouseup="javascript:setSubmittedPart(\''.$id.'\')"                            onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
                            onsubmit="javascript:setSubmittedPart(\''.$id.'\')"                             onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
                         type="submit" name="submit_'.$id.'"                          type="submit" name="submit_'.$id.'"
                          value="'.$submit_text.'" />';                           value="'.&mt('Submit Answer').'" />';
     }      }
  }   }
   
Line 1380  sub previous_tries { Line 1371  sub previous_tries {
     $prefix =~ tr{.}{_};      $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.      my $function_name = "LONCAPA_previous_tries_".$prefix.
  $Apache::lonxml::curdepth.'_'.$env{'form.counter'};   $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
     my $triestext = &mt('Previous Tries');  
     if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {  
         $triestext = &mt('Submission History');  
     }  
     my $result ="<script type=\"text/javascript\">      my $result ="<script type=\"text/javascript\">
 // <![CDATA[  // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}      function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>  // ]]>
 </script><a href=\"javascript:$function_name();void(0);\">".$triestext."</a><br />";  </script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
     #use Data::Dumper;      #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));      #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;      return $result;
Line 1396  sub previous_tries { Line 1383  sub previous_tries {
   
 1;  1;
 __END__  __END__
   
   =pod
   
   =back
   
   =cut
     
Removed from v.1.248.4.2  
changed lines
  Added in v.1.249

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