Diff for /loncom/interface/lonquickgrades.pm between versions 1.16 and 1.22.2.1

version 1.16, 2003/06/23 20:01:20 version 1.22.2.1, 2003/09/23 01:52:57
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 = 
           $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
   
     # 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 82  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 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 $now = time();      my $now = time();
Line 119  HEADER Line 131  HEADER
         {          {
             # Get number of correct, incorrect parts              # Get number of correct, incorrect parts
             my $parts = $curRes->parts();              my $parts = $curRes->parts();
             $totalParts += $curRes->countParts();  
             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()) {
                 my $thisright = 0;                      next;
                 if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE  
                     || $status == $curRes->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) {  
                     $partsRight++;  
                     $totalRight++;  
                     $thisright = 1;  
                 }  
   
                 my $dateStatus = $curRes->getDateStatus($part);  
                 if ($curRes->opendate($part) < $now) {  
                     $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->status($part);
       my $thisright = 0;
       $partsCount++;
       if ($status == $curRes->CORRECT || 
    $status == $curRes->EXCUSED) {
    $partsRight++;
    $totalRight++;
    $thisright = 1;
       }
       
       my $dateStatus = $curRes->getDateStatus($part);
       $totalParts++;
       if ($curRes->opendate($part) < $now) {
    $totalPossible++;
       }
    }
             }              }
   
             if ($depth == 1) { # in top-level only              if ($depth == 1) { # in top-level only
  $topLevelParts += scalar(@{$parts});   $topLevelParts += $partsCount;
  $topLevelRight += $partsRight;   $topLevelRight += $partsRight;
  $r->print($curRes->compTitle() . '<br>');  
     }      }
   
             # Crawl down stack and record parts correct and total              # Crawl down stack and record parts correct and total
Line 153  HEADER Line 181  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 172  HEADER Line 200  HEADER
     my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';      my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
   
     # 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--; }
Line 212  HEADER Line 241  HEADER
   
     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>");

Removed from v.1.16  
changed lines
  Added in v.1.22.2.1


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