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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.19 and 1.22.2.2

version 1.19, 2003/06/25 19:01:23 version 1.22.2.2, 2003/09/23 22:42:26
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';      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(
Line 84  sub real_handler { Line 85  sub real_handler {
     my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";      my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
     $r->print(&Apache::loncommon::bodytag($title, '', ''));      $r->print(&Apache::loncommon::bodytag($title, '', ''));
   
     if ($showPoints) {      if (!$showPoints) {
  $r->print(<<HEADER);          $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
     } else {  
         $r->print(<<HEADER);   
 <p>This screen shows how many points you have. You can also look at   
 <a href="/adm/studentcalc">a detailed score sheet</a>.</p>  
 HEADER  
     }      }
   
     $r->print("<p>This may take a few moments to display.</p>");      $r->print("This may take a few moments to display.");
   
     $r->rflush();      $r->rflush();
   
Line 140  HEADER Line 136  HEADER
             my $stack = $iterator->getStack();              my $stack = $iterator->getStack();
                           
             for my $part (@{$parts}) {              for my $part (@{$parts}) {
    my $completionStatus = $curRes->getCompletionStatus($part);
    my $dateStatus = $curRes->getDateStatus($part);
                   if ($completionStatus == $curRes->EXCUSED()) {
                       next;
                   }
  if ($showPoints) {   if ($showPoints) {
     my $score = $curRes->weight($part) * $curRes->awarded($part);      my $score;
       # If we're not telling status and the answer date isn't
       # passed yet
       if (($curRes->problemstatus($part) eq 'no') &&
    ($dateStatus != $curRes->ANSWER_OPEN)) {
    $score = 0;
       } else {
    $score = $curRes->weight($part) * 
       $curRes->awarded($part);
       }
   
     $partsRight += $score;      $partsRight += $score;
     $totalRight += $score;      $totalRight += $score;
     $partsCount += $curRes->weight($part);      $partsCount += $curRes->weight($part);
   
     if ($curRes->opendate($part) < $now) {      if ($curRes->opendate($part) < $now) {
  $totalPossible += $curRes->weight();   $totalPossible += $curRes->weight($part);
     }      }
     $totalParts += $curRes->weight($part);      $totalParts += $curRes->weight($part);
  } else {   } else {
     my $status = $curRes->getCompletionStatus($part);      my $status = $curRes->status($part);
     my $thisright = 0;      my $thisright = 0;
     $partsCount++;      $partsCount++;
     if ($status == $curRes->CORRECT ||       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;   $thisright = 1;
     }      }
           
     my $dateStatus = $curRes->getDateStatus($part);  
     $totalParts++;      $totalParts++;
     if ($curRes->opendate($part) < $now) {      if ($curRes->opendate($part) < $now) {
  $totalPossible++;   $totalPossible++;
Line 174  HEADER Line 182  HEADER
             if ($depth == 1) { # in top-level only              if ($depth == 1) { # in top-level only
  $topLevelParts += $partsCount;   $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 204  HEADER Line 211  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--; }
Removed from v.1.19  
changed lines
  Added in v.1.22.2.2

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