--- loncom/homework/inputtags.pm	2008/01/28 21:42:28	1.237
+++ loncom/homework/inputtags.pm	2011/10/08 20:44:20	1.271.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.237 2008/01/28 21:42:28 www Exp $
+# $Id: inputtags.pm,v 1.271.2.8 2011/10/08 20:44:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,54 +25,85 @@
 #
 # 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 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.
-#
-#  @Apache::inputtags::input        - List of current input ids.
-#  @Apache::inputtags::inputlist    - List of all input ids seen this problem.
-#  @Apache::inputtags::response     - List of all current resopnse ids.
-#  @Apache::inputtags::responselist - List of all response ids seen this 
-#                                       problem.
-#  @Apache::inputtags::hint         - List of all hint ids.
-#  @Apache::inputtags::hintlist     - List of all hint ids seen this problem.
-#  @Apache::inputtags::previous     - List describing if specific responseds
-#                                       have been used
-#  @Apache::inputtags::previous_version - Submission responses were used in.
-#  $Apache::inputtags::part         - Current part id (valid only in 
-#                                       <problem>)
-#                                     0 if not in a part.
-#  @Apache::inputtags::partlist     - List of part ids seen in the current
-#                                       <problem>
-#  @Apache::inputtags::status       - List of problem  statuses. First 
-#                                     element is the status of the <problem>
-#                                     the remainder are for individual <part>s.
-#  %Apache::inputtags::params       - Hash of defined parameters for the
-#                                     current response.
-#  @Apache::inputtags::import       - List of all ids for <import> thes get
-#                                     join()ed and prepended.
-#  @Apache::inputtags::importlist   - List of all import ids seen.
-#  $Apache::inputtags::response_with_no_part
-#                                   - Flag set true if we have seen a response
-#                                     that is not inside a <part>
-#  %Apache::inputtags::answertxt    - <*response> tags store correct
-#                                     answer strings for display by <textline/>
-#                                     in this hash.
-#  %Apache::inputtags::submission_display
-#                                   - <*response> tags store improved display
-#                                     of submission strings for display by part
-#                                     end.
+=pod
+
+=item initialize_inputtags()
+
+Initializes a set of global variables used during the parse of the problem.
+
+@Apache::inputtags::input        - List of current input ids.
+@Apache::inputtags::inputlist    - List of all input ids seen this problem.
+@Apache::inputtags::response     - List of all current resopnse ids.
+@Apache::inputtags::responselist - List of all response ids seen this 
+                                     problem.
+@Apache::inputtags::hint         - List of all hint ids.
+@Apache::inputtags::hintlist     - List of all hint ids seen this problem.
+@Apache::inputtags::previous     - List describing if specific responseds
+                                     have been used
+@Apache::inputtags::previous_version - Submission responses were used in.
+$Apache::inputtags::part         - Current part id (valid only in 
+                                     <problem>)
+                                   0 if not in a part.
+@Apache::inputtags::partlist     - List of part ids seen in the current
+                                     <problem>
+@Apache::inputtags::status       - List of problem  statuses. First 
+                                   element is the status of the <problem>
+                                   the remainder are for individual <part>s.
+%Apache::inputtags::params       - Hash of defined parameters for the
+                                   current response.
+@Apache::inputtags::import       - List of all ids for <import> thes get
+                                   join()ed and prepended.
+@Apache::inputtags::importlist   - List of all import ids seen.
+$Apache::inputtags::response_with_no_part
+                                 - Flag set true if we have seen a response
+                                   that is not inside a <part>
+%Apache::inputtags::answertxt    - <*response> tags store correct
+                                   answer strings for display by <textline/>
+                                   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=();
@@ -144,7 +175,18 @@ 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) {
+	    $oldresponse = &HTML::Entities::encode($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; }
@@ -155,9 +197,10 @@ sub start_textfield {
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-	    &Apache::lonhtmlcommon::add_htmlareafields('HWVAL_'.$resid);
+            my $textareaclass = 'class="LC_richDetectHtml"';
 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
-		"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
+		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.
+                      $oldresponse;
 	    if ($oldresponse ne '') {
 
 		#get rid of any startup text if the user has already responded
@@ -299,14 +342,27 @@ sub start_textline {
 		    $maxlength = ' maxlength="'.$size.'"';
 		}
 	    }
-	    my $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,'<>&"');
-
+            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) {
+	        $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='';
@@ -356,8 +412,16 @@ sub start_textline {
 	     && $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)) {
@@ -415,95 +479,244 @@ sub end_hiddenline {
     return "";
 }
 
-# $part -> partid
-# $id -> responseid
-# $uploadefiletypes -> comma seperated list of extensions allowed or * for any
-# $which -> 'uploadedonly'  -> 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
-# returns a table row <tr> 
+sub start_hiddensubmission {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result = "";
+    my $input_id = &start_input($parstack,$safeeval);
+    if ($target eq 'web') {
+        $Apache::lonxml::evaluate--;
+        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;
-    
-    $result.='<tr><td>';
+    my $current_files_display = &current_file_submissions($part,$id);
+    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.=
-	    &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+	$constraints =
+	    &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+    }
+    if ($maxfilesize) {
+        $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].',
+                        '<b>'.$maxfilesize.'</b>').'<br />';
+    }
+    if ($constraints) {
+        $result .= $constraints.'<br />';
     }
     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 per submission)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
 	    $jspart.'_'.$id.'" /><br />';
-	$result .= &show_past_file_submission($part,$id);
     }
-    if ( $which eq 'both') { 
+    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='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
-	    &mt('Select Portfolio Files').'</a><br />'.
+	    &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 {
-    my ($part,$id) = @_;
-    my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
-
-    return if (!$uploadedfile);
-
-    my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
-    &Apache::lonxml::extlink($url);
-    &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
-    my $icon=&Apache::loncommon::icon($url);
-    my $curfile='<a href="'.$url.'"><img src="'.$icon.
-	'" border="0" />'.$uploadedfile.'</a>';
-    return &mt('Currently submitted: <tt>[_1]</tt>',$curfile);
-
-}
-
-sub show_past_portfile_submission {
+sub current_file_submissions {
     my ($part,$id) = @_;
-    if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){
-	return;
+    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 = &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 $showname = $rows{$url}{path}.$name;
+                        if ($legacy{$url}) {
+                            $showname = $name.' '.&mt('not in portfolio');
+                        }
+                        $result .= 
+                            '<td><a href="'.$link.'"><img src="'.$icon.
+                            '" border="0" alt="" />'.$showname.'</a></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().
+                   '<br /><span class="LC_warning">'.
+                   &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';
     }
-    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);
+        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;
+}
 
+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);
 }
 
 sub valid_award {
@@ -514,10 +727,14 @@ sub valid_award {
 			       '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',
-			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+                               'EXCESS_FILESIZE', 'FILENAME_INUSE', 
+			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', 
+                               'ANONYMOUS', 'ANONYMOUS_CREDIT',
+                               'ASSIGNED_SCORE', 'APPROX_ANS',
+			       'EXACT_ANS','COMMA_FAIL') {
 	if ($award eq $possibleaward) { return 1; }
     }
     return 0;
@@ -528,10 +745,13 @@ sub valid_award {
 		  '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',
-		  'APPROX_ANS', 'EXACT_ANS');
+		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', 
+                  '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);
@@ -554,7 +774,7 @@ sub hide_award {
 	return 1;
     }
     if ($award =~
-	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) {
+	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) {
 	return 1;
     }
     return 0;
@@ -576,6 +796,9 @@ sub finalizeawards {
 	    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 
@@ -621,7 +844,8 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-    my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
+    my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;
+
     my $message='';
     my $button=0;
     my $previousmsg;
@@ -638,8 +862,14 @@ sub decideoutput {
     my $part = $Apache::inputtags::part;
     my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade");
     my $handgrade = ('yes' eq lc($tohandgrade)); 
-    
-    my $computer = ($handgrade)? ''
+ 
+#
+# 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 || $nocorrect)? ''
 	                       : " ".&mt("Computer's answer now shown above.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");
 
@@ -655,8 +885,8 @@ sub decideoutput {
 	    $message=&mt('Incorrect.');
 	    $css_class=$possible_class{'charged_try'};
 	}
-	if ($env{'request.filename'} =~ 
-	    m|/res/lib/templates/examupload.problem$|) {
+	if ($handgrade || 
+            ($env{'request.filename'}=~ m{/res/lib/templates/(examupload|DropBox)\.problem$}) {
 	    $message = &mt("A score has been assigned.");
 	    $added_computer_text=1;
 	} else {
@@ -675,7 +905,7 @@ sub decideoutput {
 			      '.disable_receipt_display'} ne 'yes') &&
                     ($Apache::lonhomework::type ne 'practice')) { 
 		    $message.=(($target eq 'web')?'<br />':' ').
-			&mt('Your receipt is [_1]',
+			&mt('Your receipt no. is [_1]',
 			    (&Apache::lonnet::receipt($Apache::inputtags::part).
 			     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
 		}
@@ -728,10 +958,13 @@ sub decideoutput {
 	$button = 1;
     } elsif ($award eq 'MISSING_ANSWER') {
 	$message = &mt('Some items were not submitted.');
+        if ($target ne 'tex') {
+           $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
+        }
 	$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') {
@@ -743,20 +976,34 @@ sub decideoutput {
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'MISORDERED_RANK') {
-	$message = &mt('You have provided an invalid ranking');
-	if ($target ne 'tex') {
-	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
-	}
+        $message = &mt('You have provided an invalid ranking.');
+        if ($target ne 'tex') {
+            $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 file name.');
+        $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 digits.",$used);
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
@@ -788,9 +1035,22 @@ sub decideoutput {
 	$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'};
@@ -799,8 +1059,19 @@ 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'};
     } 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') {
@@ -822,14 +1093,27 @@ 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 />';
+            }
 	}
     }
 
@@ -846,7 +1130,12 @@ sub decideoutput {
 	$added_computer_text=1;
     }
     if ($Apache::lonhomework::type eq 'practice') {
-       $message.='<br />'.&mt('Submissions to practice problems are not permanently recorded.');
+       if ($target eq 'web') {
+           $message .= '<br />';
+       } else {
+           $message .= ' ';      
+       }
+       $message.=&mt('Submissions to practice problems are not permanently recorded.');
     }
 
     return ($button,$css_class,$message,$previousmsg);
@@ -944,6 +1233,18 @@ 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;
@@ -958,6 +1259,11 @@ 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' ) {
@@ -1017,6 +1323,14 @@ sub setgradedata {
     if ($award eq 'SUBMITTED') {
 	&Apache::response::add_to_gradingqueue();
     }
+    if (($Apache::lonhomework::type eq 'anonsurvey') ||
+        ($Apache::lonhomework::type eq 'anonsurveycred') ||
+        ($Apache::lonhomework::type eq 'randomizetry')) {
+        $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
+    }
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        $Apache::lonhomework::results{"resource.$id.rndseed"} = $env{'form.'.$id.'.rndseed'};
+    }
 }
 
 sub find_which_previous {
@@ -1078,7 +1392,7 @@ sub grade {
 	    my ($match) =
 		&previous_match(\@Apache::inputtags::previous_version,
 				scalar(@Apache::inputtags::response));
-	    
+
 	    if ($match) {
 		$previously_used = 'PREVIOUSLY_LAST';
 		foreach my $value (@Apache::inputtags::previous) {
@@ -1096,8 +1410,8 @@ sub grade {
 }
 
 sub get_grade_messages {
-    my ($id,$prefix,$target,$status) = @_;
-
+    my ($id,$prefix,$target,$status,$nocorrect) = @_;
+# nocorrect suppresses "Computer's answer now shown above"
     my ($message,$latemessage,$trystr,$previousmsg);
     my $showbutton = 1;
 
@@ -1111,7 +1425,7 @@ 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));
 	if ($target eq 'tex') {
 	    $message='\vskip 2 mm '.$message.' ';
 	} else {
@@ -1129,33 +1443,30 @@ 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');
-    if ( $Apache::lonhomework::type eq 'survey' ||
-	 $Apache::lonhomework::parsing_a_task) {
-	$tries_text=&mt('Submissions');
-    }
-
+    my $tries_text= &get_tries_text();
     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.'} '.
-		    $tries.'/'.$maxtries.'} \vskip 2 mm ';
+                $trystr ='{\vskip 1 mm \small '
+                        .&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.="/$maxtries";
 	    } else {
 		if (defined($Apache::inputtags::params{'maxtries'})) {
-		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
+		    $trial.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr.="</nobr></td>";
+	    $trystr.='<td><span class="LC_nobreak">'.&mt("$tries_text [_1]",$trial).'</span></td>';
 	}
     }
 
@@ -1198,11 +1509,9 @@ sub gradestatus {
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
 		$button = 
-		    '<input 
-                          onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
-                           onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
-                        type="submit" name="submit_'.$id.'"
-                         value="'.&mt('Submit Answer').'" />';
+            '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
+                    type="submit" name="submit_'.$id.'"
+                    value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1232,14 +1541,22 @@ sub previous_tries {
 
     my $count;
     my %count_lookup;
+    my $lastrndseed;
 
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {
 	my $prefix = $i.":resource.$id";
-
+        my $is_anon; 
+        if (defined($env{'form.grade_symb'})) {
+            if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || 
+                ($Apache::lonhomework::history{"$prefix.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) =
@@ -1256,11 +1573,26 @@ sub previous_tries {
 		&& $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 ".
-		$Apache::lonhomework::history{"$prefix.tries"}.')';
+            my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
+            if (($curr_rndseed || $lastrndseed) && ($i > 1)) {
+                if ($curr_rndseed ne $lastrndseed) {
+                    $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="([^"]*)"}); #"
@@ -1280,12 +1612,17 @@ 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;
     }
     return if ($output eq '');
     my $headers = 
@@ -1298,8 +1635,9 @@ sub previous_tries {
     $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
 
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+    my $tries_text = &get_tries_text('link');
     my $start_page =
-	&Apache::loncommon::start_page('Previous Tries', undef,
+	&Apache::loncommon::start_page($tries_text, undef,
 				       {'only_body'      => 1,
 					'bgcolor'        => '#FFFFFF',
 					'js_ready'       => 1,
@@ -1314,12 +1652,40 @@ sub previous_tries {
 // <![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()}
 // ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</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;
+}
+
 1;
 __END__
+
+=pod
+
+=back
+
+=cut