--- loncom/homework/inputtags.pm	2010/08/07 19:24:03	1.266
+++ loncom/homework/inputtags.pm	2012/09/14 11:23:58	1.309
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.266 2010/08/07 19:24:03 raeburn Exp $
+# $Id: inputtags.pm,v 1.309 2012/09/14 11:23:58 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@ use LONCAPA;
  
 
 BEGIN {
-    &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
+    &Apache::lonxml::register('Apache::inputtags',('hiddensubmission','hiddenline','textfield','textline'));
 }
 
 =pod
@@ -175,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 = $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; }
@@ -186,11 +197,12 @@ sub start_textfield {
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-            $result .= &Apache::lonhtmlcommon::htmlareaselectactive();
-            my $textareaclass = 'class="LC_richDetectHtml"';
-	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
-		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.
-                      $oldresponse;
+            my $textareaclass = 'class="LC_richDetectHtml spellchecked"';
+	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" ' .
+		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass
+		      . "onblur='\$(this).spellchecker(\"check\")'"
+		      .'>'.
+                      &HTML::Entities::encode($oldresponse,'<>&"');
 	    if ($oldresponse ne '') {
 
 		#get rid of any startup text if the user has already responded
@@ -241,10 +253,12 @@ 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;
-	    $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 ';
+	    my $fieldname = $env{'request.symb'}.
+                    '&part_'. $Apache::inputtags::part.
+                    '&textresponse'.
+                    '&HWVAL_' . $Apache::inputtags::response['-1'];
+            $result.='\TextField[name='.$fieldname.',multiline=true,height=6\baselineskip,width=270,borderwidth=0,backgroundcolor={.85
+                .85 .85}]\\';
 	}
     }
     return $result;
@@ -332,16 +346,26 @@ 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,'<>&"');
-            $oldresponse =~ s/^\s+//;
-            $oldresponse =~ s/\s+$//;
-            $oldresponse =~ s/\s+/ /g;
+            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='';
@@ -361,7 +385,8 @@ sub start_textline {
 		    $name = "none";
 		}
 		$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'.
-		    $oldresponse.'" size="'.$size.'"'.$maxlength.' />';
+		    $oldresponse.'" class="spellchecked"  size="'.$size.'"'.$maxlength.'
+                    onblur=' . "'\$(this).spellchecker(\"check\")'"  . '/>';
 	    }
 	    if ($Apache::lonhomework::type eq 'exam'
 		&& &needs_exam_box($tagstack)) {
@@ -458,6 +483,49 @@ sub end_hiddenline {
     return "";
 }
 
+
+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()
@@ -485,7 +553,7 @@ sub file_selector {
     my $current_files_display = &current_file_submissions($part,$id);
     my $addfiles;
     if ($current_files_display) {
-        $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files:')).
+        $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
                    $current_files_display.
                    &Apache::lonhtmlcommon::row_closure();
         $addfiles = &mt('Submit other file(s)');
@@ -508,13 +576,25 @@ sub file_selector {
     if ($which eq 'uploadonly' || $which eq 'both') { 
 	$result.=&mt('Submit a file: (only one file per submission)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
-	    $jspart.'_'.$id.'" /><br />';
+	    $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><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='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+    if ($which eq 'portfolioonly' || $which eq 'both') {
+        my $symb = $env{'request.symb'};
+        (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 />';
@@ -528,27 +608,31 @@ sub current_file_submissions {
     my ($part,$id) = @_;
     my $jspart=$part;
     $jspart=~s/\./_/g;
-    my $uploadedfile=&HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+    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().
-                 '<th>'.&mt('Delete?').'</th>'.
-                 '<th>'.&mt('Name').'</th>'.
+                 &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,@bad_file_list);
+    my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
     if ($uploadedfile) {
         my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
-        my ($path,$name) = ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E/(essayresponse/.+/)([^/]+))});
+        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,$uploadedfile,$name,$path);
+            &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 {
@@ -571,6 +655,7 @@ sub current_file_submissions {
             }
         }
     }
+    my $num = 0;
     foreach my $name (sort(keys(%okfiles))) {
         if (ref($okfiles{$name}) eq 'ARRAY') {
             foreach my $url (@{$okfiles{$name}}) {
@@ -585,11 +670,20 @@ sub current_file_submissions {
                             $header_shown = 1;
                         }
                         $result.=
-                            &Apache::loncommon::start_data_table_row()."\n".
-                            '<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete" value="'.
-                            $portfile.'" /></td>'."\n".
+                            &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" />'.$name.'</a></td>'."\n".
+                            '" 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();
@@ -600,6 +694,10 @@ sub current_file_submissions {
     }
     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">'.
@@ -648,7 +746,8 @@ sub valid_award {
 			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
 			       'UNIT_FAIL', 'NO_UNIT',
 			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
-			       'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
+			       'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT', 
+                               'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
                                'EXCESS_FILESIZE', 'FILENAME_INUSE', 
 			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', 
@@ -665,7 +764,8 @@ sub valid_award {
 		  'TOO_LONG',
 		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
-		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
+		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
+                  'WRONG_FORMAT', 'INTERNAL_ERROR',
 		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
 		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', 
                   'DRAFT', 'SUBMITTED',
@@ -763,7 +863,7 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-    my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
+    my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;
 
     my $message='';
     my $button=0;
@@ -781,8 +881,14 @@ sub decideoutput {
     my $part = $Apache::inputtags::part;
     my $tohandgrade = &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.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");
 
@@ -798,8 +904,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'}=~/\/res\/lib\/templates\/(examupload|DropBox).problem$/)) {
 	    $message = &mt("A score has been assigned.");
 	    $added_computer_text=1;
 	} else {
@@ -824,7 +930,13 @@ sub decideoutput {
 		}
 	    }
 	}
-	$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') {
@@ -952,7 +1064,15 @@ sub decideoutput {
         if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
-    } elsif ($award eq 'INTERNAL_ERROR') {
+    } 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;
@@ -975,6 +1095,7 @@ sub decideoutput {
     } 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("Copy saved but not submitted.");
 	$css_class=$possible_class{'not_charged_try'};
@@ -1025,7 +1146,17 @@ sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()
 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
 	&& &hide_award($award)) {
-	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        $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");
+                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
+                    $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
+                }
+            }
+        }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     }
@@ -1042,7 +1173,6 @@ sub decideoutput {
        }
        $message.=&mt('Submissions to practice problems are not permanently recorded.');
     }
-
     return ($button,$css_class,$message,$previousmsg);
 }
 
@@ -1095,8 +1225,7 @@ sub setgradedata {
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
 	$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
 	return '';
-    } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
-	      /^correct/ 
+    } elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} < 1
 	      || $Apache::lonhomework::scantronmode 
 	      || &Apache::lonhomework::hide_problem_status()  ) {
         # the student doesn't already have it correct,
@@ -1217,8 +1346,7 @@ sub setgradedata {
 		$Apache::lonhomework::results{"resource.$id.previous"} = '0';
 	    }
 	}
-    } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
-	      /^correct/ ) {
+    } elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} == 1 ) {
 	#delete all data as they student already has it correct
 	&removealldata($id);
 	#and since they didn't do anything we were never here
@@ -1228,10 +1356,10 @@ sub setgradedata {
     if ($award eq 'SUBMITTED') {
 	&Apache::response::add_to_gradingqueue();
     }
-    if (($Apache::lonhomework::type eq 'anonsurvey') ||
-        ($Apache::lonhomework::type eq 'anonsurveycred')) {
-        $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
-    }
+    $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{"resourse.$id.version"} = &Apache::lonnet::usedversion(); 
 }
 
 sub find_which_previous {
@@ -1311,8 +1439,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;
 
@@ -1326,7 +1454,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 {
@@ -1344,28 +1472,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= &get_tries_text();;
+    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><span class="LC_nobreak">'.&mt($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.="</span></td>";
+	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
 	}
     }
 
@@ -1394,12 +1524,19 @@ 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;
+        }
 
 	($previousmsg,$latemessage,$message,$trystr) =
 	    &get_grade_messages($id,"resource.$id",$target,$status,
 				$showbutton);
-	if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+	if ($status eq 'CANNOT_ANSWER') {
 	    $showbutton = 0;
 	}
 	if ( $status eq 'SHOW_ANSWER') {
@@ -1440,6 +1577,7 @@ sub previous_tries {
 
     my $count;
     my %count_lookup;
+    my $lastrndseed;
 
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {
 	my $prefix = $i.":resource.$id";
@@ -1453,7 +1591,7 @@ sub previous_tries {
 	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) =
@@ -1471,10 +1609,25 @@ sub previous_tries {
 		) {
 		
                 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>$txt_correct</strong>. $3}s;
 	    }
             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="([^"]*)"}); #"
@@ -1504,6 +1657,7 @@ sub previous_tries {
 	    }
 	}
 	$output.=&Apache::loncommon::end_data_table_row()."\n";
+        $lastrndseed = $curr_rndseed;
     }
     return if ($output eq '');
     my $headers = 
@@ -1511,31 +1665,13 @@ sub previous_tries {
 	'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
 	&mt('Submitted Answer').'</th>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
-    #return $output;
-    $output = &Apache::loncommon::js_ready($output); 
-    $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($tries_text, undef,
-				       {'only_body'      => 1,
-					'bgcolor'        => '#FFFFFF',
-					'js_ready'       => 1,
-				        'inherit_jsmath' => 1, });
-    my $end_page =
-	&Apache::loncommon::end_page({'js_ready' => 1,});
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.
 	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
-    my $result ="<script type=\"text/javascript\">
-// <![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($tries_text)."</a><br />";
-    #use Data::Dumper;
-    #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
+    my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
     return $result;
 }