--- loncom/homework/inputtags.pm	2003/09/17 21:29:44	1.116
+++ loncom/homework/inputtags.pm	2004/02/06 22:39:56	1.124.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.116 2003/09/17 21:29:44 www Exp $
+# $Id: inputtags.pm,v 1.124.2.1 2004/02/06 22:39:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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 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);
@@ -414,7 +437,7 @@ sub decideoutput {
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-      $message = &mt("Please adjust significant figures.");# you provided %s significant figures";
+      $message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures";
       $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;
   } elsif ($award eq 'UNIT_FAIL') {
@@ -455,7 +478,8 @@ sub decideoutput {
       $message = &mt("Unknown message").": $award";
       $button=1;
   }
-  if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+  if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
+      $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
       $message = &mt("Answer Submitted");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
@@ -476,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 '';
@@ -517,6 +542,9 @@ sub setgradedata {
     } elsif ( $award eq 'INCORRECT' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
+      }
       $Apache::lonhomework::results{"resource.$id.solved"} =
 	'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {
@@ -536,24 +564,32 @@ sub setgradedata {
       if (lc($Apache::lonhomework::problemstatus) eq 'no') {
 	  $Apache::lonhomework::results{"resource.$id.tries"} =
 	      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+	  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
       }
     }
 
-    # 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/ ) {
@@ -616,7 +652,8 @@ sub gradestatus {
 
   my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");
-  if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') {  
+  if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&
+       $status ne 'INVALID_ACCESS') {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
     my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
@@ -637,6 +674,8 @@ 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'; }