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

version 1.13, 2003/03/28 18:14:59 version 1.21, 2003/07/17 14:31:17
Line 63  sub real_handler { Line 63  sub real_handler {
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     $r->send_http_header;      $r->send_http_header;
   
       my $showPoints = 1;
       if (defined($ENV{'course.'.$ENV{'request.course.id'}.'.grading'}) &&
           $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} ne 'standard') {
           $showPoints = 0;
       }
   
     # 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"}.".db",
                         $ENV{"request.course.fn"}."_parms.db", 1, 0);                          $ENV{"request.course.fn"}."_parms.db", 1, 0, 1);
   
     if (!defined($navmap)) {      if (!defined($navmap)) {
         my $requrl = $r->uri;          my $requrl = $r->uri;
Line 79  sub real_handler { Line 85  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 ? "Quick Points Display" : "Quick Completed Problems Display";
                                           ''));      $r->print(&Apache::loncommon::bodytag($title, '', ''));
   
     $r->print(<<HEADER);      if (!$showPoints) {
           $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
       }
   
       $r->print("This may take a few moments to display.");
   
       $r->rflush();
   
     $navmap->init();      $navmap->init();
   
Line 105  HEADER Line 117  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 $now = time();
       my $topLevelParts = 0; my $topLevelRight = 0;
   
     # Pre-run: Count parts correct      # Pre-run: Count parts correct
     while ( $depth > 0 ) {      while ( $depth > 0 ) {
Line 117  HEADER Line 134  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 $stack = $iterator->getStack();              my $stack = $iterator->getStack();
                           
             for my $part (@{$parts}) {              for my $part (@{$parts}) {
                 my $status = $curRes->getCompletionStatus($part);                  if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {
                 if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE                      next;
                     || $status == $curRes->EXCUSED) {  
                     $partsRight++;  
                     $totalRight++;  
                 }  
   
                 my $dateStatus = $curRes->getDateStatus($part);  
                 if ($status != $curRes->OPEN_LATER) {  
                     $totalPossible++;  
                 }                  }
    if ($showPoints) {
       my $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->getCompletionStatus($part);
       my $thisright = 0;
       $partsCount++;
       if ($status == $curRes->CORRECT || 
    $status == $curRes->CORRECT_BY_OVERRIDE || 
    $status == $curRes->ANSWER_SUBMITTED) {
    $partsRight++;
    $totalRight++;
    $thisright = 1;
       }
       
       my $dateStatus = $curRes->getDateStatus($part);
       $totalParts++;
       if ($curRes->opendate($part) < $now) {
    $totalPossible++;
       }
    }
             }              }
               
               if ($depth == 1) { # in top-level only
    $topLevelParts += $partsCount;
    $topLevelRight += $partsRight;
       }
   
             # 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()) {
Line 144  HEADER Line 185  HEADER
                         $res->{DATA}->{CHILD_CORRECT} = 0;                          $res->{DATA}->{CHILD_CORRECT} = 0;
                     }                      }
                                           
                     $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts});                      $res->{DATA}->{CHILD_PARTS} += $partsCount;
                     $res->{DATA}->{CHILD_CORRECT} += $partsRight;                      $res->{DATA}->{CHILD_CORRECT} += $partsRight;
                 }                  }
             }              }
Line 162  HEADER Line 203  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>Folder</b></td>');
     $r->print('<td align="center">Done / Total</td><tr>' . "\n\n");      $title = $showPoints ? "Points Scored" : "Done";
       $r->print("<td align='center'>$title / 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};
   
             $unaccountedTotal -= $total;  
             $unaccountedCorrect -= $correct;  
   
             if ($total > 0) {              if ($total > 0) {
                 my $ratio;                  my $ratio;
                 $ratio = $correct / $total;                  $ratio = $correct / $total;
                 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");                  $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
             }              }
         }          }
   
Line 205  HEADER Line 235  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("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("<tr><td colspan='2' align='right'>Total $title: <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");      $title = $showPoints ? "Points" : "Parts";
       $r->print("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 277  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.21


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