--- loncom/homework/inputtags.pm	2001/06/01 15:52:50	1.34
+++ loncom/homework/inputtags.pm	2001/07/30 22:24:01	1.39
@@ -31,6 +31,7 @@ sub initialize_inputtags {
 sub start_input {
   my ($parstack,$safeeval)=@_;
   my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
+  if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);
   return $id;
@@ -42,7 +43,7 @@ sub end_input {
 }
 
 sub start_textarea {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {
@@ -62,7 +63,7 @@ sub start_textarea {
 }
 
 sub end_textarea {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {
     return "</textarea>";
   } 
@@ -71,7 +72,7 @@ sub end_textarea {
 }
 
 sub start_textline {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   if ($target eq 'web') {
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
@@ -79,11 +80,21 @@ sub start_textline {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';
   }
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
+    $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
+    $result.=&Apache::edit::end_table;
+  }
+  if ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  }
   return $result;
 }
 
 sub end_textline {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if ($target eq 'edit') { return ('','no'); }
   return "";
 }
 
@@ -92,7 +103,7 @@ sub start_datasubmission {
 }
 
 sub end_datasubmission {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {
     return '<input type="submit" name="submit" value="Submit All Data" />';
   }
@@ -148,9 +159,22 @@ sub decideoutput {
   my ($award,$solved)=@_;
   my $message='';
   my $button=0;
-  if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
+  if      ($solved =~ /^correct/) {
+    $message = "<b>You are correct.</b> Your receipt is ".
+      &Apache::lonnet::receipt;
+    $button=0;
+  } elsif ($solved =~ /^excused/) {
+    $message = "<b>You are excused from the problem.</b>";
     $button=0;
+  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+    if ($solved =~ /^incorrect/ || $solved eq '') {
+      $message = "Incorrect";
+      $button=1;
+    } else {
+      $message = "<b>You are correct.</b> Your receipt is ".
+	&Apache::lonnet::receipt;
+      $button=0;
+    }
   } elsif ($award eq 'NO_RESPONSE') {
     $message = '';
     $button=1;
@@ -190,25 +214,31 @@ sub decideoutput {
 
 sub setgradedata {
   my ($award,$id) = @_;
-  if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
-    $Apache::lonhomework::results{"resource.$id.tries"} =
-      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      'correct_by_student';
-    $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
-  } elsif ( $award eq 'INCORRECT' ) {
-    $Apache::lonhomework::results{"resource.$id.tries"} =
-      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      'incorrect_attempted';
-  } elsif ( $award eq 'SUBMITTED' ) {
-    $Apache::lonhomework::results{"resource.$id.tries"} =
-      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      'ungraded_attempted';
-  } else {
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      'incorrect_attempted';
+  # if the student already has it correct, don't modify the status
+  if ( $Apache::lonhomework::history{"resource.$id.solved"} !~
+       /^correct/ ) {
+    if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
+      $Apache::lonhomework::results{"resource.$id.tries"} =
+	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'correct_by_student';
+      $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+    } elsif ( $award eq 'INCORRECT' ) {
+      $Apache::lonhomework::results{"resource.$id.tries"} =
+	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'incorrect_attempted';
+    } elsif ( $award eq 'SUBMITTED' ) {
+      $Apache::lonhomework::results{"resource.$id.tries"} =
+	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'ungraded_attempted';
+    } elsif ( $award eq 'NO_RESPONSE' ) {
+      return '';
+    } else {
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'incorrect_attempted';
+    }
   }
   $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }
@@ -256,7 +286,7 @@ sub gradestatus {
     if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award,$solved);
-      $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
+      $message="<td bgcolor=\"#aaffaa\">$message</td>";
     }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
@@ -265,14 +295,14 @@ sub gradestatus {
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {
-      $trystr = "<br />Tries $tries/$maxtries";
+      $trystr = "<td>Tries $tries/$maxtries</td>";
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
       $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
     }
   }
-  return $button.$message.$trystr;
+  return $button.'<table><tr>'.$message.$trystr.'</tr></table>';
 }
 1;
 __END__