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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.30 and 1.36

version 1.30, 2003/11/21 18:21:02 version 1.36, 2005/04/07 06:56:23
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;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 47  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'}) {
             &Apache::loncommon::content_type($r,'text/xml');              &Apache::loncommon::content_type($r,'text/xml');
         } else {          } else {
             &Apache::loncommon::content_type($r,'text/html');              &Apache::loncommon::content_type($r,'text/html');
Line 57  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'}) {
         &Apache::loncommon::content_type($r, 'text/xml');          &Apache::loncommon::content_type($r, 'text/xml');
     } else {      } else {
         &Apache::loncommon::content_type($r, 'text/html');          &Apache::loncommon::content_type($r, 'text/html');
Line 66  sub real_handler { Line 67  sub real_handler {
     $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 =       my $notshowSPRSlink = 
         $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'external';          $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 150  HEADER Line 151  HEADER
     # it's an "attempted" point      # it's an "attempted" point
     if ($curRes->problemstatus($part) eq 'no' &&      if ($curRes->problemstatus($part) eq 'no' &&
  ($dateStatus != $curRes->ANSWER_OPEN)) {   ($dateStatus != $curRes->ANSWER_OPEN)) {
  $partsAttempted += $curRes->weight($part);   my $status = $curRes->simpleStatus($part);
  $totalAttempted += $partsAttempted;   if ($status == $curRes->ATTEMPTED) {
       $partsAttempted += $curRes->weight($part);
       $totalAttempted += $partsAttempted;
    }
     } else {      } else {
  $score = $curRes->weight($part) * $curRes->awarded($part);   $score = $curRes->weight($part) * $curRes->awarded($part);
     }      }
Line 167  HEADER Line 171  HEADER
     my $status = $curRes->simpleStatus($part);      my $status = $curRes->simpleStatus($part);
     my $thisright = 0;      my $thisright = 0;
     $partsCount++;      $partsCount++;
     if ($status == $curRes->CORRECT ||       if ($status == $curRes->CORRECT ) {
  $status == $curRes->INCORRECT ) {  
  $partsRight++;   $partsRight++;
  $totalRight++;   $totalRight++;
  $thisright = 1;   $thisright = 1;
Line 271  HEADER Line 274  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>");  
     $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");  
   
    $title = $showPoints ? "Points" : "Parts Done";
   
    $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>");
   
     $navmap->untieHashes();  
   
     return OK;      return OK;
 }  }
   
Removed from v.1.30  
changed lines
  Added in v.1.36

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