Return to inputtags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.226 and 1.333.2.12.2.4

-version 1.226, 2007/05/29 21:14:45
+version 1.333.2.12.2.4, 2023/09/11 12:09:06
  Line 25
  #
  # 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;
  use HTML::Entities();
  use strict;
  use Apache::loncommon;
+ use Apache::lonhtmlcommon;
  use Apache::lonlocal;
  use Apache::lonnet;
- use lib '/home/httpd/lib/perl/';
  use LONCAPA;
  BEGIN {
-     &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
+     &Apache::lonxml::register('Apache::inputtags',('hiddensubmission','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>
+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 {
      @Apache::inputtags::input=();
- Line 95  sub initialize_inputtags {
+ Line 125  sub initialize_inputtags {
      %Apache::inputtags::submission_display=();
  }
+ #
+ #  provides the onblur binding for spellchecking.  This could be an
+ #  empty string if spellchecking was not enabled.
+ #  Jquery selector binding is done rather than setting an onblur
+ #  attribute because we'll need to set the element's spellcheck language
+ #  option dynamically so we need $(this) to be defined.
+ #
+ # @param id   - The element id to bind.
+ # @param lang - Language in which spellchecking is desired.
+ #               if undef, nothing is generated.
+ # @return string - onblur specification to do the requested spellchecking.
+ #
+ sub spellcheck_onblur {
+     my ($id, $lang) = @_;
+     my $result = '';
+     if ($lang) {
+ 	$result = <<JAVASCRIPT;
+ <script type="text/javascript">
+ \$('\#$id').blur(function() {
+     doSpellcheck('\#$id', '$lang');
+  });
+ </script>
+ JAVASCRIPT
+     }
+     return $result;
+ }
  sub check_for_duplicate_ids {
      my %check;
      foreach my $id (@Apache::inputtags::partlist,
- Line 116  sub check_for_duplicate_ids {
+ Line 177  sub check_for_duplicate_ids {
  sub start_input {
      my ($parstack,$safeeval)=@_;
-     my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
+     my $id = &Apache::lonxml::get_id($parstack,$safeeval);
-     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
      push (@Apache::inputtags::input,$id);
      push (@Apache::inputtags::inputlist,$id);
      return $id;
- Line 146  sub start_textfield {
+ Line 206  sub start_textfield {
      if ($target eq 'web') {
  	$Apache::lonxml::evaluate--;
  	my $partid=$Apache::inputtags::part;
- 	my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
+         my ($oldresponse,$newvariation);
+         if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') ||
+              ($Apache::lonhomework::type eq 'randomizetry')) &&
+              ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+             if ($env{'form.'.$partid.'.rndseed'} ne
+                 $Apache::lonhomework::history{"resource.$partid.rndseed"}) {
+                 $newvariation = 1;
+             }
+         }
+         unless ($newvariation) {
+             if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+                 (($env{'form.grade_username'} eq $env{'user.name'}) &&
+                  ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                 $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+             } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+                     ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {
+                 $oldresponse = '* '.&mt('(only shown to submitter)').' *';
+             } else {
+                 $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+             }
+         }
  	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
  	    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
  	    if ( $cols eq '') { $cols = 80; }
- Line 154  sub start_textfield {
+ Line 234  sub start_textfield {
  	    if ( $rows eq '') { $rows = 16; }
  	    my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
  	    $result='';
+ 	    my $tagident = 'HWVAL_' . $resid;
+             my $itemid = 'HWVAL_'.$partid.'_'.$resid;
  	    if ($addchars) {
- 		$result.=&addchars('HWVAL_'.$resid,$addchars);
+ 		$result.=&addchars($tagident, $addchars);
  	    }
- 	    &Apache::lonhtmlcommon::add_htmlareafields('HWVAL_'.$resid);
+             my $textareaclass;
- 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
+             unless (&Apache::londefdef::is_inside_of($tagstack,
- 		"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
+                                                     'externalresponse')) {
+                 $textareaclass = 'class="LC_richDetectHtml spellchecked"';
+             }
+ 	    $result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$itemid.'" ' .
+ 		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass
+ 		      .'>'.
+                       &HTML::Entities::encode($oldresponse,'<>&"');
  	    if ($oldresponse ne '') {
  		#get rid of any startup text if the user has already responded
- Line 171  sub start_textfield {
+ Line 259  sub start_textfield {
  		&& &Apache::londefdef::is_inside_of($tagstack,
  						    'essayresponse') ) {
  		$result='<table class="LC_pastsubmission"><tr><td>'.
- 		    $oldresponse.'</td></tr></table>';
+ 		    &HTML::Entities::encode($oldresponse,'"<>&').
+                     '</td></tr></table>';
  	    }
  	    #get rid of any startup text
  	    &Apache::lonxml::get_all_text("/textfield",$parser,$style);
- Line 192  sub start_textfield {
+ Line 281  sub start_textfield {
  	my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser,
  						   $style);
  	$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
+         my $spell_langs = &spelling_languages();
+ 	$result .= &Apache::edit::select_arg('Spellcheck for:', 'spellcheck',
+ 					     $spell_langs, $token);
      } elsif ($target eq 'modified') {
  	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  						     $safeeval,'rows','cols',
- 						     'addchars');
+ 						     'addchars', 'spellcheck');
  	if ($constructtag) {
  	    $result = &Apache::edit::rebuild_tag($token);
  	} else {
- Line 210  sub start_textfield {
+ Line 302  sub start_textfield {
  	    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
  	    $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
  	} else {
- 	    my $TeXwidth=$width_of_box/80;
+             if ($env{'form.pdfFormFields'} eq 'yes') {
- 	    $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';
+                 my $fieldname = $env{'request.symb'}.
- 	    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
+                                 '&part_'. $Apache::inputtags::part.
- 	    $result.='}}}\vskip 2 mm ';
+                                 '&textresponse'.
+                                 '&HWVAL_' . $Apache::inputtags::response['-1'];
+                 $result.='\TextField[name='.$fieldname.',multiline=true,height=6\baselineskip,width=270,borderwidth=0,backgroundcolor={.85 .85 .85}]\\';
+             } else {
+                 my $TeXwidth=$width_of_box/80;
+                 $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';
+                 for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
+                 $result.='}}}\vskip 2 mm ';
+             }
  	}
      }
      return $result;
- Line 223  sub end_textfield {
+ Line 323  sub end_textfield {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $result;
      if ($target eq 'web') {
+ 	my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);
  	$Apache::lonxml::evaluate++;
  	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
- 	    return "</textarea>";
+             my $partid=$Apache::inputtags::part;
+ 	    my $resid = $Apache::inputtags::response[-1];
+ 	    my $itemid = 'HWVAL_' . $partid . '_' . $resid;
+ 	    my $result =  "</textarea>";
+ 	    $result .= &spellcheck_onblur($itemid, $spellcheck);
+ 	    return $result;
  	}
      } elsif ($target eq 'edit') {
  	$result=&Apache::edit::end_table();
- Line 289  sub start_textline {
+ Line 395  sub start_textline {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $result = "";
      my $input_id = &start_input($parstack,$safeeval);
+     # The spellcheck attribute
+     # 1. enables spellchecking.
+     # 2. Provides the language code in which the spellchecking will be performed.
+     my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);
      if ($target eq 'web') {
  	$Apache::lonxml::evaluate--;
  	my $partid=$Apache::inputtags::part;
- Line 301  sub start_textline {
+ Line 413  sub start_textline {
  		    $maxlength = ' maxlength="'.$size.'"';
  		}
  	    }
- 	    my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+             my ($oldresponse,$newvariation);
- 	    &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
+             if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') ||
+                  ($Apache::lonhomework::type eq 'randomizetry')) &&
- 	    if (ref($oldresponse) eq 'ARRAY') {
+                  ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
- 		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
+                 if ($env{'form.'.$partid.'.rndseed'} ne
- 	    }
+                     $Apache::lonhomework::history{"resource.$partid.rndseed"}) {
- 	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+                     $newvariation = 1;
+                 }
+             }
+             unless ($newvariation) {
+                 if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+                     (($env{'form.grade_username'} eq $env{'user.name'}) &&
+                      ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                     $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+                 } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+                         ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') ||
+                         ($Apache::lonhomework::type eq 'anonsurvey') ||
+                         ($Apache::lonhomework::type eq 'anonsurveycred')) {
+                         $oldresponse = '* '.&mt('(only shown to submitter)').' *';
+                 } else {
+                     $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+                 }
+ 	        &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
+ 	        if (ref($oldresponse) eq 'ARRAY') {
+ 		    $oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
+ 	        }
+ 	        $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+                 $oldresponse =~ s/^\s+//;
+                 $oldresponse =~ s/\s+$//;
+                 $oldresponse =~ s/\s+/ /g;
+             }
  	    if ($Apache::lonhomework::type ne 'exam') {
  		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
  		$result='';
  		if ($addchars) {
  		    $result.=&addchars('HWVAL_'.$id,$addchars);
  		}
+                 my $numrespclass;
  		my $readonly=&Apache::lonxml::get_param('readonly',$parstack,
  							$safeeval);
  		if (lc($readonly) eq 'yes'
- Line 322  sub start_textline {
+ Line 458  sub start_textline {
  		    $readonly=' readonly="readonly" ';
  		} else {
  		    $readonly='';
+                     if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
+                         ($tagstack->[-2] eq 'numericalresponse')) {
+                         $numrespclass = ' LC_numresponse_text';
+                     }
  		}
  		my $name = 'HWVAL_'.$id;
+                 my $itemid = 'HWVAL_'.$partid.'_'.$id;
+                 my $input_tag_id = $itemid.'_'.$input_id;
  		if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
  		    $name = "none";
  		}
- 		$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'.
+ 		$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
- 		    $oldresponse.'" size="'.$size.'"'.$maxlength.' />';
+ 		     . ' onfocus="javascript:disableAutoComplete(\''.$input_tag_id.'\');"'
+ 		     . ' type="text" '.$readonly.' name="'. $name . '"'
+ 		     . ' id="' . $input_tag_id . '"'
+ 		     . ' value="'.  $oldresponse.'"'
+ 		     . ' class="LC_textline spellchecked'.$numrespclass.'" size="'.$size.'"'.$maxlength.' />';
+ 		$result .= &spellcheck_onblur($itemid, $spellcheck);
+                 if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
+                     (((($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
+                       (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) ||
+                      (($tagstack->[-2] eq 'customresponse') &&
+                        (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) {
+                     $result.=&edit_mathresponse_button($input_tag_id);
+                 }
  	    }
  	    if ($Apache::lonhomework::type eq 'exam'
  		&& &needs_exam_box($tagstack)) {
- Line 347  sub start_textline {
+ Line 502  sub start_textline {
  				    'addchars',$token,10);
          $result.=&Apache::edit::select_arg('Readonly:','readonly',
  					   ['no','yes'],$token);
+         my $spell_langs = &spelling_languages();
+ 	$result.=&Apache::edit::select_arg('Spellcheck for:', 'spellcheck',
+ 					   $spell_langs, $token);
  	$result.=&Apache::edit::end_row();
  	$result.=&Apache::edit::end_table();
      } elsif ($target eq 'modified') {
  	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  						     $safeeval,'size',
- 						     'addchars','readonly');
+ 						     'addchars','readonly', 'spellcheck');
  	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
      } elsif ($target eq 'tex'
  	     && $Apache::lonhomework::type ne 'exam') {
  	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
  	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
- 	$result='\framebox['.$size.'][s]{\tiny\strut}';
+ 	if ($env{'form.pdfFormFields'} eq 'yes'
+             && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+             my $fieldname = $env{'request.symb'}.
+                                  '&part_'. $Apache::inputtags::part.
+                                  '&textresponse'.
+                                  '&HWVAL_' . $Apache::inputtags::response['-1'];
+             $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+         } else {
+             $result='\framebox['.$size.'][s]{\tiny\strut}';
+         }
      } elsif ($target eq 'tex'
  	     && $Apache::lonhomework::type eq 'exam'
  	     && &needs_exam_box($tagstack)) {
- Line 417  sub end_hiddenline {
+ Line 583  sub end_hiddenline {
      return "";
  }
- # $part -> partid
- # $id -> responseid
+ sub start_hiddensubmission {
- # $uploadefiletypes -> comma seperated list of extensions allowed or * for any
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- # $which -> 'uploadedonly'  -> only newly uploaded files
+     my $result = "";
- #           'portfolioonly' -> only allow files from portfolio
+     my $input_id = &start_input($parstack,$safeeval);
- #           'both' -> allow files from either location
+     if ($target eq 'web') {
- # $extratext -> additional text to go between the link and the input box
+         $Apache::lonxml::evaluate--;
- # returns a table row <tr>
+         if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+             my $partid=$Apache::inputtags::part;
+             my $id=$Apache::inputtags::response[-1];
+             if ($Apache::lonhomework::type ne 'exam') {
+                 my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+                 $value = &HTML::Entities::encode($value,'<>&"');
+                 $result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.$value.'" />';
+             }
+         }
+     } elsif ($target eq 'edit') {
+         $result=&Apache::edit::tag_start($target,$token);
+         $result.=&Apache::edit::text_arg('Value:','value',$token,'15');
+         $result.=&Apache::edit::end_row();
+         $result.=&Apache::edit::end_table();
+     } elsif ($target eq 'modified') {
+         my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                      $safeeval,'value');
+         if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+     }
+     if ( ($target eq 'web' || $target eq 'tex')
+          && $Apache::lonhomework::type eq 'exam'
+          && &needs_exam_box($tagstack)) {
+         $result.=&exam_box($target);
+     }
+     return $result;
+ }
+ sub end_hiddensubmission {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
+     elsif ($target eq 'edit') { return ('','no'); }
+     &end_input();
+     return "";
+ }
+ =pod
+ =item file_selector()
+ $part -> partid
+ $id -> responseid
+ $uploadefiletypes -> comma seperated list of extensions allowed or * for any
+ $which -> 'uploadonly'  -> only newly uploaded files
+           'portfolioonly' -> only allow files from portfolio
+           'both' -> allow files from either location
+ $extratext -> additional text to go between the link and the input box
+ $maxfilesize -> maximum cumulative filesize for submitted files (in MB).
+ returns a table row <tr>
+ =cut
  sub file_selector {
-     my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;
+     my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_;
      if (!$uploadedfiletypes) { return ''; }
      my $jspart=$part;
      $jspart=~s/\./_/g;
      my $result;
+     my $current_files_display = &current_file_submissions($part,$id);
-     $result.='<tr><td>';
+     my $addfiles;
+     if ($current_files_display) {
+         $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
+                    $current_files_display.
+                    &Apache::lonhtmlcommon::row_closure();
+         $addfiles = &mt('Submit other file(s)');
+     } else {
+         $addfiles = &mt('Choose file(s) to submit');
+     }
+     $result .= &Apache::lonhtmlcommon::row_title($addfiles);
+     my $constraints;
      if ($uploadedfiletypes ne '*') {
- 	$result.=
+ 	$constraints =
- 	    &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+ 	    &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
      }
-     if ($which eq 'uploadonly' || $which eq 'both') {
+     if ($maxfilesize) {
- 	$result.=&mt('Submit a file: (only one file can be uploaded)').
+         $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
- 	    ' <br /><input type="file" size="50" name="HWFILE'.
+                         '<b>'.$maxfilesize.'</b>').'<br />';
- 	    $jspart.'_'.$id.'" /><br />';
+     }
- 	$result .= &show_past_file_submission($part,$id);
+     if ($constraints) {
+         $result .= $constraints.'<br />';
+     }
+     if ($which eq 'uploadonly' || $which eq 'both') {
+         my $free_space = $maxfilesize * 1048576;
+         $result .= &mt('Submit a file: (only one file per submission)').
+             ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
+             '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload LC_hwkfile" />'.
+             '<input type="hidden" id="LC_free_space_'.$jspart.'_'.$id.'"'.
+             ' value="'.$free_space.'" /><br />';
      }
      if ( $which eq 'both') {
  	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
      }
      if ($which eq 'portfolioonly' || $which eq 'both') {
- 	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+         my $symb = $env{'request.symb'};
- 	    &mt('Select Portfolio Files').'</a><br />'.
+         (undef,undef,my $res)=&Apache::lonnet::decode_symb($symb);
+         my $showsymb;
+         # If resource is a .task and URL is unencrypted, include symb in query string
+         # for url opened in portfolio file selection window. Can be used to override
+         # blocking of portfolio access resulting from an exam event in a different course.
+         if ($res =~ /\.task$/i) {
+             my $encsymb = &Apache::lonenc::check_encrypt($symb);
+             if ($symb eq $encsymb) {
+                 $showsymb = $symb;
+             }
+         }
+ 	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'&amp;symb='.$showsymb.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+ 	    &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.
  	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
  	    '<br />';
- 	$result .= &show_past_portfile_submission($part,$id);
      }
-     $result.='</td></tr>';
+     $result.=&Apache::lonhtmlcommon::row_closure(1);
      return $result;
  }
- sub show_past_file_submission {
+ sub current_file_submissions {
      my ($part,$id) = @_;
-     my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+     my $jspart=$part;
+     $jspart=~s/\./_/g;
+     my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
+     my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
+     return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
+     my $header = &portpath_popup_js().
+                  &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row();
+     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+         $header .= '<th>'.&mt('Delete?').'</th>';
+     }
+     $header .=   '<th>'.&mt('File').'</th>'.
+                  '<th>'.&mt('Size (MB)').'</th>'.
+                  '<th>'.&mt('Last Modified').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row();
+     my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+     my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
+     my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
+     if ($uploadedfile) {
+         my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+         my $link = &HTML::Entities::encode($url,'<>&"');
+         my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$});
+         my ($status,$hashref,$error) =
+             &current_file_info($url,$link,$name,$path);
+         if ($status eq 'ok') {
+             push(@{$okfiles{$name}},$url);
+             $rows{$url} = $hashref;
+             $legacy{$url} = 1;
+             &Apache::lonxml::extlink($url);
+             &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+         } else {
+             push(@bad_file_list,$error);
+         }
+     }
+     if ($portfiles =~ /[^\s]/) {
+         my $prefix = "/uploaded/$udom/$uname/portfolio";
+         foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+             my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+             my $url = $prefix.$path.$name;
+             my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
+             my ($status,$hashref,$error) =
+                 &current_file_info($url,$uploadedfile,$name,$path);
+             if ($status eq 'ok') {
+                 push(@{$okfiles{$name}},$url);
+                 $rows{$url} = $hashref;
+             } else {
+                 push(@bad_file_list,$error);
+             }
+         }
+     }
+     my $num = 0;
+     foreach my $name (sort(keys(%okfiles))) {
+         if (ref($okfiles{$name}) eq 'ARRAY') {
+             foreach my $url (@{$okfiles{$name}}) {
+                 if (ref($rows{$url}) eq 'HASH') {
+                     my $link = $rows{$url}{link};
+                     my $portfile = $rows{$url}{path}.$rows{$url}{name};
+                     $portfile = &HTML::Entities::encode($portfile,'<>&"');
+                     if ($link) {
+                         my $icon=&Apache::loncommon::icon($url);
+                         unless ($header_shown) {
+                             $result .= $header;
+                             $header_shown = 1;
+                         }
+                         $result.=
+                             &Apache::loncommon::start_data_table_row()."\n";
+                         if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                             $result .=
+                                  '<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete"'.
+                                  ' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n";
+                             $num ++;
+                         }
+                         my $pathid = 'HWFILE'.$jspart.'_'.$id.'_'.$num.'_path';
+                         my $pathidtext = $pathid.'text';
+                         my ($showname,$showpath);
+                         if ($legacy{$url}) {
+                             $showname = $name.' '.&mt('not in portfolio');
+                         } else {
+                             $showname = $name;
+                             $showpath = '<br />'.
+                                         '<span id="'.$pathidtext.'" class="LC_cusr_subheading">'.
+                                         '<a href="javascript:showPortPath('."'$pathid','$pathidtext'".');" '.
+                                         'class="LC_menubuttons_link">'.
+                                         &mt('(Show path)').'</a></span>'.
+                                         '<div id="'.$pathid.'" class="LC_dccid">'.$rows{$url}{path}.$name.
+ '</div>';
+                         }
+                         $result .=
+                             '<td><a href="'.$link.'"><img src="'.$icon.
+                             '" border="0" alt="" />'.$showname.'</a>'.$showpath.'</td>'."\n".
+                             '<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n".
+                             '<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n".
+                             &Apache::loncommon::end_data_table_row();
+                     }
+                 }
+             }
+         }
+     }
+     if ($header_shown) {
+         $result .= &Apache::loncommon::end_data_table();
+         if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+             $result .= '<br /><span class="LC_warning">'.
+                        &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';
+         }
+     }
+     if (@bad_file_list) {
+         my $bad_files = '<span class="LC_filename">'.
+             join('</span>, <span class="LC_filename">',@bad_file_list).
+             '</span>';
+         $result.='<p class="LC_error">'.
+                  &mt("These file(s) don't exist: [_1]",$bad_files).
+                  '</p>';
+     }
+     return $result;
+ }
-     return if (!$uploadedfile);
+ sub current_file_info {
+     my ($url,$uploadedfile,$name,$path) = @_;
+     my ($status,$error,%info);
+     my @stat = &Apache::lonnet::stat_file($url);
+     if ((@stat) && ($stat[0] ne 'no_such_dir')) {
+         my ($lastmod,$size);
+         if ($stat[9] =~ /^\d+$/) {
+             $lastmod = &Apache::lonlocal::locallocaltime($stat[9]);
+         }
+         $size = $stat[7]/(1024*1024);
+         $size = sprintf("%.3f",$size);
+         %info = (
+                     link         => $uploadedfile,
+                     name         => $name,
+                     path         => $path,
+                     size         => $size,
+                     lastmodified => $lastmod,
+                 );
+         $status = 'ok';
+     } else {
+         &Apache::lonnet::logthis("bad file is $url");
+         my $icon=&Apache::loncommon::icon($url);
+         $error = '<a href="'.$url.'"><img src="'.$icon.
+                  '" border="0" />'.$uploadedfile.'</a>';
+     }
+     return ($status,\%info,$error);
+ }
-     my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ sub portpath_popup_js {
-     &Apache::lonxml::extlink($url);
+     my %lt = &Apache::lonlocal::texthash(
-     &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+                                           show => '(Show path)',
-     my $icon=&Apache::loncommon::icon($url);
+                                           hide => '(Hide)',
-     my $curfile='<a href="'.$url.'"><img src="'.$icon.
+                                         );
- 	'" border="0" />'.$uploadedfile.'</a>';
+     return <<"END";
-     return &mt('Currently submitted: <tt>[_1]</tt>',$curfile);
+ <script type="text/javascript">
+ // <![CDATA[
+ function showPortPath(id,idtext) {
+     document.getElementById(id).style.display='block';
+     document.getElementById(id).style.textAlign='left';
+     document.getElementById(id).style.textFace='normal';
+     if (document.getElementById(idtext)) {
+         document.getElementById(idtext).innerHTML ='<a href="javascript:hidePortPath(\\''+id+'\\',\\''+idtext+'\\'); '+
+                                                    '"class="LC_menubuttons_link">$lt{'hide'}</a>&nbsp;';
+     }
+     return;
+ }
+ function hidePortPath(id,idtext) {
+     if (document.getElementById(id)) {
+         document.getElementById(id).style.display='none';
+     }
+     if (document.getElementById(idtext)) {
+         document.getElementById(idtext).innerHTML ='<a href="javascript:showPortPath(\\''+id+'\\',\\''+idtext+'\\');" '+
+                                                    'class="LC_menubuttons_link">$lt{'show'}</a>';
+     }
+     return;
  }
- sub show_past_portfile_submission {
+ // ]]>
-     my ($part,$id) = @_;
+ </script>
-     if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){
- 	return;
-     }
-     my (@file_list,@bad_file_list);
-     foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
- 	my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
- 	my $url="/uploaded/$domain/$user/portfolio$file";
- 	my $icon=&Apache::loncommon::icon($url);
- 	push(@file_list,'<a href="'.$url.'"><img src="'.$icon.
- 	     '" border="0" />'.$file.'</a>');
- 	if (! &Apache::lonnet::stat_file($url)) {
- 	    &Apache::lonnet::logthis("bad file is $url");
- 	    push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon.
- 		 '" border="0" />'.$file.'</a>');
- 	}
-     }
-     my $files = '<span class="LC_filename">'.
- 	join('</span>, <span class="LC_filename">',@file_list).
- 	'</span>';
-     my $result = &mt("Portfolio files previously selected: [_1]",$files);
-     if (@bad_file_list) {
- 	my $bad_files = '<span class="LC_filename">'.
- 	    join('</span>, <span class="LC_filename">',@bad_file_list).
- 	    '</span>';
- 	$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files);
-     }
-     return $result;
+ END
  }
  sub valid_award {
      my ($award) =@_;
      foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
- 			       'NO_RESPONSE',
+ 			       'NO_RESPONSE','WRONG_NUMBOXESCHECKED',
  			       'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
  			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
  			       'UNIT_FAIL', 'NO_UNIT',
  			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
- 			       'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT',
+ 			       'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT',
+                                'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
  			       'MISORDERED_RANK', 'INVALID_FILETYPE',
- 			       'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+                                'EXCESS_FILESIZE', 'FILENAME_INUSE',
- 			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+ 			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT',
+                                'ANONYMOUS', 'ANONYMOUS_CREDIT',
+                                'ASSIGNED_SCORE', 'APPROX_ANS',
+ 			       'EXACT_ANS','COMMA_FAIL') {
  	if ($award eq $possibleaward) { return 1; }
      }
      return 0;
- Line 527  sub valid_award {
+ Line 912  sub valid_award {
  {
      my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
- 		  'TOO_LONG',
+ 		  'WRONG_NUMBOXESCHECKED','TOO_LONG',
  		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
  		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
- 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
+ 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION',
+                   'WRONG_FORMAT', 'INTERNAL_ERROR',
  		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
- 		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+ 		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE',
- 		  'APPROX_ANS', 'EXACT_ANS');
+                   'DRAFT', 'SUBMITTED',
+                   'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
+                   'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
      my $i=0;
      my %fwd_awards = map { ($_,$i++) } @awards;
      my $max=scalar(@awards);
- Line 541  sub valid_award {
+ Line 929  sub valid_award {
      $i=0;
      my %rev_awards = map { ($_,$i++) } @awards;
+ sub awarddetail_to_awarded {
+     my ($awarddetail) = @_;
+     if ($awarddetail eq 'EXACT_ANS'
+ 	|| $awarddetail eq 'APPROX_ANS') {
+ 	return 1;
+     }
+     return 0;
+ }
+ sub hide_award {
+     my ($award) = @_;
+     if (&Apache::lonhomework::show_no_problem_status()) {
+ 	return 1;
+     }
+     if ($award =~
+ 	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) {
+ 	return 1;
+     }
+     return 0;
+ }
  sub finalizeawards {
-     my ($awardref,$msgref,$nameref,$reverse)=@_;
+     my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_;
      my $result;
      if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
      if ($result eq '' ) {
- Line 553  sub finalizeawards {
+ Line 962  sub finalizeawards {
  		$blankcount++;
  	    }
  	}
- 	if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
+ 	if ($blankcount == ($#$awardref + 1)) {
+ 	    return ('NO_RESPONSE');
+ 	}
+     }
+     if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; }
+     if (!$final_scantron && defined($result)) { return ($result); }
+     # if in scantron mode, if the award for any response is
+     # assigned score, then the part gets an assigned score
+     if ($final_scantron
+ 	&& grep {$_ eq 'ASSIGNED_SCORE'} (@$awardref)) {
+ 	return ('ASSIGNED_SCORE');
      }
-     if (defined($result)) { return ($result); }
+     # if in scantron mode, if the award for any response is
+     # correct and there are non-correct responses,
+     # then the part gets an assigned score
+     if ($final_scantron
+ 	&& (grep { $_ eq 'EXACT_ANS' ||
+ 		   $_ eq 'APPROX_ANS'  } (@$awardref))
+ 	&& (grep { $_ ne 'EXACT_ANS' &&
+ 		   $_ ne 'APPROX_ANS'  } (@$awardref))) {
+ 	return ('ASSIGNED_SCORE');
+     }
      # these awards are ordered from most important error through best correct
      my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
- Line 570  sub finalizeawards {
+ Line 1001  sub finalizeawards {
  	}
  	$j++;
      }
+     # if at least one response item is set to include lenient grading
+     # and that item is partially correct then overall award reflects
+     # that, unless an award for one of the other response items does
+     # not fall within the basic awards for correct or incorrect.
+     if ($Apache::inputtags::leniency) {
+         if (($$awardref[$which] eq 'INCORRECT')
+             && (grep { $_ eq 'EXACT_ANS' ||
+                        $_ eq 'APPROX_ANS' ||
+                        $_ eq 'ASSIGNED_SCORE' } (@$awardref))
+             && !((grep { $_ ne 'INCORRECT' &&
+                          $_ ne 'EXACT_ANS' &&
+                          $_ ne 'APPROX_ANS' &&
+                          $_ ne 'ASSIGNED_SCORE' } (@$awardref)))) {
+             return ('ASSIGNED_SCORE');
+         }
+     }
      if (defined($which)) {
  	if (ref($nameref)) {
  	    return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
- Line 582  sub finalizeawards {
+ Line 1031  sub finalizeawards {
  }
  sub decideoutput {
-     my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
+     my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_;
      my $message='';
      my $button=0;
      my $previousmsg;
- Line 594  sub decideoutput {
+ Line 1044  sub decideoutput {
  	  'not_charged_try' => 'LC_answer_not_charged_try',
  	  'no_grade'        => 'LC_answer_no_grade',
  	  'no_message'      => 'LC_no_message',
+           'no_charge_warn'  => 'LC_answer_warning',
  	  );
      my $part = $Apache::inputtags::part;
-     my $handgrade =
+     my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade");
- 	('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+     my $handgrade = ('yes' eq lc($tohandgrade));
+ #
+ # Should "Computer's Answer" be displayed?
+ # Should not be displayed if still answerable,
+ # if the problem is handgraded,
+ # or if the problem does not give a correct answer
+ #
-     my $computer = ($handgrade)? ''
+     my $computer = ($handgrade || $nocorrect)? ''
- 	                       : " ".&mt("Computer's answer now shown above.");
+ 	                       : &mt("Computer's answer now shown above.");
      &Apache::lonxml::debug("handgrade has :$handgrade:");
      if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
- Line 616  sub decideoutput {
+ Line 1073  sub decideoutput {
  	    $message=&mt('Incorrect.');
  	    $css_class=$possible_class{'charged_try'};
  	}
- 	if ($env{'request.filename'} =~
+ 	if ($handgrade ||
- 	    m|/res/lib/templates/examupload.problem$|) {
+             ($env{'request.filename'}=~/\/res\/lib\/templates\/(examupload|DropBox).problem$/)) {
  	    $message = &mt("A score has been assigned.");
  	    $added_computer_text=1;
  	} else {
- Line 625  sub decideoutput {
+ Line 1082  sub decideoutput {
  		$message = '\textbf{'.$message.'}';
  	    } else {
  		$message = "<b>".$message."</b>";
- 		$message.= $computer;
+                 if ($computer) {
+                     $message = "$computer $message";
+                 }
  	    }
  	    $added_computer_text=1;
- 	    my ($symb) = &Apache::lonnet::whichuser();
+ 	    if ($awarded > 0) {
- 	    if (($symb ne '')
+ 		my ($symb) = &Apache::lonnet::whichuser();
- 		&&
+ 		if (($symb ne '')
- 		($env{'course.'.$env{'request.course.id'}.
+ 		    &&
- 			    '.disable_receipt_display'} ne 'yes')) {
+ 		    ($env{'course.'.$env{'request.course.id'}.
- 		$message.=(($target eq 'web')?'<br />':' ').
+ 			      '.disable_receipt_display'} ne 'yes') &&
- 		    &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
+                     ($Apache::lonhomework::type ne 'practice')) {
- 		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+ 		    $message.=(($target eq 'web')?'<br />':' ').
+ 			&mt('Your receipt no. is [_1]',
+ 			    (&Apache::lonnet::receipt($Apache::inputtags::part).
+ 			     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
+ 		}
  	    }
  	}
- 	$button=0;
+         if ($awarded >= 1) {
+             $button=0;
+         } elsif (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/i) {
+             $button=0;
+         } else {
+             $button=1;
+         }
  	$previousmsg='';
      } elsif ($solved =~ /^excused/) {
  	if ($target eq 'tex') {
- Line 659  sub decideoutput {
+ Line 1128  sub decideoutput {
  		$message = '\textbf{'.&mt('You are correct.').'}';
  	    } else {
  		$message = "<b>".&mt('You are correct.')."</b>";
- 		$message.= $computer;
+                 if ($computer) {
+                     $message = "$computer $message";
+                 }
  	    }
  	    $added_computer_text=1;
- 	    unless ($env{'course.'.
+ 	    if  ($awarded > 0
+ 		 && $env{'course.'.
  			     $env{'request.course.id'}.
- 			     '.disable_receipt_display'} eq 'yes') {
+ 			     '.disable_receipt_display'} ne 'yes') {
  		$message.=(($target eq 'web')?'<br />':' ').
- 		    'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
+ 		    &mt('Your receipt is [_1]',
- 		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+ 			(&Apache::lonnet::receipt($Apache::inputtags::part).
+ 			 (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
  	    }
  	    $css_class=$possible_class{'correct'};
  	    $button=0;
- Line 683  sub decideoutput {
+ Line 1156  sub decideoutput {
  	$button = 1;
      } elsif ($award eq 'MISSING_ANSWER') {
  	$message = &mt('Some items were not submitted.');
- 	$css_class=$possible_class{'not_charged_try'};
+         if ($target ne 'tex') {
+            $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
+         }
+         if (&Apache::lonhomework::show_some_problem_status()) {
+             $css_class=$possible_class{'no_charge_warn'};
+         } else {
+             $css_class=$possible_class{'not_charged_try'};
+         }
  	$button = 1;
+     } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
+         $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
+         if ($target ne 'tex') {
+            $message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked');
+         }
+         $css_class=$possible_class{'not_charged_try'};
+         $button = 1;
      } elsif ($award eq 'ERROR') {
- 	$message = &mt('An error occured while grading your answer.');
+ 	$message = &mt('An error occurred while grading your answer.');
  	$css_class=$possible_class{'not_charged_try'};
  	$button = 1;
      } elsif ($award eq 'TOO_LONG') {
- Line 698  sub decideoutput {
+ Line 1185  sub decideoutput {
  	$css_class=$possible_class{'not_charged_try'};
  	$button=1;
      } elsif ($award eq 'MISORDERED_RANK') {
- 	$message = &mt('You have provided an invalid ranking');
+         $message = &mt('You have provided an invalid ranking.');
- 	if ($target ne 'tex') {
+         if ($target ne 'tex') {
- 	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
+             $message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems')));
- 	}
+         }
  	$css_class=$possible_class{'not_charged_try'};
  	$button=1;
+     } elsif ($award eq 'EXCESS_FILESIZE') {
+         $message = &mt("Submission won't be graded. The combined size of submitted files exceeded the amount allowed.");
+         $css_class=$possible_class{'not_charged_try'};
+         $button=1;
+     } elsif ($award eq 'FILENAME_INUSE') {
+         $message = &mt('You have already uploaded a file with that filename.');
+         if ($target eq 'tex') {
+             $message.= "\\\\\n";
+         } else {
+             $message .= '<br />';
+         }
+         $message .= &mt('Please use a different filename.');
+         $css_class=$possible_class{'not_charged_try'};
+         $button=1;
      } 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'};
  	$button=1;
      } elsif ($award eq 'SIG_FAIL') {
  	my ($used,$min,$max)=split(':',$awardmsg);
  	my $word = ($used < $min) ? 'more' : 'fewer';
- 	$message = &mt("Submission not graded.  Use $word digits.",$used);
+ 	$message = &mt("Submission not graded. Use $word significant figures.");
- 	$css_class=$possible_class{'not_charged_try'};
+         if (&Apache::lonhomework::show_some_problem_status()) {
+             $css_class=$possible_class{'no_charge_warn'};
+         } else {
+             $css_class=$possible_class{'not_charged_try'};
+         }
  	$button=1;
      } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
  	$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
- Line 722  sub decideoutput {
+ Line 1227  sub decideoutput {
      } elsif ($award eq 'UNIT_INVALID_STUDENT') {
  	$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
  	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- 	$css_class=$possible_class{'not_charged_try'};
+         if (&Apache::lonhomework::show_some_problem_status()) {
+             $css_class=$possible_class{'no_charge_warn'};
+         } else {
+             $css_class=$possible_class{'not_charged_try'};
+         }
  	$button=1;
      } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
  	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
  	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- 	$css_class=$possible_class{'not_charged_try'};
+         if (&Apache::lonhomework::show_some_problem_status()) {
+             $css_class=$possible_class{'no_charge_warn'};
+         } else {
+             $css_class=$possible_class{'not_charged_try'};
+         }
  	$button=1;
      } elsif ($award eq 'UNIT_NOTNEEDED') {
  	$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
- 	$css_class=$possible_class{'not_charged_try'};
+         if (&Apache::lonhomework::show_some_problem_status()) {
+             $css_class=$possible_class{'no_charge_warn'};
+         } else {
+             $css_class=$possible_class{'not_charged_try'};
+         }
  	$button=1;
      } elsif ($award eq 'NO_UNIT') {
  	$message = &mt("Units required").'.';
  	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
- 	$css_class=$possible_class{'not_charged_try'};
+         if (&Apache::lonhomework::show_some_problem_status()) {
+             $css_class=$possible_class{'no_charge_warn'};
+         } else {
+             $css_class=$possible_class{'not_charged_try'};
+         }
  	$button=1;
      } elsif ($award eq 'COMMA_FAIL') {
  	$message = &mt("Proper comma separation is required").'.';
  	$css_class=$possible_class{'not_charged_try'};
  	$button=1;
      } elsif ($award eq 'BAD_FORMULA') {
- 	$message = &mt("Unable to understand formula");
+ 	$message = &mt("Unable to understand formula").'.';
+         if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
  	$css_class=$possible_class{'not_charged_try'};
  	$button=1;
+     } elsif ($award eq 'NOT_FUNCTION') {
+         $message = &mt("Not a function").'.';
+         $css_class=$possible_class{'not_charged_try'};
+         $button=1;
+     } elsif ($award eq 'WRONG_FORMAT') {
+         $message = &mt("Wrong format").'.';
+         $css_class=$possible_class{'not_charged_try'};
+         $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') {
  	$message = &mt("Incorrect").'.';
  	$css_class=$possible_class{'charged_try'};
- Line 754  sub decideoutput {
+ Line 1288  sub decideoutput {
  	$message = &mt("Your submission has been recorded.");
  	$css_class=$possible_class{'no_grade'};
  	$button=1;
+     } elsif ($award eq 'SUBMITTED_CREDIT') {
+         $message = &mt("Your submission has been recorded, and credit awarded.");
+         $css_class=$possible_class{'correct'};
+         $button=1;
+     } elsif ($award eq 'ANONYMOUS') {
+         $message = &mt("Your anonymous submission has been recorded.");
+         $css_class=$possible_class{'no_grade'};
+         $button=1;
+     } elsif ($award eq 'ANONYMOUS_CREDIT') {
+         $message = &mt("Your anonymous submission has been recorded, and credit awarded.");
+         $css_class=$possible_class{'correct'};
+         $button=1;
      } elsif ($award eq 'DRAFT') {
- 	$message = &mt("A draft copy has been saved.");
+ 	$message = &mt("Copy saved but not submitted.");
  	$css_class=$possible_class{'not_charged_try'};
  	$button=1;
      } elsif ($award eq 'ASSIGNED_SCORE') {
- Line 777  sub decideoutput {
+ Line 1323  sub decideoutput {
      my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
      foreach my $resid(@Apache::inputtags::response){
          if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
- 	    $message.='<br />';
+             if ($target eq 'tex') {
+                 $message.= "\\\\\n";
+             } else {
+                 $message.='<br />';
+             }
  	    my @files = split(/\s*,\s*/,
  			      $Apache::lonhomework::history{"resource.$part.$resid.handback"});
  	    my $file_msg;
  	    foreach my $file (@files) {
- 		$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+                 if ($target eq 'tex') {
+                     $file_msg.= "\\\\\n".$file;
+                 } else {
+                     $file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+                 }
  	    }
  	    $message .= &mt('Returned file(s): [_1]',$file_msg);
+             if ($target eq 'tex') {
+                 $message.= "\\\\\n";
+             } else {
+                 $message.='<br />';
+             }
  	}
      }
-     if (lc($Apache::lonhomework::problemstatus) eq 'no'  &&
+     if (&Apache::lonhomework::hide_problem_status()
- 	$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
+ 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
- 	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+ 	&& &hide_award($award)) {
+         $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+         my @interval= &Apache::lonnet::EXT("resource.$part.interval");
+         if ($interval[0] =~ /\d+/) {
+             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+             if (defined($first_access)) {
+                 my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
+                 my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+                 unless (($due_date) && ($due_date < $first_access + $timelimit)) {
+                     $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
+                 }
+             }
+         }
  	$css_class=$possible_class{'no_grade'};
  	$button=1;
      }
      if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
  	!$added_computer_text && $target ne 'tex') {
- 	$message.= $computer;
+         if ($computer) {
+             $message = "$computer $message";
+         }
  	$added_computer_text=1;
      }
+     if ($Apache::lonhomework::type eq 'practice') {
+        if ($target eq 'web') {
+            $message .= '<br />';
+        } else {
+            $message .= ' ';
+        }
+        $message.=&mt('Submissions to practice problems are not permanently recorded.');
+     }
      return ($button,$css_class,$message,$previousmsg);
  }
- Line 851  sub setgradedata {
+ Line 1432  sub setgradedata {
  	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
  	$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
  	return '';
-     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
+     } elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} < 1
- 	      /^correct/ || $Apache::lonhomework::scantronmode ||
+ 	      || $Apache::lonhomework::scantronmode
- 	      lc($Apache::lonhomework::problemstatus) eq 'no') {
+ 	      || &Apache::lonhomework::hide_problem_status()  ) {
          # the student doesn't already have it correct,
  	# or we are in a mode (scantron orno problem status) where a correct
          # can become incorrect
- Line 875  sub setgradedata {
+ Line 1456  sub setgradedata {
  	    my $numawards=scalar(@Apache::inputtags::response);
  	    $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
  	    foreach my $res (@Apache::inputtags::response) {
- 		$Apache::lonhomework::results{"resource.$id.awarded"}+=
+ 		if (defined($Apache::lonhomework::results{"resource.$id.$res.awarded"})) {
- 		    $Apache::lonhomework::results{"resource.$id.$res.awarded"};
+ 		    $Apache::lonhomework::results{"resource.$id.awarded"}+=
+ 			$Apache::lonhomework::results{"resource.$id.$res.awarded"};
+ 		} else {
+ 		    $Apache::lonhomework::results{"resource.$id.awarded"}+=
+ 			&awarddetail_to_awarded($Apache::lonhomework::results{"resource.$id.$res.awarddetail"});
+ 		}
  	    }
  	    if ($numawards > 0) {
  		$Apache::lonhomework::results{"resource.$id.awarded"}/=
- Line 888  sub setgradedata {
+ Line 1474  sub setgradedata {
  	    $Apache::lonhomework::results{"resource.$id.solved"} =
  		$solvemsg;
  	    $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+         } elsif ( $award eq 'SUBMITTED_CREDIT' ) {
+             $Apache::lonhomework::results{"resource.$id.tries"} =
+                 $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+             $Apache::lonhomework::results{"resource.$id.solved"} =
+                 'credit_attempted';
+             $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+         }  elsif ( $award eq 'ANONYMOUS_CREDIT' ) {
+             $Apache::lonhomework::results{"resource.$id.tries"} =
+                 $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+             $Apache::lonhomework::results{"resource.$id.solved"} =
+                 'credit_attempted';
+             $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
  	} elsif ( $award eq 'INCORRECT' ) {
  	    $Apache::lonhomework::results{"resource.$id.tries"} =
  		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
- 	    if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
+ 	    if (&Apache::lonhomework::hide_problem_status()
- 		$Apache::lonhomework::scantronmode) {
+ 		|| $Apache::lonhomework::scantronmode) {
  		$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
  	    }
  	    $Apache::lonhomework::results{"resource.$id.solved"} =
- Line 902  sub setgradedata {
+ Line 1500  sub setgradedata {
  		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
  	    $Apache::lonhomework::results{"resource.$id.solved"} =
  		'ungraded_attempted';
+         }  elsif ( $award eq 'ANONYMOUS' ) {
+             $Apache::lonhomework::results{"resource.$id.tries"} =
+                 $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+             $Apache::lonhomework::results{"resource.$id.solved"} =
+                 'ungraded_attempted';
  	} elsif ( $award eq 'DRAFT' ) {
  	    $Apache::lonhomework::results{"resource.$id.solved"} = '';
  	} elsif ( $award eq 'NO_RESPONSE' ) {
- Line 911  sub setgradedata {
+ Line 1514  sub setgradedata {
  	} else {
  	    $Apache::lonhomework::results{"resource.$id.solved"} =
  		'incorrect_attempted';
- 	    if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
+ 	    if (&Apache::lonhomework::show_no_problem_status()
- 		$Apache::lonhomework::scantronmode) {
+ 		|| $Apache::lonhomework::scantronmode) {
  		$Apache::lonhomework::results{"resource.$id.tries"} =
  		    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
  		$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
  	    }
+ 	    if (&Apache::lonhomework::show_some_problem_status()) {
+ 		# clear out the awarded if they had gotten it wrong/right
+ 		# and are now in an error mode
+ 		$Apache::lonhomework::results{"resource.$id.awarded"} = '';
+ 	    }
  	}
  	if (defined($msg)) {
  	    $Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;
- Line 930  sub setgradedata {
+ Line 1539  sub setgradedata {
  	    # check if this was a previous submission if it was delete the
  	    # unneeded data and update the previously_used attribute
  	    if ( $previously_used eq 'PREVIOUSLY_USED') {
- 		if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+ 		if (&Apache::lonhomework::show_problem_status()) {
  		    delete($Apache::lonhomework::results{"resource.$id.tries"});
  		    $Apache::lonhomework::results{"resource.$id.previous"} = '1';
  		}
- Line 944  sub setgradedata {
+ Line 1553  sub setgradedata {
  		$Apache::lonhomework::results{"resource.$id.previous"} = '0';
  	    }
  	}
-     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
+     } elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} == 1 ) {
- 	      /^correct/ ) {
  	#delete all data as they student already has it correct
  	&removealldata($id);
  	#and since they didn't do anything we were never here
- Line 955  sub setgradedata {
+ Line 1563  sub setgradedata {
      if ($award eq 'SUBMITTED') {
  	&Apache::response::add_to_gradingqueue();
      }
+     $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
+     $Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");
+     $Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");
+     $Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion();
+     $Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries");
  }
  sub find_which_previous {
- Line 1008  sub grade {
+ Line 1621  sub grade {
  	    &Apache::lonxml::debug("got message $value from $response for $id");
  	    push (@msgs,$value);
  	}
- 	my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs);
+ 	my ($finalaward,$msg) =
+ 	    &finalizeawards(\@awards,\@msgs,undef,undef,
+ 			    $Apache::lonhomework::scantronmode);
  	my $previously_used;
  	if ( $#Apache::inputtags::previous eq $#awards ) {
  	    my ($match) =
  		&previous_match(\@Apache::inputtags::previous_version,
  				scalar(@Apache::inputtags::response));
  	    if ($match) {
  		$previously_used = 'PREVIOUSLY_LAST';
  		foreach my $value (@Apache::inputtags::previous) {
- Line 1032  sub grade {
+ Line 1647  sub grade {
  }
  sub get_grade_messages {
-     my ($id,$prefix,$target,$status) = @_;
+     my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_;
+ # nocorrect suppresses "Computer's answer now shown above"
      my ($message,$latemessage,$trystr,$previousmsg);
      my $showbutton = 1;
- Line 1047  sub get_grade_messages {
+ Line 1662  sub get_grade_messages {
  	&Apache::lonxml::debug('Getting message');
  	($showbutton,my $css_class,$message,$previousmsg) =
  	    &decideoutput($award,$awarded,$awardmsg,$solved,$previous,
- 			  $target);
+ 			  $target,(($status eq 'CAN_ANSWER') || $nocorrect),$tdclass);
  	if ($target eq 'tex') {
  	    $message='\vskip 2 mm '.$message.' ';
  	} else {
- 	    $message="<td class=\"$css_class\">$message</td>";
+ 	    $message="<td class=\"$tdclass $css_class\">$message</td>";
  	    if ($previousmsg) {
- 		$previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>";
+ 		$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
  	    }
  	}
      }
- Line 1065  sub get_grade_messages {
+ Line 1680  sub get_grade_messages {
      if ( $tries eq '' ) { $tries = '0'; }
      if ( $maxtries eq '' ) { $maxtries = '2'; }
      if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
-     my $tries_text=&mt('Tries');
+     my $tries_text= &get_tries_text();
-     if ( $Apache::lonhomework::type eq 'survey' ||
- 	 $Apache::lonhomework::parsing_a_task) {
- 	$tries_text=&mt('Submissions');
-     }
      if ($showbutton) {
  	if ($target eq 'tex') {
  	    if ($env{'request.state'} ne "construct"
  		&& $Apache::lonhomework::type ne 'exam'
  		&& $env{'form.suppress_tries'} ne 'yes') {
- 		$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.
+ 		$trystr ='{\vskip 1 mm \small '
- 		    $tries.'/'.$maxtries.'} \vskip 2 mm ';
+                         .&mt('[_1]'.$tries_text.'[_2] [_3]'
+ 				,'\textit{','}',$tries.'/'.$maxtries )
+                         .'} \vskip 2 mm';
  	    } else {
  		$trystr = '\vskip 0 mm ';
  	    }
  	} else {
- 	    $trystr = "<td><nobr>".$tries_text." $tries";
+ 	    my $trial =$tries;
  	    if ($Apache::lonhomework::parsing_a_task) {
  	    } elsif($env{'request.state'} ne 'construct') {
- 		$trystr.="/$maxtries";
+ 		$trial.="/".&Apache::lonhtmlcommon::direct_parm_link($maxtries,$env{'request.symb'},'maxtries',$id,$target);
  	    } else {
  		if (defined($Apache::inputtags::params{'maxtries'})) {
- 		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
+ 		    $trial.="/".$Apache::inputtags::params{'maxtries'};
  		}
  	    }
- 	    $trystr.="</nobr></td>";
+ 	    $trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
  	}
      }
- Line 1099  sub get_grade_messages {
+ Line 1711  sub get_grade_messages {
  	#last submissions was after due date
  	$latemessage=&mt(' The last submission was after the Due Date ');;
  	if ($target eq 'web') {
- 	    $latemessage='<td class="LC_answer_late">'.$latemessage.'</td>';
+ 	    $latemessage='<td class="'.$tdclass.' LC_answer_late">'.$latemessage.'</td>';
  	}
      }
      return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
- Line 1113  sub gradestatus {
+ Line 1725  sub gradestatus {
      my $trystr='';
      my $button='';
      my $previousmsg='';
+     my $tdclass='';
      my $status = $Apache::inputtags::status['-1'];
      &Apache::lonxml::debug("gradestatus has :$status:");
- Line 1120  sub gradestatus {
+ Line 1733  sub gradestatus {
  	 && $status ne 'UNAVAILABLE'
  	 && $status ne 'INVALID_ACCESS'
  	 && $status ne 'NEEDS_CHECKIN'
- 	 && $status ne 'NOT_IN_A_SLOT') {
+ 	 && $status ne 'NOT_IN_A_SLOT'
+          && $status ne 'RESERVABLE'
+          && $status ne 'RESERVABLE_LATER'
+          && $status ne 'NOTRESERVABLE') {
+ 	if ($status eq 'SHOW_ANSWER') {
+             $showbutton = 0;
+         }
+         unless (($status eq 'SHOW_ANSWER') || ($status eq 'CANNOT_ANSWER')) {
+             if ($target ne 'tex') {
+                 $tdclass = 'LC_status_submit_'.$id;
+             }
+         }
  	($previousmsg,$latemessage,$message,$trystr) =
  	    &get_grade_messages($id,"resource.$id",$target,$status,
- 				$showbutton);
+ 				$showbutton,$tdclass);
- 	if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+ 	if ($status eq 'CANNOT_ANSWER') {
  	    $showbutton = 0;
  	}
  	if ( $status eq 'SHOW_ANSWER') {
  	    undef($previousmsg);
  	}
  	if ( $showbutton ) {
  	    if ($target ne 'tex') {
- 		$button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />';
+                 if ($env{'form.disable_submit'}) {
+                     $button = '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" />&nbsp;'.
+                                '<div id="msg_submit_'.$id.'" style="display:none"></div>';
+                 } else {
+ 		    $button =
+             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
+                     type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
+                     value="'.&mt('Submit Answer').'" />&nbsp;'.
+                     '<div id="msg_submit_'.$id.'" style="display:none">'.
+                     &mt('Processing your submission ...').'</div>';
+                 }
  	    }
  	}
- Line 1148  sub gradestatus {
+ Line 1784  sub gradestatus {
  	    $output =
  		'<table><tr><td>'.$button.'</td>'.$output;
  	    if (!$no_previous) {
- 		$output.='<td>'.&previous_tries($id,$target).'</td>';
+ 		$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
  	    }
  	    $output.= '</tr></table>';
  	    return $output;
- Line 1163  sub previous_tries {
+ Line 1799  sub previous_tries {
      my $count;
      my %count_lookup;
+     my ($lastrndseed,$lasttype);
+     my $numstamps = 0;
      foreach my $i (1..$Apache::lonhomework::history{'version'}) {
  	my $prefix = $i.":resource.$id";
+         my $is_anon;
+         my $curr_type = $Apache::lonhomework::history{"$prefix.type"};
+         if (defined($env{'form.grade_symb'})) {
+             if (($curr_type eq 'anonsurvey') || ($curr_type eq 'anonsurveycred')) {
+                 $is_anon = 1;
+             }
+         }
  	next if (!exists($Apache::lonhomework::history{"$prefix.award"}));
  	$count++;
  	$count_lookup{$i} = $count;
+         my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"};
  	my ($previousmsg,$latemessage,$message,$trystr);
  	($previousmsg,$latemessage,$message,$trystr) =
- Line 1182  sub previous_tries {
+ Line 1826  sub previous_tries {
  	    my $previous = $count_lookup{$which};
  	    $message =~ s{(</td>)}{ as submission \# $previous $1};
  	} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
- 	    if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
+ 	    if (!(&Apache::lonhomework::hide_problem_status()
  		  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
  		&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
  		) {
+                 my $txt_correct = &mt('Correct');
+                 my $awarded = $Apache::lonhomework::history{"$prefix.awarded"};
+                 if ($awarded < 1 && $awarded > 0) {
+                     $txt_correct=&mt('Partially Correct');
+                 } elsif ($awarded < 1) {
+                     if ($awarded eq '') {
+                         $txt_correct='';
+                     } else {
+                         $txt_correct=&mt('Incorrect');
+                     }
+                 }
  		$message =~ s{(<td.*?>)(.*?)(</td>)}
- 		             {$1 <strong>Correct</strong>. $3}s;
+                              {$1 <strong>$txt_correct</strong>. $3}s;
  	    }
- 	    my $trystr = "(Try ".
+             my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
- 		$Apache::lonhomework::history{"$prefix.tries"}.')';
+             if (($curr_rndseed ne '') &&  ($lastrndseed ne '')) {
+                 if (($curr_rndseed ne $lastrndseed) &&
+                     (($curr_type eq 'randomizetry') || ($lasttype eq 'randomizetry'))) {
+                     $trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>';
+                 }
+             }
  	    $message =~ s{(</td>)}{ $trystr $1};
  	}
  	my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #"
  	$message =~ s{(<td.*?>)}{<td>};
- 	$output.='<tr class="'.$class.'">';
+ 	$output .= '<tr class="'.$class.'">'.
- 	$output.='<td align="center">'.$count.'</td>';
+ 	           '<td align="center">'.$count.'</td>'.$message;
- 	$output.=$message;
+         if ((!$is_anon) && ($Apache::lonhomework::history{"$prefix.tries"}) &&
+             ($Apache::lonhomework::history{"$prefix.award"} ne 'ASSIGNED_SCORE') &&
+             ($Apache::lonhomework::history{$i.':timestamp'})) {
+             $output .= '<td>'.&Apache::lonlocal::locallocaltime(
+                              $Apache::lonhomework::history{$i.':timestamp'}).'</td>';
+             $numstamps ++;
+         } else {
+             $output .= '<td></td>';
+         }
  	foreach my $resid (@Apache::inputtags::response) {
  	    my $prefix = $prefix.".$resid";
  	    if (exists($Apache::lonhomework::history{"$prefix.submission"})) {
- Line 1211  sub previous_tries {
+ Line 1878  sub previous_tries {
  		    $submission =
  			$Apache::lonhomework::history{"$prefix.submission"};
  		}
- 		$output.='<td>'.$submission.'</td>';
+                 if ($is_anon) {
+                     $output.='<td>'.&mt('(only shown to submitter)').'</td>';
+                 } else {
+ 		    $output.='<td>'.$submission.'</td>';
+                 }
  	    } else {
  		$output.='<td></td>';
  	    }
  	}
  	$output.=&Apache::loncommon::end_data_table_row()."\n";
+         $lastrndseed = $curr_rndseed;
+         $lasttype = $curr_type;
      }
      return if ($output eq '');
-     my $headers =
+     my $headers = '<tr>'.
- 	'<tr>'.'<th>'.&mt('Submission #').'</th><th>'.&mt('Try').
+                   '<th>'.&mt('Submission #').'</th>'.
- 	'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
+                   '<th>'.&mt('Try').'</th><th>';
- 	&mt('Submitted Answer').'</th>';
+     if ($numstamps) {
+         $headers .= &mt('When');
+     }
+     $headers .= '</th>';
+     my $colspan = scalar(@Apache::inputtags::response);
+     if ($colspan > 1) {
+         $headers .= '<th colspan="'.$colspan.'">';
+     } else {
+         $headers .= '<th>';
+     }
+     $headers .= &mt('Submitted Answer').'</th></tr>';
      $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
-     #return $output;
-     $output=~s/\\/\\\\/g;
+     my $tries_text = &get_tries_text('link');
-     $output=~s/\'/\\\'/g;
+     my $prefix = $env{'form.request.prefix'};
-     $output=~s/\s+/ /g;
+     $prefix =~ tr{.}{_};
-     $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
+     my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+     if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
-     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+         $function_name .= $Apache::lonxml::curdepth;
-     my $start_page =
+     } else {
- 	&Apache::loncommon::start_page('Previous Tries', undef,
+         $function_name .= $id;
- 				       {'only_body' => 1,
+     }
- 					'bgcolor'   => '#FFFFFF',
+     $function_name .= '_'.$Apache::lonxml::counter;
- 					'js_ready'  => 1,});
+     my $possmathjax = 1;
-     my $end_page =
+     my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
- 	&Apache::loncommon::end_page({'js_ready' => 1,});
+                                                         &mt($tries_text),$possmathjax)."<br />";
-     my $result ="<script type=\"text/javascript\">
- // <![CDATA[
-     function LONCAPA_previous_tries_$Apache::lonxml::curdepth() {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:LONCAPA_previous_tries_$Apache::lonxml::curdepth();void(0);\">".&mt("Previous Tries")."</a><br />";
-     #use Data::Dumper;
-     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
      return $result;
  }
+ sub get_tries_text {
+     my ($context) = @_;
+     my $tries_text;
+     if ($context eq 'link') {
+         $tries_text = 'Previous Tries';
+     } else {
+         $tries_text = 'Tries';
+     }
+     if ( $Apache::lonhomework::type eq 'survey' ||
+          $Apache::lonhomework::type eq 'surveycred' ||
+          $Apache::lonhomework::type eq 'anonsurvey' ||
+          $Apache::lonhomework::type eq 'anonsurveycred' ||
+          $Apache::lonhomework::parsing_a_task) {
+         if ($context eq 'link') {
+             $tries_text = 'Previous Submissions';
+         } else {
+             $tries_text = 'Submissions';
+         }
+     }
+     return $tries_text;
+ }
+ sub spelling_languages {
+     my %langchoices;
+     foreach my $id (&Apache::loncommon::languageids()) {
+         my $code = &Apache::loncommon::supportedlanguagecode($id);
+         if ($code ne '') {
+             $langchoices{$code} =  &Apache::loncommon::plainlanguagedescription($id);
+         }
+     }
+     my @spelllangs = ('none');
+     foreach my $code ('en','de','he','es','fr','pt','tr') {
+         push(@spelllangs,[$code,$langchoices{$code}]);
+     }
+     return \@spelllangs;
+ }
+ sub edit_mathresponse_button {
+     my ($field) = @_;
+     my $eqneditor = 'lcmath';
+     if ($env{'browser.type'} eq 'safari') {
+         if ($env{'browser.os'} eq 'mac') {
+             my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./);
+             if ($env{'browser.mobile'}) {
+                 if (($version < 531) || (($prefix eq '') && ($version < 533))) {
+                     $eqneditor = '';
+                 }
+             } elsif ($version < 533) {
+                 $eqneditor = 'dragmath';
+             }
+         } elsif ($env{'browser.os'} eq 'win') {
+             if ($env{'browser.version'} < 533) {
+                 $eqneditor = 'dragmath';
+             }
+         }
+     } elsif ($env{'browser.type'} eq 'explorer') {
+         if ($env{'browser.version'} < 9) {
+             $eqneditor = 'dragmath';
+         }
+     } elsif ($env{'browser.type'} eq 'mozilla') {
+         if ($env{'browser.version'} < 5) {
+             $eqneditor = 'dragmath';
+         } else {
+             if ($env{'browser.info'} =~ /^firefox\-([\d\.]+)/) {
+                 my $firefox = $1;
+                 if ($firefox < 4) {
+                     $eqneditor = 'dragmath';
+                 }
+             }
+         }
+     } elsif ($env{'browser.type'} eq 'chrome') {
+         if ($env{'browser.version'} < 5) {
+             $eqneditor = 'dragmath';
+         }
+     } elsif ($env{'browser.type'} eq 'opera') {
+         if ($env{'browser.version'} < 12) {
+             $eqneditor = 'dragmath';
+         }
+     }
+     if ($eqneditor eq 'lcmath') {
+         if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
+             if (exists($env{'course.'.$env{'request.course.id'}.'.uselcmath'})) {
+                 if ($env{'course.'.$env{'request.course.id'}.'.uselcmath'} eq '0') {
+                     $eqneditor = 'dragmath';
+                 }
+             } else {
+                 my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+                 if ($domdefs{'uselcmath'} eq '0') {
+                     $eqneditor = 'dragmath';
+                 }
+             }
+         } else {
+             my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+             if ($domdefs{'uselcmath'} eq '0') {
+                 $eqneditor = 'dragmath';
+             }
+         }
+     }
+     if ($eqneditor eq 'dragmath') {
+         # DragMath applet
+         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 LC_mathedit_${field} (LCtextline) {
+     thenumber = LCtextline;
+     var thedata = '';
+     if (document.getElementById(LCtextline)) {
+         thedata = document.getElementById(LCtextline).value;
+     }
+     newwin = window.open("/adm/dragmath/MaximaPopup.html","","width=565,height=400,resizable");
+ }
+ </script>
+ <a href="javascript:LC_mathedit_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a>
+ ENDFORMULABUTTON
+     } elsif ($eqneditor eq 'lcmath') {
+         # LON-CAPA math equation editor
+         my $mathjaxjs;
+         unless (lc(&Apache::lontexconvert::tex_engine()) eq 'mathjax') {
+             $mathjaxjs = <<"MATHJAX_SCRIPT";
+ var mathjaxscript = document.createElement("script");
+     mathjaxscript.type = "text/javascript";
+     mathjaxscript.src = "/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+     document.body.appendChild(mathjaxscript);
+ MATHJAX_SCRIPT
+         }
+         return(<<EQ_EDITOR_SCRIPT);
+ <script type="text/javascript">
+   var LCmathField = document.getElementById('${field}');
+   LCmathField.className += ' math'; // note the space
+   LCmathField.setAttribute('data-implicit_operators', 'true');
+   var LCMATH_started;
+   if (typeof LCMATH_started === 'undefined') {
+     $mathjaxjs
+     LCMATH_started = true;
+     var script = document.createElement("script");
+     script.type = "text/javascript";
+     script.src = "/adm/LC_math_editor/LC_math_editor.min.js";
+     document.body.appendChild(script);
+     window.addEventListener('load', function(e) {
+         LCMATH.initEditors();
+     }, false);
+   }
+ </script>
+ EQ_EDITOR_SCRIPT
+     }
+ }
 ;
  __END__
+ =pod
+ =back
+ =cut

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

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.226
changed lines
	Added in v.1.333.2.12.2.4