--- loncom/homework/inputtags.pm	2013/04/30 21:45:47	1.271.2.10
+++ loncom/homework/inputtags.pm	2010/12/31 00:58:10	1.276
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.271.2.10 2013/04/30 21:45:47 raeburn Exp $
+# $Id: inputtags.pm,v 1.276 2010/12/31 00:58:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@ use LONCAPA;
  
 
 BEGIN {
-    &Apache::lonxml::register('Apache::inputtags',('hiddensubmission','hiddenline','textfield','textline'));
+    &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
 }
 
 =pod
@@ -185,16 +185,7 @@ sub start_textfield {
             }
         }
         unless ($newvariation) {
-            if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
-                (($env{'form.grade_username'} eq $env{'user.name'}) &&
-                 ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
-                $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
-            } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
-                    ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {
-                $oldresponse = '* '.&mt('only shown to submitter').' *';
-            } else {
-                $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
-            }
+	    $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);
@@ -209,7 +200,7 @@ sub start_textfield {
             my $textareaclass = 'class="LC_richDetectHtml"';
 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
 		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.
-                      &HTML::Entities::encode($oldresponse,'<>&"');
+                      $oldresponse;
 	    if ($oldresponse ne '') {
 
 		#get rid of any startup text if the user has already responded
@@ -361,18 +352,7 @@ sub start_textline {
                 }
             }
             unless ($newvariation) {
-                if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
-                    (($env{'form.grade_username'} eq $env{'user.name'}) &&
-                     ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
-                    $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
-                } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
-                        ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') ||
-                        ($Apache::lonhomework::type eq 'anonsurvey') ||
-                        ($Apache::lonhomework::type eq 'anonsurveycred')) {
-                        $oldresponse = '* '.&mt('only shown to submitter').' *';
-                } else {
-                    $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
-                }
+	        $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];
@@ -498,48 +478,6 @@ 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()
@@ -685,7 +623,7 @@ sub current_file_submissions {
                         }
                         $result .= 
                             '<td><a href="'.$link.'"><img src="'.$icon.
-                            '" border="0" alt="" />'.$showname.'</a></td>'."\n".
+                            '" border="0" />'.$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();
@@ -747,7 +685,7 @@ sub valid_award {
 			       'UNIT_FAIL', 'NO_UNIT',
 			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
 			       'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT', 
-			       'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
+                               'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
                                'EXCESS_FILESIZE', 'FILENAME_INUSE', 
 			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', 
@@ -765,7 +703,7 @@ sub valid_award {
 		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
-		  'WRONG_FORMAT', 'INTERNAL_ERROR',
+                  'WRONG_FORMAT', 'INTERNAL_ERROR',
 		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
 		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', 
                   'DRAFT', 'SUBMITTED',
@@ -863,7 +801,7 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-    my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;
+    my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
 
     my $message='';
     my $button=0;
@@ -881,14 +819,8 @@ 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 || $nocorrect)? ''
+    
+    my $computer = ($handgrade)? ''
 	                       : " ".&mt("Computer's answer now shown above.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");
 
@@ -904,8 +836,8 @@ sub decideoutput {
 	    $message=&mt('Incorrect.');
 	    $css_class=$possible_class{'charged_try'};
 	}
-	if ($handgrade || 
-            ($env{'request.filename'}=~ m{/res/lib/templates/(examupload|DropBox)\.problem$})) {
+	if ($env{'request.filename'} =~ 
+	    m|/res/lib/templates/examupload.problem$|) {
 	    $message = &mt("A score has been assigned.");
 	    $added_computer_text=1;
 	} else {
@@ -1066,7 +998,7 @@ sub decideoutput {
         $message = &mt("Wrong format").'.';
         $css_class=$possible_class{'not_charged_try'};
         $button=1;
-    } elsif ($award eq 'INTERNAL_ERROR') {
+     } 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;
@@ -1343,7 +1275,7 @@ 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;
     }
@@ -1429,8 +1361,8 @@ sub grade {
 }
 
 sub get_grade_messages {
-    my ($id,$prefix,$target,$status,$nocorrect) = @_;
-# nocorrect suppresses "Computer's answer now shown above"
+    my ($id,$prefix,$target,$status) = @_;
+
     my ($message,$latemessage,$trystr,$previousmsg);
     my $showbutton = 1;
 
@@ -1444,7 +1376,7 @@ sub get_grade_messages {
 	&Apache::lonxml::debug('Getting message');
 	($showbutton,my $css_class,$message,$previousmsg) =
 	    &decideoutput($award,$awarded,$awardmsg,$solved,$previous,
-			  $target,(($status eq 'CAN_ANSWER') || $nocorrect));
+			  $target);
 	if ($target eq 'tex') {
 	    $message='\vskip 2 mm '.$message.' ';
 	} else {
@@ -1462,30 +1394,28 @@ 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 '
-                        .&mt('[_1]'.$tries_text.'[_2] [_3]'
-                                ,'\textit{','}',$tries.'/'.$maxtries )
-                        .'} \vskip 2 mm';
+		$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.
+		    $tries.'/'.$maxtries.'} \vskip 2 mm ';
 	    } else {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-            my $trial = $tries;
+	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries";
 	    if ($Apache::lonhomework::parsing_a_task) {
 	    } elsif($env{'request.state'} ne 'construct') {
-		$trial.="/$maxtries";
+		$trystr.="/$maxtries";
 	    } else {
 		if (defined($Apache::inputtags::params{'maxtries'})) {
-		    $trial.="/".$Apache::inputtags::params{'maxtries'};
+		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr.='<td><span class="LC_nobreak">'.&mt("$tries_text [_1]",$trial).'</span></td>';
+	    $trystr.="</span></td>";
 	}
     }
 
@@ -1575,7 +1505,6 @@ sub previous_tries {
 	$count++;
 	$count_lookup{$i} = $count;
         my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"};
-
 	my ($previousmsg,$latemessage,$message,$trystr);
 
 	($previousmsg,$latemessage,$message,$trystr) =
@@ -1593,25 +1522,15 @@ 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 || $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="([^"]*)"}); #"