[BACK]Return to inputtags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.104 and 1.105

version 1.104, 2003/06/07 03:57:28 version 1.105, 2003/06/19 21:41:02
Line 324  sub decideoutput { Line 324  sub decideoutput {
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $previousmsg;    my $previousmsg;
     my $bgcolor='orange';
     my %possiblecolors =
         ( 'correct' => '#aaffaa',
    'charged_try' => '#ffaaaa',
    'not_charged_try' => '#ffffaa',
    'no_message' => '#fffff',
         );
   if ($previous) { $previousmsg='You have entered that answer before'; }    if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
Line 338  sub decideoutput { Line 344  sub decideoutput {
   }    }
   $message.=' Your receipt is '.&Apache::lonnet::receipt;    $message.=' Your receipt is '.&Apache::lonnet::receipt;
       }        }
         $bgcolor=$possiblecolors{'correct'};
       $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>";
         $bgcolor=$possiblecolors{'charged_try'};
       $button=0;        $button=0;
       $previousmsg='';        $previousmsg='';
   } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
       if ($solved =~ /^incorrect/ || $solved eq '') {        if ($solved =~ /^incorrect/ || $solved eq '') {
   $message = "Incorrect";    $message = "Incorrect";
     $bgcolor=$possiblecolors{'charged_try'};
   $button=1;    $button=1;
       } 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;
     $bgcolor=$possiblecolors{'correct'};
   $button=0;    $button=0;
   $previousmsg='';    $previousmsg='';
       }        }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
       $message = '';        $message = '';
         $bgcolor=$possiblecolors{'no_feedback'};
       $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';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button = 1;        $button = 1;
   } elsif ($award eq 'ERROR') {    } elsif ($award eq 'ERROR') {
       $message = 'An error occured while trying to grade answer.';        $message = 'An error occured while trying to grade answer.';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button = 1;        $button = 1;
   } elsif ($award eq 'TOO_LONG') {    } elsif ($award eq 'TOO_LONG') {
       $message = "The submitted answer was too long.";        $message = "The submitted answer was too long.";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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').'.';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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.';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $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');
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
       $message = "Unable to understand formula";        $message = "Unable to understand formula";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
       $message = "Incorrect";        $message = "Incorrect";
         $bgcolor=$possiblecolors{'charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
       $message = "Your submission has been recorded.";        $message = "Your submission has been recorded.";
         $bgcolor=$possiblecolors{'correct'};
       $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.";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'ASSIGNED_SCORE') {    } elsif ($award eq 'ASSIGNED_SCORE') {
       $message = "A score has been assigned.";        $message = "A score has been assigned.";
         $bgcolor=$possiblecolors{'correct'};
       $button=0;        $button=0;
   } else {    } else {
       $message = "Unknown message: $award";        $message = "Unknown message: $award";
Line 411  sub decideoutput { Line 437  sub decideoutput {
   }    }
   if (lc($Apache::lonhomework::problemstatus) eq 'no') {    if (lc($Apache::lonhomework::problemstatus) eq 'no') {
       $message = "Answer Submitted";        $message = "Answer Submitted";
         $bgcolor=$possiblecolors{'correct'};
       $button=1;        $button=1;
   }    }
   return ($button,$message,$previousmsg);    return ($button,$bgcolor,$message,$previousmsg);
 }  }
   
 sub removealldata {  sub removealldata {
Line 560  sub grade { Line 587  sub grade {
 sub gradestatus {  sub gradestatus {
   my ($id,$target) = @_;    my ($id,$target) = @_;
   my $showbutton = 1;    my $showbutton = 1;
     my $bgcolor = '';
   my $message = '';    my $message = '';
   my $latemessage = '';    my $latemessage = '';
   my $trystr='';    my $trystr='';
Line 575  sub gradestatus { Line 603  sub gradestatus {
     &Apache::lonxml::debug("Found Award |$award|$solved|");      &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message,$previousmsg) =        ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous,$target);   &decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {        if ($target eq 'tex') {
  $message=' '.$message.' ';   $message=' '.$message.' ';
       } else {        } else {
  $message="<td bgcolor=\"#aaffaa\">$message</td>";   $message="<td bgcolor=\"$bgcolor\">$message</td>";
  if ($previousmsg) {   if ($previousmsg) {
   $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";    $previousmsg="<td bgcolor=\"#aaaaff\">$previousmsg</td>";
  }   }
       }        }
     }      }
Removed from v.1.104  
changed lines
  Added in v.1.105

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