Diff for /loncom/interface/lonquickgrades.pm between versions 1.13 and 1.31

version 1.13, 2003/03/28 18:14:59 version 1.31, 2004/07/15 19:20:41
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Quick Student Grades Display  # Quick Student Grades Display
 #  #
 #   # $Id$
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
Line 32  package Apache::lonquickgrades; Line 32  package Apache::lonquickgrades;
 use strict;  use strict;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use POSIX;  use POSIX;
   use Apache::loncommon;
   use Apache::lonlocal;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 46  sub real_handler { Line 48  sub real_handler {
     # Handle header-only request      # Handle header-only request
     if ($r->header_only) {      if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {          if ($ENV{'browser.mathml'}) {
             $r->content_type('text/xml');              &Apache::loncommon::content_type($r,'text/xml');
         } else {          } else {
             $r->content_type('text/html');              &Apache::loncommon::content_type($r,'text/html');
         }          }
         $r->send_http_header;          $r->send_http_header;
         return OK;          return OK;
Line 56  sub real_handler { Line 58  sub real_handler {
   
     # Send header, don't cache this page      # Send header, don't cache this page
     if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
         $r->content_type('text/xml');          &Apache::loncommon::content_type($r, 'text/xml');
     } else {      } else {
         $r->content_type('text/html');          &Apache::loncommon::content_type($r, 'text/html');
     }      }
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     $r->send_http_header;      $r->send_http_header;
   
       my $showPoints = 
           $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
       my $notshowSPRSlink = 
           $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'external';
   
     # Create the nav map      # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(      my $navmap = Apache::lonnavmaps::navmap->new();
                         $ENV{"request.course.fn"}.".db",  
                         $ENV{"request.course.fn"}."_parms.db", 1, 0);  
   
     if (!defined($navmap)) {      if (!defined($navmap)) {
         my $requrl = $r->uri;          my $requrl = $r->uri;
Line 79  sub real_handler { Line 84  sub real_handler {
     my $res = $navmap->firstResource(); # temp resource to access constants      my $res = $navmap->firstResource(); # temp resource to access constants
     
     # Header      # Header
     $r->print(&Apache::loncommon::bodytag('Quick Score Display','',      my $title = $showPoints ? "Points Display" : "Completed Problems Display";
                                           ''));      $r->print(&Apache::loncommon::bodytag($title, '', ''));
   
     $r->print(<<HEADER);      if (!$showPoints && !$notshowSPRSlink ) {
           $r->print(<<HEADER); 
 <p>This screen shows how many problems (or problem parts) you have completed, and  <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  how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed
 score sheet</a>.</p>  score sheet</a>.</p>
 HEADER  HEADER
       }
   
     $navmap->init();      $r->print("This may take a few moments to display.");
   
       $r->rflush();
   
     # End navmap using boilerplate      # End navmap using boilerplate
   
Line 105  HEADER Line 114  HEADER
     # maps in order, with their data.       # maps in order, with their data. 
     # (If in the future people decide not to be cumulative, only add      # (If in the future people decide not to be cumulative, only add
     #  the counts to the parent map.)      #  the counts to the parent map.)
       # For convenience, "totalParts" is also "totalPoints" when we're looking
       #  at points; I can't come up with a variable name that makes sense
       #  equally for both cases.
   
     my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;      my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
       my $totalAttempted = 0;
       my $now = time();
       my $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0;
   
     # Pre-run: Count parts correct      # Pre-run: Count parts correct
     while ( $depth > 0 ) {      while ( $depth > 0 ) {
Line 117  HEADER Line 132  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 += scalar(@{$parts});  
             my $partsRight = 0;              my $partsRight = 0;
       my $partsCount = 0;
       my $partsAttempted = 0;
             my $stack = $iterator->getStack();              my $stack = $iterator->getStack();
                           
             for my $part (@{$parts}) {              for my $part (@{$parts}) {
                 my $status = $curRes->getCompletionStatus($part);   my $completionStatus = $curRes->getCompletionStatus($part);
                 if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE   my $dateStatus = $curRes->getDateStatus($part);
                     || $status == $curRes->EXCUSED) {  
                     $partsRight++;                  if ($completionStatus == $curRes->EXCUSED()) {
                     $totalRight++;                      next;
                 }  
   
                 my $dateStatus = $curRes->getDateStatus($part);  
                 if ($status != $curRes->OPEN_LATER) {  
                     $totalPossible++;  
                 }                  }
    if ($showPoints) {
       my $score = 0;
       # If we're not telling status and the answer date isn't passed yet, 
       # it's an "attempted" point
       if ($curRes->problemstatus($part) eq 'no' &&
    ($dateStatus != $curRes->ANSWER_OPEN)) {
    my $status = $curRes->simpleStatus($part);
    if ($status == $curRes->ATTEMPTED) {
       $partsAttempted += $curRes->weight($part);
       $totalAttempted += $partsAttempted;
    }
       } else {
    $score = $curRes->weight($part) * $curRes->awarded($part);
       }
       $partsRight += $score;
       $totalRight += $score;
       $partsCount += $curRes->weight($part);
   
       if ($curRes->opendate($part) < $now) {
    $totalPossible += $curRes->weight($part);
       }
       $totalParts += $curRes->weight($part);
    } else {
       my $status = $curRes->simpleStatus($part);
       my $thisright = 0;
       $partsCount++;
       if ($status == $curRes->CORRECT || 
    $status == $curRes->INCORRECT ) {
    $partsRight++;
    $totalRight++;
    $thisright = 1;
       }
   
       if ($status == $curRes->ATTEMPTED) {
    $partsAttempted++;
    $totalAttempted++;
       }
       
       my $dateStatus = $curRes->getDateStatus($part);
       $totalParts++;
       if ($curRes->opendate($part) < $now) {
    $totalPossible++;
       }
    }
             }              }
               
               if ($depth == 1) { # in top-level only
    $topLevelParts += $partsCount;
    $topLevelRight += $partsRight;
    $topLevelAttempted += $partsAttempted;
       }
   
             # Crawl down stack and record parts correct and total              # Crawl down stack and record parts correct and total
             for my $res (@{$stack}) {              for my $res (@{$stack}) {
                 if (ref($res) && $res->is_map()) {                  if (ref($res) && $res->is_map()) {
                     if (!defined($res->{DATA}->{CHILD_PARTS})) {                      if (!defined($res->{DATA}->{CHILD_PARTS})) {
                         $res->{DATA}->{CHILD_PARTS} = 0;                          $res->{DATA}->{CHILD_PARTS} = 0;
                         $res->{DATA}->{CHILD_CORRECT} = 0;                          $res->{DATA}->{CHILD_CORRECT} = 0;
    $res->{DATA}->{CHILD_ATTEMPTED} = 0;
                     }                      }
                                           
                     $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts});                      $res->{DATA}->{CHILD_PARTS} += $partsCount;
                     $res->{DATA}->{CHILD_CORRECT} += $partsRight;                      $res->{DATA}->{CHILD_CORRECT} += $partsRight;
       $res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted;
                 }                  }
             }              }
         }          }
Line 162  HEADER Line 224  HEADER
   
     my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';      my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
   
     my $unaccountedTotal = $totalParts;  
     my $unaccountedCorrect = $totalRight;  
   
     # 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>' .
     $r->print('<td align="center">Done / Total</td><tr>' . "\n\n");        &mt('Folder') . '</b></td>');
       $title = &mt($showPoints ? "Points Scored" : "Done");
       if ($totalAttempted) {
    $title .= " / " . &mt("Attempted");
       }
       $r->print("<td align='center'>$title / "
         . &mt('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};
             my $total = $curRes->{DATA}->{CHILD_PARTS};              my $total = $curRes->{DATA}->{CHILD_PARTS};
       my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED};
             $unaccountedTotal -= $total;  
             $unaccountedCorrect -= $correct;  
   
             if ($total > 0) {              if ($total > 0) {
                 my $ratio;                  my $ratio;
Line 194  HEADER Line 250  HEADER
                 my $color = mixColors(\@start, \@end, $ratio);                  my $color = mixColors(\@start, \@end, $ratio);
                 $r->print("<tr><td bgcolor='$color'>");                  $r->print("<tr><td bgcolor='$color'>");
                                   
                 for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); }   my $thisIndent = '';
                   for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
                                   
                 $r->print("<a href='$link'>$title</a></td>");                  $r->print("$thisIndent$title</td>");
                 $r->print("<td align='center'>$correct / $total</td></tr>\n");   if ($totalAttempted) {
       $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");
    } else {
       $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
    }
             }              }
         }          }
   
Line 205  HEADER Line 266  HEADER
     }      }
   
     # If there were any problems at the top level, print an extra "catchall"      # If there were any problems at the top level, print an extra "catchall"
     if ($unaccountedTotal > 0) {      if ($topLevelParts > 0) {
         my $ratio = $unaccountedCorrect / $unaccountedTotal;          my $ratio = $topLevelRight / $topLevelParts;
         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(&mt("Problems Not Contained In A Folder")."</td><td>");
         $r->print("$unaccountedCorrect / $unaccountedTotal</td></tr>");          $r->print("$topLevelRight / $topLevelParts</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 Done: <b>$totalRight</b><br>");      $title = $showPoints ? "Points" : "Parts Done";
     $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("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
       $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");
       $title = $showPoints ? "Points" : "Parts";
       $r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");
   
   
     $r->print("</table></body></html>");      $r->print("</table></body></html>");
Line 244  sub mixColors { Line 308  sub mixColors {
     $a = $start->[2]; $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);
   
     $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;      $final = sprintf "%02x%02x%02x", $mix1, $mix2, $mix3;
     return "#" . $final;      return "#" . $final;
 }  }
   

Removed from v.1.13  
changed lines
  Added in v.1.31


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