Diff for /loncom/interface/lonquickgrades.pm between versions 1.6 and 1.9

version 1.6, 2002/11/22 20:39:14 version 1.9, 2002/12/06 19:29:28
Line 68  sub real_handler { Line 68  sub real_handler {
                         $ENV{"request.course.fn"}.".db",                          $ENV{"request.course.fn"}.".db",
                         $ENV{"request.course.fn"}."_parms.db", 1, 0);                          $ENV{"request.course.fn"}."_parms.db", 1, 0);
   
       if (!defined($navmap)) {
           my $requrl = $r->uri;
           $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
           return HTTP_NOT_ACCEPTABLE;
       }
   
     # Keep this hash in sync with %statusIconMap in lonnavmaps; they      # Keep this hash in sync with %statusIconMap in lonnavmaps; they
     # should match color/icon      # should match color/icon
     my $res = $navmap->firstResource(); # temp resource to access constants      my $res = $navmap->firstResource(); # temp resource to access constants
Line 82  sub real_handler { Line 88  sub real_handler {
     $r->print(&Apache::loncommon::bodytag('Quick Score Display','',      $r->print(&Apache::loncommon::bodytag('Quick Score Display','',
                                           ''));                                            ''));
   
       $r->print(<<HEADER);
   <p>This screen shows how many problems (or problem parts) you have completed, and
   how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed
   score sheet</a>.</p>
   HEADER
   
     $navmap->init();      $navmap->init();
   
     # End navmap using boilerplate      # End navmap using boilerplate
Line 107  sub real_handler { Line 119  sub real_handler {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}          if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }          if ($curRes == $iterator->END_MAP()) { $depth--; }
   
         if (ref($curRes) && $curRes->is_problem())          if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout)
         {          {
             # Get number of correct, incorrect parts              # Get number of correct, incorrect parts
             my $parts = $curRes->parts();              my $parts = $curRes->parts();
Line 147  sub real_handler { Line 159  sub real_handler {
     }      }
   
     $iterator = $navmap->getIterator(undef, undef, undef, 1);      $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $depth = 1;      $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP      $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();      $curRes = $iterator->next();
   
     my @start = (255, 255, 0);      my @start = (255, 255, 192);
     my @end   = (0, 192, 0);      my @end   = (0, 192, 0);
   
     my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';      my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
Line 229  sub mixColors { Line 241  sub mixColors {
     my $end = shift;      my $end = shift;
     my $ratio = shift;      my $ratio = shift;
           
       my ($a,$b);
     my $final = "";      my $final = "";
     my $a = $start->[0]; my $b = $end->[0];      $a = $start->[0]; $b = $end->[0];
     my $mix1 = POSIX::floor((1-$ratio)*$a + $ratio*$b);      my $mix1 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
     my $a = $start->[1]; my $b = $end->[1];      $a = $start->[1]; $b = $end->[1];
     my $mix2 = POSIX::floor((1-$ratio)*$a + $ratio*$b);      my $mix2 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
     my $a = $start->[2]; my $b = $end->[2];      $a = $start->[2]; $b = $end->[2];
     my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b);      my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
   
     my $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;      $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;
     return "#" . $final;      return "#" . $final;
 }  }
   

Removed from v.1.6  
changed lines
  Added in v.1.9


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