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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.8 and 1.14

version 1.8, 2002/12/02 10:14:57 version 1.14, 2003/06/13 19:11:56
Line 77  sub real_handler { Line 77  sub real_handler {
     # 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
   
     if (!defined($navmap)) {  
         my $requrl = $r->uri;  
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";  
         return HTTP_NOT_ACCEPTABLE;  
     }  
     
     # Header      # Header
     $r->print(&Apache::loncommon::bodytag('Quick Score Display','',      $r->print(&Apache::loncommon::bodytag('Quick Score Display','',
Line 113  HEADER Line 107  HEADER
     #  the counts to the parent map.)      #  the counts to the parent map.)
   
     my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;      my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
       my $now = time();
   
     # Pre-run: Count parts correct      # Pre-run: Count parts correct
     while ( $depth > 0 ) {      while ( $depth > 0 ) {
Line 123  HEADER Line 118  HEADER
         {          {
             # Get number of correct, incorrect parts              # Get number of correct, incorrect parts
             my $parts = $curRes->parts();              my $parts = $curRes->parts();
             if (scalar(@{$parts}) > 1) { shift @{$parts}; } # lose the first "0"              $totalParts += $curRes->countParts();
             $totalParts += scalar(@{$parts});  
             my $partsRight = 0;              my $partsRight = 0;
             my $stack = $iterator->getStack();              my $stack = $iterator->getStack();
                           
             for my $part (@{$parts}) {              for my $part (@{$parts}) {
                 my $status = $curRes->getCompletionStatus($part);                  my $status = $curRes->getCompletionStatus($part);
                   my $thisright = 0;
                 if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE                  if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE
                     || $status == $curRes->EXCUSED) {                      || $status == $curRes->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) {
                     $partsRight++;                      $partsRight++;
                     $totalRight++;                      $totalRight++;
                       $thisright = 1;
                 }                  }
   
                 my $dateStatus = $curRes->getDateStatus($part);                  my $dateStatus = $curRes->getDateStatus($part);
                 if ($status != $curRes->OPEN_LATER) {                  if ($curRes->opendate($part) < $now) {
                     $totalPossible++;                      $totalPossible++;
                 }                  }
             }              }
Line 159  HEADER Line 155  HEADER
     }      }
   
     $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, 192);      my @start = (255, 255, 192);
     my @end   = (0, 192, 0);      my @end   = (0, 192, 0);
Line 173  HEADER Line 169  HEADER
   
     # Second pass: Print the maps.      # Second pass: Print the maps.
     $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Sequence</b></td>');      $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Sequence</b></td>');
     $r->print('<td align="center">Correct / Total</td><tr>' . "\n\n");      $r->print('<td align="center">Done / Total</td><tr>' . "\n\n");
     while ($depth > 0) {      while ($depth > 0) {
         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_map()) {          if (ref($curRes) && $curRes->is_map()) {
             my $stack = $iterator->getStack();  
             my $src = Apache::lonnavmaps::getLinkForResource($stack);  
             my $srcHasQuestion = $src =~ /\?/;  
             my $link = $src.  
                 ($srcHasQuestion?'&':'?') .  
                 'symb='.&Apache::lonnet::escape($curRes->symb()).  
                 '"';  
             my $title = $curRes->compTitle();              my $title = $curRes->compTitle();
                           
             my $correct = $curRes->{DATA}->{CHILD_CORRECT};              my $correct = $curRes->{DATA}->{CHILD_CORRECT};
Line 202  HEADER Line 191  HEADER
                                   
                 for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); }                  for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); }
                                   
                 $r->print("<a href='$link'>$title</a></td>");                  $r->print("$title</td>");
                 $r->print("<td align='center'>$correct / $total</td></tr>\n");                  $r->print("<td align='center'>$correct / $total</td></tr>\n");
             }              }
         }          }
Line 215  HEADER Line 204  HEADER
         my $ratio = $unaccountedCorrect / $unaccountedTotal;          my $ratio = $unaccountedCorrect / $unaccountedTotal;
         my $color = mixColors(\@start, \@end, $ratio);          my $color = mixColors(\@start, \@end, $ratio);
         $r->print("<tr><td bgcolor='$color'>");          $r->print("<tr><td bgcolor='$color'>");
         $r->print("Problems Not Contained In Sequences</td><td align='center'>");          $r->print("Problems Not Contained In A Folder</td><td align='center'>");
         $r->print("$unaccountedCorrect / $unaccountedTotal</td></tr>");          $r->print("$unaccountedCorrect / $unaccountedTotal</td></tr>");
     }      }
   
     my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");      my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
   
     $r->print("<tr><td colspan='2' align='right'>Total Parts Correct: <b>$totalRight</b><br>");      $r->print("<tr><td colspan='2' align='right'>Total Parts Done: <b>$totalRight</b><br>");
     $r->print("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");      $r->print("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");
     $r->print("Total Parts In Course: <b>$totalParts</b></td></tr>\n\n");      $r->print("Total Parts In Course: <b>$totalParts</b></td></tr>\n\n");
   
Line 241  sub mixColors { Line 230  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.8  
changed lines
  Added in v.1.14

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