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

Diff for /loncom/homework/inputtags.pm between versions 1.109 and 1.114.2.1

version 1.109, 2003/07/15 21:26:23 version 1.114.2.1, 2003/09/23 01:52:57
Line 346  sub decideoutput { Line 346  sub decideoutput {
           unless ($ENV{'course.'.            unless ($ENV{'course.'.
    $ENV{'request.course.id'}.     $ENV{'request.course.id'}.
    '.disable_receipt_display'} eq 'yes') {      '.disable_receipt_display'} eq 'yes') { 
       $message.='<br />Your receipt is '.&Apache::lonnet::receipt().        $message.=(($target eq 'web')?'<br />':' ').
   &Apache::loncommon::help_open_topic('Receipt');    'Your receipt is '.&Apache::lonnet::receipt().
          (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
   }    }
       }        }
       $bgcolor=$possiblecolors{'correct'};        $bgcolor=$possiblecolors{'correct'};
       $button=0;        $button=0;
       $previousmsg='';        $previousmsg='';
   } elsif ($solved =~ /^excused/) {    } elsif ($solved =~ /^excused/) {
       $message = "<b>You are excused from the problem.</b>";        if ($target eq 'tex') {
     $message = ' \textbf{You are excused from the problem.} ';
         } else {
     $message = "<b>You are excused from the problem.</b>";
         }
       $bgcolor=$possiblecolors{'charged_try'};        $bgcolor=$possiblecolors{'charged_try'};
       $button=0;        $button=0;
       $previousmsg='';        $previousmsg='';
Line 368  sub decideoutput { Line 373  sub decideoutput {
           unless ($ENV{'course.'.            unless ($ENV{'course.'.
    $ENV{'request.course.id'}.     $ENV{'request.course.id'}.
    '.disable_receipt_display'} eq 'yes') {      '.disable_receipt_display'} eq 'yes') { 
               $message.='<br />Your receipt is '.&Apache::lonnet::receipt().        $message.=(($target eq 'web')?'<br />':' ').
   &Apache::loncommon::help_open_topic('Receipt');    'Your receipt is '.&Apache::lonnet::receipt().
          (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
   }    }
   $bgcolor=$possiblecolors{'correct'};    $bgcolor=$possiblecolors{'correct'};
   $button=0;    $button=0;
Line 396  sub decideoutput { Line 402  sub decideoutput {
       $bgcolor=$possiblecolors{'not_charged_try'};        $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';
   &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';        if ($target ne 'tex') {
     $message.=', please refer to '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
         }
       $bgcolor=$possiblecolors{'not_charged_try'};        $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'INVALID_FILETYPE') {    } elsif ($award eq 'INVALID_FILETYPE') {
Line 409  sub decideoutput { Line 417  sub decideoutput {
       $bgcolor=$possiblecolors{'not_charged_try'};        $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";        if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s";
       $bgcolor=$possiblecolors{'not_charged_try'};        $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {    } elsif ($award eq 'UNIT_NOTNEEDED') {
Line 418  sub decideoutput { Line 426  sub decideoutput {
       $bgcolor=$possiblecolors{'not_charged_try'};        $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');        if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
       $bgcolor=$possiblecolors{'not_charged_try'};        $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
Line 446  sub decideoutput { Line 454  sub decideoutput {
       $message = "Unknown message: $award";        $message = "Unknown message: $award";
       $button=1;        $button=1;
   }    }
   if (lc($Apache::lonhomework::problemstatus) eq 'no') {    if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
         $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
       $message = "Answer Submitted";        $message = "Answer Submitted";
       $bgcolor=$possiblecolors{'correct'};        $bgcolor=$possiblecolors{'correct'};
       $button=1;        $button=1;
Line 612  sub gradestatus { Line 621  sub gradestatus {
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};      my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
     my $previous = $Apache::lonhomework::history{"resource.$id.previous"};      my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
     &Apache::lonxml::debug("Found Award |$award|$solved|");      &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {      if ( $award ne '' || $solved ne '') {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$bgcolor,$message,$previousmsg) =        ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous,$target);   &decideoutput($award,$solved,$previous,$target);
Removed from v.1.109  
changed lines
  Added in v.1.114.2.1

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