--- loncom/homework/inputtags.pm	2010/08/07 19:24:03	1.266
+++ loncom/homework/inputtags.pm	2011/03/07 22:38:09	1.285
@@ -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.285 2011/03/07 22:38:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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 = &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; }
@@ -186,7 +197,6 @@ 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.'>'.
@@ -332,16 +342,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='';
@@ -485,7 +505,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)');
@@ -528,27 +548,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 +595,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 +610,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();
@@ -599,7 +633,9 @@ sub current_file_submissions {
         }
     }
     if ($header_shown) {
-        $result .= &Apache::loncommon::end_data_table();
+        $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>';
     }
     if (@bad_file_list) {
         my $bad_files = '<span class="LC_filename">'.
@@ -648,7 +684,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 +702,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 +801,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 +819,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:");
 
@@ -824,7 +868,7 @@ sub decideoutput {
 		}
 	    }
 	}
-	$button=0;
+        if ($awarded==1) { $button=0; } else { $button=1; }
 	$previousmsg='';
     } elsif ($solved =~ /^excused/) {
 	if ($target eq 'tex') {
@@ -952,7 +996,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;
@@ -1042,7 +1094,6 @@ sub decideoutput {
        }
        $message.=&mt('Submissions to practice problems are not permanently recorded.');
     }
-
     return ($button,$css_class,$message,$previousmsg);
 }
 
@@ -1095,8 +1146,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 +1267,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
@@ -1229,9 +1278,13 @@ sub setgradedata {
 	&Apache::response::add_to_gradingqueue();
     }
     if (($Apache::lonhomework::type eq 'anonsurvey') ||
-        ($Apache::lonhomework::type eq 'anonsurveycred')) {
+        ($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 {
@@ -1311,8 +1364,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 +1379,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 {
@@ -1359,7 +1412,7 @@ sub get_grade_messages {
 	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries";
 	    if ($Apache::lonhomework::parsing_a_task) {
 	    } elsif($env{'request.state'} ne 'construct') {
-		$trystr.="/$maxtries";
+		$trystr.="/".&Apache::lonhtmlcommon::direct_parm_link($maxtries,$env{'request.symb'},'maxtries',$id,$target);
 	    } else {
 		if (defined($Apache::inputtags::params{'maxtries'})) {
 		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
@@ -1440,6 +1493,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 +1507,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 +1525,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) {
+                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 +1573,7 @@ sub previous_tries {
 	    }
 	}
 	$output.=&Apache::loncommon::end_data_table_row()."\n";
+        $lastrndseed = $curr_rndseed;
     }
     return if ($output eq '');
     my $headers =