--- loncom/homework/inputtags.pm	2003/10/13 21:09:47	1.121
+++ loncom/homework/inputtags.pm	2004/03/05 21:31:07	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.121 2003/10/13 21:09:47 albertel Exp $
+# $Id: inputtags.pm,v 1.134 2004/03/05 21:31:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,8 +24,6 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# 2/19 Guy 
 
 package Apache::inputtags;
 use HTML::Entities();
@@ -64,6 +62,8 @@ sub initialize_inputtags {
   @Apache::inputtags::import=();
   # list of all import ids seen
   @Apache::inputtags::importlist=();
+  # just used to note whether we have seen a response that isn't in a part
+  $Apache::inputtags::response_with_no_part=0;
 }
 
 sub check_for_duplicate_ids {
@@ -98,6 +98,16 @@ sub end_input {
   return '';
 }
 
+sub addchars {
+    my ($fieldid,$addchars)=@_;
+    my $output='';
+    foreach (split(/\,/,$addchars)) {
+	$output.='<a href="javascript:void(document.forms.lonhomework.'.
+	    $fieldid.'.value+=\''.$_.'\')">'.$_.'</a> ';
+    }
+    return $output;
+}
+
 sub start_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
@@ -112,7 +122,12 @@ sub start_textfield {
 	if ( $cols eq '') { $cols = 80; }
 	my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
 	if ( $rows eq '') { $rows = 10; }
-	$result= '<textarea wrap="hard" name="HWVAL_'.$resid.'" '.
+	my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
+	$result='';
+        if ($addchars) {
+	    $result.=&addchars('HWVAL_'.$resid,$addchars);
+	}
+	$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" '.
 	    "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	if ($oldresponse ne '') {
 	    #get rid of any startup text if the user has already responded
@@ -135,18 +150,19 @@ sub start_textfield {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
     $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
+    $result.=&Apache::edit::text_arg
+	('Click-On Texts (comma sep):','addchars',$token,10);
     my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						 $safeeval,'rows','cols');
+					   $safeeval,'rows','cols','addchars');
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
     } else {
       $result=$token->[4];
     }
-    my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
-    $result.=&Apache::edit::modifiedfield();
+    $result.=&Apache::edit::modifiedfield("/textfield",$parser);
   } elsif ($target eq 'tex') {
       my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
       my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
@@ -194,7 +210,12 @@ sub start_textline {
       }
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {
-        $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
+	my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
+	$result='';
+        if ($addchars) {
+	    $result.=&addchars('HWVAL_'.$id,$addchars);
+	}
+        $result.= '<input type="text" name="HWVAL_'.$id.'" value="'.
 	    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
       }
     } else {
@@ -204,10 +225,12 @@ sub start_textline {
     }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
-    $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
+    $result.=&Apache::edit::text_arg('Size:','size',$token,'5').
+	&Apache::edit::text_arg
+	('Click-On Texts (comma sep):','addchars',$token,10)."</td></tr>";
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
-    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
@@ -348,7 +371,7 @@ sub decideoutput {
 			   $ENV{'request.course.id'}.
 			   '.disable_receipt_display'} eq 'yes') { 
 	      $message.=(($target eq 'web')?'<br />':' ').
-		  &mt('Your receipt is').' '.&Apache::lonnet::receipt().
+		  &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
        (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
       }
@@ -375,7 +398,7 @@ sub decideoutput {
 			   $ENV{'request.course.id'}.
 			   '.disable_receipt_display'} eq 'yes') { 
 	      $message.=(($target eq 'web')?'<br />':' ').
-		  'Your receipt is '.&Apache::lonnet::receipt().
+		  'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
        (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
 	  $bgcolor=$possiblecolors{'correct'};
@@ -387,7 +410,7 @@ sub decideoutput {
       $bgcolor=$possiblecolors{'no_feedback'};
       $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {
-      $message = &mt('Some parts were not submitted.');
+      $message = &mt('Some items were not submitted.');
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button = 1;
   } elsif ($award eq 'ERROR') {
@@ -457,7 +480,7 @@ sub decideoutput {
   }
   if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
       $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
-      $message = &mt("Answer Submitted");
+      $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
   }
@@ -477,7 +500,8 @@ sub removealldata {
 sub setgradedata {
   my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status
-  if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+  if (!$Apache::lonhomework::scantronmode &&
+      $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
       $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';
@@ -544,21 +568,28 @@ sub setgradedata {
       }
     }
 
-    # check if this was a previous submission if it was delete the
-    # unneeded data and update the previously_used attribute
-    if ( $previously_used eq 'PREVIOUSLY_USED') {
-	if (lc($Apache::lonhomework::problemstatus) ne 'no') {
-	    delete($Apache::lonhomework::results{"resource.$id.tries"});
-	    $Apache::lonhomework::results{"resource.$id.previous"} = '1';
-	}
-    } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
-      #delete all data as they student didn't do anything, but save
-      #the list of collaborators.
-      &removealldata($id);
-      #and since they didn't do anything we were never here
-      return '';
-    } else {
-      $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+    # did either of the overall awards chage? If so ignore the 
+    # previous check
+    if (($Apache::lonhomework::results{"resource.$id.awarded"} eq
+	 $Apache::lonhomework::history{"resource.$id.awarded"}) &&
+        ($Apache::lonhomework::results{"resource.$id.solved"} eq
+         $Apache::lonhomework::history{"resource.$id.solved"})) {
+	# check if this was a previous submission if it was delete the
+	# unneeded data and update the previously_used attribute
+	if ( $previously_used eq 'PREVIOUSLY_USED') {
+	    if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+		delete($Apache::lonhomework::results{"resource.$id.tries"});
+		$Apache::lonhomework::results{"resource.$id.previous"} = '1';
+	    }
+	} elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
+	    #delete all data as they student didn't do anything, but save
+	    #the list of collaborators.
+	    &removealldata($id);
+	    #and since they didn't do anything we were never here
+	    return '';
+	} else {
+	    $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+	}
     }
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
 	    /^correct/ ) {
@@ -632,7 +663,7 @@ sub gradestatus {
       ($showbutton,$bgcolor,$message,$previousmsg) =
 	&decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {
-	$message=' '.$message.' ';
+	$message='\vskip 2 mm '.$message.' ';
       } else {
 	$message="<td bgcolor=\"$bgcolor\">$message</td>";
 	if ($previousmsg) {
@@ -643,24 +674,36 @@ sub gradestatus {
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     &Apache::lonxml::debug("got maxtries of :$maxtries:");
+    #if tries are set to negative turn off the Tries/Button and messages
+    if (defined($maxtries) && $maxtries < 0) { return ''; }
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
+    my $tries_text=&mt('Tries');
+    if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
     if ( $showbutton ) {
       if ($target eq 'tex') {
 	  if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
-	      $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
+	      $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
 	  } else {
 	      $trystr = '\vskip 0 mm ';
 	  }
       } else {
-         $trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>";
+	  $trystr = "<td>".$tries_text." $tries";
+	  if($ENV{'request.state'} ne 'construct') {
+	      $trystr.="/$maxtries";
+	  } else {
+	      if (defined($Apache::inputtags::params{'maxtries'})) {
+		  $trystr.="/".$Apache::inputtags::params{'maxtries'};
+	      }
+	  }
+	  $trystr.="</td>";
       }
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
       if ($target ne 'tex') {
-        $button = '<br /><input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
+        $button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
       }
     }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
@@ -679,7 +722,7 @@ sub gradestatus {
     if ($target eq 'tex') {
       return $button.' \vskip 0 mm '.$output.' ';
     } else {
-      return $button.'<table><tr>'.$output.'</tr></table>';
+      return '<table><tr><td>'.$button.'</td>'.$output.'</tr></table>';
     }
   }
 }