--- loncom/homework/inputtags.pm	2006/03/09 00:41:24	1.188
+++ loncom/homework/inputtags.pm	2006/11/01 23:24:52	1.210
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.188 2006/03/09 00:41:24 albertel Exp $
+# $Id: inputtags.pm,v 1.210 2006/11/01 23:24:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,9 @@ use strict;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 BEGIN {
     &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
@@ -137,9 +140,9 @@ sub start_textfield {
     my $resid=$Apache::inputtags::response[-1];
     if ($target eq 'web') {
 	$Apache::lonxml::evaluate--;
+	my $partid=$Apache::inputtags::part;
+	my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
-	    my $partid=$Apache::inputtags::part;
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
 	    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
 	    if ( $cols eq '') { $cols = 80; }
 	    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
@@ -149,7 +152,7 @@ sub start_textfield {
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-	    push @Apache::lonxml::htmlareafields,'HWVAL_'.$resid;
+	    &Apache::lonhtmlcommon::add_htmlareafields('HWVAL_'.$resid);
 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
 		"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	    if ($oldresponse ne '') {
@@ -158,9 +161,13 @@ sub start_textfield {
 		&Apache::lonxml::get_all_text("/textfield",$parser,$style);
 	    }
 	} else {
-	    #right or wrong don't show it
-	    #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
-	    $result='';
+	    #show past answer in the essayresponse case
+	    if ($oldresponse =~ /\S/
+		&& &Apache::londefdef::is_inside_of($tagstack,
+						    'essayresponse') ) {
+		$result='<table class="LC_pastsubmission"><tr><td>'.
+		    $oldresponse.'</td></tr></table>';
+	    }
 	    #get rid of any startup text
 	    &Apache::lonxml::get_all_text("/textfield",$parser,$style);
 	}
@@ -222,21 +229,32 @@ sub end_textfield {
     return $result;
 }
 
-sub exam_box {
+sub exam_score_line {
     my ($target) = @_;
-    my $result;
 
+    my $result;
     if ($target eq 'tex') {
-	$result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
 	my $repetition = &Apache::response::repetition();
 	$result.='\begin{enumerate}';
+	if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
 	foreach my $i (0..$repetition-1) {
 	    $result.='\item[\textbf{'.
 		($Apache::lonxml::counter+$i).
 		'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
 	}
 	$result.= '\end{enumerate}';
+    }
+
+    return $result;
+}
 
+sub exam_box {
+    my ($target) = @_;
+    my $result;
+
+    if ($target eq 'tex') {
+	$result .= '\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
+	$result .= &exam_score_line($target);
     } elsif ($target eq 'web') {
 	my $id=$Apache::inputtags::response[-1];
 	$result.= '<br /><br />
@@ -252,7 +270,6 @@ sub needs_exam_box {
 		'stringresponse',
 		'reactionresponse',
 		'organicresponse',
-		'imageresponse',
 		);
 
     foreach my $tag (@tags) {
@@ -266,17 +283,25 @@ sub needs_exam_box {
 sub start_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result = "";
+    my $input_id = &start_input($parstack,$safeeval);
     if ($target eq 'web') {
 	$Apache::lonxml::evaluate--;
 	my $partid=$Apache::inputtags::part;
 	my $id=$Apache::inputtags::response[-1];
-	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+	if (!&Apache::response::show_answer()) {
 	    my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	    my $maxlength;
 	    if ($size eq '') { $size=20; } else {
 		if ($size < 20) { $maxlength=$size; }
 	    }
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
+	    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,'<>&"');
+
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -285,12 +310,17 @@ sub start_textline {
 		}
 		my $readonly=&Apache::lonxml::get_param('readonly',$parstack,
 							$safeeval);
-		if (lc($readonly) eq 'yes') {
+		if (lc($readonly) eq 'yes' 
+		    || $Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
 		    $readonly=' readonly="readonly" ';
 		} else {
 		    $readonly='';
 		}
-		$result.= '<input type="text" '.$readonly.' name="HWVAL_'.$id.'" value="'.
+		my $name = 'HWVAL_'.$id;
+		if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+		    $name = "none";
+		}
+		$result.= '<input type="text" '.$readonly.' name="'.$name.'" value="'.
 		    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
 	    }
 	    if ($Apache::lonhomework::type eq 'exam'
@@ -299,7 +329,8 @@ sub start_textline {
 	    }
 	} else {
 	    #right or wrong don't show what was last typed in.
-	    $result='<b>'.$Apache::inputtags::answertxt{$id}.'</b>';
+	    my $count = scalar(@Apache::inputtags::inputlist)-1;
+	    $result='<b>'.$Apache::inputtags::answertxt{$id}[$count].'</b>';
 	    #$result='';
 	}
     } elsif ($target eq 'edit') {
@@ -334,6 +365,7 @@ sub end_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
+    &end_input();
     return "";
 }
 
@@ -355,6 +387,12 @@ sub start_hiddenline {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::end_table;
     }
+
+    if ( ($target eq 'web' || $target eq 'tex')
+	 && $Apache::lonhomework::type eq 'exam'
+	 && &needs_exam_box($tagstack)) {
+	$result.=&exam_box($target);
+    }
     return $result;
 }
 
@@ -391,19 +429,7 @@ sub file_selector {
 	$result.=&mt('Submit a file: (only one file can be uploaded)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
 	    $jspart.'_'.$id.'" /><br />';
-	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
-
-	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>';
-	    $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
-	} else {
-	    #$result.=&mt('(Hand in a file you have prepared on your computer)');
-	}
+	$result .= &show_past_file_submission($part,$id);
     }
     if ( $which eq 'both') { 
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
@@ -413,37 +439,59 @@ sub file_selector {
 	    &mt('Select Portfolio Files').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
-	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	    my (@filelist,@bad_file_list);
-	    foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
-		my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
-		my $url="/uploaded/$domain/$user/portfolio$file";
-		my $icon=&Apache::loncommon::icon($url);
-		push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
-		     '" border="0" />'.$file.'</a>');
-		if (! &Apache::lonnet::stat_file($url)) {
-		    push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon.
-			 '" border="0" />'.$file.'</a>');
-		}
-	    }
-	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
-	    if (@bad_file_list) {
-		$result.='<br />'.&mt('<font color="red">These file(s) don\'t exist:</font> <strong>[_1]</strong>',join(', ',@bad_file_list));
-	    }
-	}
+	$result .= &show_past_portfile_submission($part,$id);
+
     }
     $result.='</td></tr>'; 
     return $result;
 }
 
-sub checkstatus {
-    my ($value,$awardref,$msgref)=@_;
-    for (my $i=0;$i<=$#$awardref;$i++) {
-	if ($$awardref[$i] eq $value) {
-	    return ($$awardref[$i],$$msgref[$i]);
-	}
+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 {
+    my ($part,$id) = @_;
+    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(undef,undef);
+    return $result;
+
 }
 
 sub valid_award {
@@ -463,15 +511,29 @@ sub valid_award {
     return 0;
 }
 
+{
+    my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
+		  'TOO_LONG',
+		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
+		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
+		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
+		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
+		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+		  'APPROX_ANS', 'EXACT_ANS');
+    my $i=0;
+    my %fwd_awards = map { ($_,$i++) } @awards;
+    my $max=scalar(@awards);
+    @awards=reverse(@awards);
+    $i=0;
+    my %rev_awards = map { ($_,$i++) } @awards;
+
 sub finalizeawards {
     my ($awardref,$msgref,$nameref,$reverse)=@_;
-    my $result=undef;
-    my $award;
-    my $msg;
+    my $result;
     if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {
 	my $blankcount;
-	foreach $award (@$awardref) {
+	foreach my $award (@$awardref) {
 	    if ($award eq '') {
 		$result='MISSING_ANSWER';
 		$blankcount++;
@@ -479,25 +541,31 @@ sub finalizeawards {
 	}
 	if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
     }
-    if (defined($result)) { return ($result,$msg); }
+    if (defined($result)) { return ($result); }
 
     # these awards are ordered from most important error through best correct
-    
-    my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
-		  'TOO_LONG',
-		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
-		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
-		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
-		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
-		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
-		  'APPROX_ANS', 'EXACT_ANS');
-    if ($reverse) { @awards=reverse(@awards); }
-    foreach my $possibleaward (@awards) {
-	($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
-	if (defined($result)) { return ($result,$msg); }
+    my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
+
+    my $best = $max;
+    my $j=0;
+    my $which;
+    foreach my $award (@$awardref) {
+	if ($awards->{$award} < $best) {
+	    $best  = $awards->{$award};
+	    $which = $j;
+	}
+	$j++;
+    }
+    if (defined($which)) {
+	if (ref($nameref)) {
+	    return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
+	} else {
+	    return ($$awardref[$which],$$msgref[$which]);
+	}
     }
     return ('ERROR',undef);
 }
+}
 
 sub decideoutput {
     my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
@@ -507,10 +575,11 @@ sub decideoutput {
     my $bgcolor='orange';
     my $added_computer_text=0;
     my %possiblecolors =
-	( 'correct' => '#aaffaa',
-	  'charged_try' => '#ffaaaa',
+	( 'correct'         => '#aaffaa',
+	  'charged_try'     => '#ffaaaa',
 	  'not_charged_try' => '#ffffaa',
-	  'no_message' => '#fffff',
+	  'no_grade'        => '#ffffaa',
+	  'no_message'      => '#ffffff',
 	  );
 
     my $part = $Apache::inputtags::part;
@@ -523,8 +592,8 @@ sub decideoutput {
 
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
     
-    if      ($solved =~ /^correct/) {
-	$bgcolor=$possiblecolors{'correct'};
+    if ($solved =~ /^correct/) {
+        $bgcolor=$possiblecolors{'correct'};
 	$message=&mt('You are correct.');
 	if ($awarded < 1 && $awarded > 0) {
 	    $message=&mt('You are partially correct.');
@@ -669,7 +738,7 @@ sub decideoutput {
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
 	$message = &mt("Your submission has been recorded.");
-	$bgcolor=$possiblecolors{'correct'};
+	$bgcolor=$possiblecolors{'no_grade'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
 	$message = &mt("A draft copy has been saved.");
@@ -691,10 +760,24 @@ sub decideoutput {
 	$message = &mt("Unknown message").": $award";
 	$button=1;
     }
+    my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
+    foreach my $resid(@Apache::inputtags::response){
+        if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
+	    $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>';
+	    }
+	    $message .= &mt('Returned file(s): [_1]',$file_msg);
+	}
+    }
+
     if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
 	$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
 	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
-	$bgcolor=$possiblecolors{'correct'};
+	$bgcolor=$possiblecolors{'no_grade'};
 	$button=1;
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&