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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.26 and 1.40

version 1.26, 2003/09/22 20:05:20 version 1.40, 2006/03/15 22:11:04
Line 34  use Apache::Constants qw(:common :http); Line 34  use Apache::Constants qw(:common :http);
 use POSIX;  use POSIX;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   use Apache::grades;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 46  sub real_handler { Line 48  sub real_handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});      &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
   
     # Handle header-only request      # Handle header-only request
       if ($env{'browser.mathml'}) {
    &Apache::loncommon::content_type($r,'text/xml');
       } else {
    &Apache::loncommon::content_type($r,'text/html');
       }
     if ($r->header_only) {      if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {   $r->send_http_header;
             &Apache::loncommon::content_type($r,'text/xml');  
         } else {  
             &Apache::loncommon::content_type($r,'text/html');  
         }  
         $r->send_http_header;  
         return OK;          return OK;
     }      }
   
     # Send header, don't cache this page      # Send header, don't cache this page
     if ($ENV{'browser.mathml'}) {  
         &Apache::loncommon::content_type($r,'text/xml');  
     } else {  
         &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 =       my $showPoints = 
         $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';          $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();
   
     if (!defined($navmap)) {      if (!defined($navmap)) {
         my $requrl = $r->uri;          my $requrl = $r->uri;
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";          $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      }
   
Line 82  sub real_handler { Line 81  sub real_handler {
     my $res = $navmap->firstResource(); # temp resource to access constants      my $res = $navmap->firstResource(); # temp resource to access constants
     
     # Header      # Header
     my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";      my $title = $showPoints ? "Points Display" : "Completed Problems Display";
     $r->print(&Apache::loncommon::bodytag($title, '', ''));      $r->print(&Apache::loncommon::start_page($title));
   
     if (!$showPoints) {      if (!$showPoints && !$notshowSPRSlink ) {
         $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
Line 117  HEADER Line 116  HEADER
     #  equally for both cases.      #  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 $now = time();
     my $topLevelParts = 0; my $topLevelRight = 0;      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 131  HEADER Line 131  HEADER
             my $parts = $curRes->parts();              my $parts = $curRes->parts();
             my $partsRight = 0;              my $partsRight = 0;
     my $partsCount = 0;      my $partsCount = 0;
       my $partsAttempted = 0;
             my $stack = $iterator->getStack();              my $stack = $iterator->getStack();
                           
             for my $part (@{$parts}) {              for my $part (@{$parts}) {
                 if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {   my $completionStatus = $curRes->getCompletionStatus($part);
    my $dateStatus = $curRes->getDateStatus($part);
   
                   if ($completionStatus == $curRes->EXCUSED()) {
                     next;                      next;
                 }                  }
  if ($showPoints) {   if ($showPoints) {
     my $score = $curRes->weight($part) * $curRes->awarded($part);      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 = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
       }
     $partsRight += $score;      $partsRight += $score;
     $totalRight += $score;      $totalRight += $score;
     $partsCount += $curRes->weight($part);      $partsCount += $curRes->weight($part);
Line 148  HEADER Line 164  HEADER
     }      }
     $totalParts += $curRes->weight($part);      $totalParts += $curRes->weight($part);
  } else {   } else {
     my $status = $curRes->getCompletionStatus($part);      my $status = $curRes->simpleStatus($part);
     my $thisright = 0;      my $thisright = 0;
     $partsCount++;      $partsCount++;
     if ($status == $curRes->CORRECT ||       if ($status == $curRes->CORRECT ||
  $status == $curRes->CORRECT_BY_OVERRIDE ||    $status == $curRes->PARTIALLY_CORRECT ) {
  $status == $curRes->ANSWER_SUBMITTED) {  
  $partsRight++;   $partsRight++;
  $totalRight++;   $totalRight++;
  $thisright = 1;   $thisright = 1;
     }      }
   
       if ($status == $curRes->ATTEMPTED) {
    $partsAttempted++;
    $totalAttempted++;
       }
           
     my $dateStatus = $curRes->getDateStatus($part);      my $dateStatus = $curRes->getDateStatus($part);
     $totalParts++;      $totalParts++;
Line 170  HEADER Line 190  HEADER
             if ($depth == 1) { # in top-level only              if ($depth == 1) { # in top-level only
  $topLevelParts += $partsCount;   $topLevelParts += $partsCount;
  $topLevelRight += $partsRight;   $topLevelRight += $partsRight;
    $topLevelAttempted += $partsAttempted;
     }      }
   
             # Crawl down stack and record parts correct and total              # Crawl down stack and record parts correct and total
Line 178  HEADER Line 199  HEADER
                     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} += $partsCount;                      $res->{DATA}->{CHILD_PARTS} += $partsCount;
                     $res->{DATA}->{CHILD_CORRECT} += $partsRight;                      $res->{DATA}->{CHILD_CORRECT} += $partsRight;
       $res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted;
                 }                  }
             }              }
         }          }
Line 199  HEADER Line 222  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>Folder</b></td>');      $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>' .
     $title =&mt($showPoints ? "Points Scored" : "Done");        &mt('Folder') . '</b></td>');
     $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");      $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--; }
Line 211  HEADER Line 239  HEADER
                           
             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};
   
             if ($total > 0) {              if ($total > 0) {
                 my $ratio;                  my $ratio;
Line 222  HEADER Line 251  HEADER
                 for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }                  for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
                                   
                 $r->print("$thisIndent$title</td>");                  $r->print("$thisIndent$title</td>");
                 $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></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 238  HEADER Line 271  HEADER
         $r->print("$topLevelRight / $topLevelParts</td></tr>");          $r->print("$topLevelRight / $topLevelParts</td></tr>");
     }      }
   
     my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");      if ($showPoints) {
    my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
     $title = $showPoints ? "Points" : "Parts Done";  
   
     $r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");   $title = $showPoints ? "Points" : "Parts Done";
     $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");  
     $title = $showPoints ? "Points" : "Parts";   $r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
     $r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");   $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>");      }
   
     $navmap->untieHashes();      $r->print("</table>".&Apache::loncommon::end_page());
   
     return OK;      return OK;
 }  }
Removed from v.1.26  
changed lines
  Added in v.1.40

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