Diff for /loncom/homework/inputtags.pm between versions 1.90 and 1.91

version 1.90, 2003/04/08 13:46:30 version 1.91, 2003/04/08 15:18:45
Line 264  sub decideoutput { Line 264  sub decideoutput {
   my $button=0;    my $button=0;
   my $previousmsg;    my $previousmsg;
   
  if (lc $Apache::lonhomework::problemstatus eq 'yes') {  
   
   if ($previous) { $previousmsg='You have entered that answer before'; }    if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
     if ($target eq 'tex') {        if ($target eq 'tex') {
       $message = '\textbf{You are correct}. Your receipt is '.    $message = '\textbf{You are correct}. Your receipt is '.
       &Apache::lonnet::receipt;             &Apache::lonnet::receipt;
     } else {        } else {
       $message = "<b>You are correct.</b> Your receipt is ".    $message = "<b>You are correct.</b> Your receipt is ".
       &Apache::lonnet::receipt;     &Apache::lonnet::receipt;
     }        }
     $button=0;        $button=0;
     $previousmsg='';        $previousmsg='';
   } elsif ($solved =~ /^excused/) {    } elsif ($solved =~ /^excused/) {
     $message = "<b>You are excused from the problem.</b>";        $message = "<b>You are excused from the problem.</b>";
     $button=0;  
     $previousmsg='';  
   } 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;        $button=0;
       $previousmsg='';        $previousmsg='';
     }    } 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;
     $previousmsg='';
         }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';        $message = '';
     $button=1;        $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {    } elsif ($award eq 'MISSING_ANSWER') {
     $message = 'Some parts were not submitted';        $message = 'Some parts were not submitted';
     $button = 1;        $button = 1;
   } elsif ($award eq 'WANTED_NUMERIC') {    } elsif ($award eq 'WANTED_NUMERIC') {
     $message = "This question expects a numeric answer";        $message = "This question expects a numeric answer";
     $button=1;        $button=1;
   } elsif ($award eq 'MISORDERED_RANK') {    } elsif ($award eq 'MISORDERED_RANK') {
     $message = 'You have provided an invalid ranking, please refer to '.        $message = 'You have provided an invalid ranking, please refer to '.
      &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';         &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
     $button=1;        $button=1;
   } elsif ($award eq 'INVALID_FILETYPE') {    } elsif ($award eq 'INVALID_FILETYPE') {
     $message = 'The filetype extension of the file you uploaded is not allowed.';        $message = 'The filetype extension of the file you uploaded is not allowed.';
     $button=1;        $button=1;
   } elsif ($award eq 'SIG_FAIL') {    } elsif ($award eq 'SIG_FAIL') {
     $message = "Please adjust significant figures.";# you provided %s significant figures";        $message = "Please adjust significant figures.";# you provided %s significant figures";
     $button=1;        $button=1;
   } elsif ($award eq 'UNIT_FAIL') {    } elsif ($award eq 'UNIT_FAIL') {
     $message = "Units incorrect. ".        $message = "Units incorrect. ".
        &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";         &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
     $button=1;        $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {    } elsif ($award eq 'UNIT_NOTNEEDED') {
     $message = "Only a number required.";# Computer reads units of %s";        $message = "Only a number required.";# Computer reads units of %s";
     $button=1;        $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
     $message = "Units required".        $message = "Units required".
        &Apache::loncommon::help_open_topic('Physical_Units');         &Apache::loncommon::help_open_topic('Physical_Units');
     $button=1;        $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";        $message = "Unable to understand formula";
     $button=1;        $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";        $message = "Incorrect";
     $button=1;        $button=1;
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";        $message = "Your submission has been recorded.";
     $button=1;        $button=1;
   } elsif ($award eq 'DRAFT') {    } elsif ($award eq 'DRAFT') {
     $message = "A draft copy has been saved.";        $message = "A draft copy has been saved.";
     $button=1;        $button=1;
   } else {    } else {
     $message = "Unknown message: $award";        $message = "Unknown message: $award";
     $button=1;        $button=1;
     } 
     if (lc($Apache::lonhomework::problemstatus) ne 'yes') {
         $message = "Answer Submitted";
         $button=1;
   }    }
  } elsif ($Apache::lonhomework::type eq 'exam') {  
      $message = "Answer Submitted";  
      $button=1;  
  }  
   return ($button,$message,$previousmsg);    return ($button,$message,$previousmsg);
 }  }
   

Removed from v.1.90  
changed lines
  Added in v.1.91


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>