--- loncom/homework/inputtags.pm	2015/10/30 03:49:47	1.338
+++ loncom/homework/inputtags.pm	2016/04/06 00:34:12	1.342
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.338 2015/10/30 03:49:47 raeburn Exp $
+# $Id: inputtags.pm,v 1.342 2016/04/06 00:34:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,7 +460,7 @@ sub start_textline {
 		}
 		my $name = 'HWVAL_'.$id;
                 my $itemid = 'HWVAL_'.$partid.'_'.$id;
-                my $input_tag_id = 'HWVAL_'.$input_id;
+                my $input_tag_id = $itemid.'_'.$input_id;
 		if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
 		    $name = "none";
 		}
@@ -1059,7 +1059,7 @@ sub decideoutput {
 #
     
     my $computer = ($handgrade || $nocorrect)? ''
-	                       : " ".&mt("Computer's answer now shown above.");
+	                       : &mt("Computer's answer now shown above.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");
 
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
@@ -1083,7 +1083,9 @@ sub decideoutput {
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-		$message.= $computer;
+                if ($computer) {
+                    $message = "$computer $message";
+                }
 	    }
 	    $added_computer_text=1;
 	    if ($awarded > 0) {
@@ -1127,7 +1129,9 @@ sub decideoutput {
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-		$message.= $computer;
+                if ($computer) {
+                    $message = "$computer $message";
+                }
 	    }
 	    $added_computer_text=1;
 	    if  ($awarded > 0 
@@ -1336,10 +1340,19 @@ sub decideoutput {
         }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
+            if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+                $message = 'Answer Submitted';
+            } else {
+                undef($message); 
+            }
+        }
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
-	$message.= $computer;
+        if ($computer) {
+            $message = "$computer $message";
+        }
 	$added_computer_text=1;
     }
     if ($Apache::lonhomework::type eq 'practice') {
@@ -1636,7 +1649,11 @@ sub get_grade_messages {
 	if ($target eq 'tex') {
 	    $message='\vskip 2 mm '.$message.' ';
 	} else {
-	    $message="<td class=\"$tdclass $css_class\">$message</td>";
+            if ($message) {
+	        $message="<td class=\"$tdclass $css_class\">$message</td>";
+            } else {
+                $message="<td class=\"$tdclass\"></td>";  
+            }
 	    if ($previousmsg) {
 		$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
 	    }
@@ -1673,7 +1690,13 @@ sub get_grade_messages {
 		    $trial.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
+            
+            unless (($env{'request.state'} ne "construct") && 
+                    ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && 
+                    (!$env{'request.role.adv'})) {
+                $trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>';
+            }
+	    $trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>';
 	}
     }
 
@@ -1749,7 +1772,9 @@ sub gradestatus {
 	} else {
 	    $output =
 		'<table><tr><td>'.$button.'</td>'.$output;
-	    if (!$no_previous) {
+	    if ((!$no_previous) &&
+                (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') ||
+                 ($env{'request.role.adv'}))) {
 		$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
 	    }
 	    $output.= '</tr></table>';