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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.32 and 1.41

version 1.32, 2004/10/07 22:12:47 version 1.41, 2007/12/20 10:18:19
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 =       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 85  sub real_handler { Line 82  sub real_handler {
     
     # Header      # Header
     my $title = $showPoints ? "Points Display" : "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 && !$notshowSPRSlink ) {      if (!$showPoints && !$notshowSPRSlink ) {
         $r->print(<<HEADER);           $r->print(<<HEADER); 
Line 95  score sheet</a>.</p> Line 92  score sheet</a>.</p>
 HEADER  HEADER
     }      }
   
     $r->print("This may take a few moments to display.");      $r->print(&mt('This may take a few moments to display.'));
   
     $r->rflush();      $r->rflush();
   
Line 156  HEADER Line 153  HEADER
     $totalAttempted += $partsAttempted;      $totalAttempted += $partsAttempted;
  }   }
     } else {      } else {
  $score = $curRes->weight($part) * $curRes->awarded($part);   $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
     }      }
     $partsRight += $score;      $partsRight += $score;
     $totalRight += $score;      $totalRight += $score;
Line 170  HEADER Line 167  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 ) {   $status == $curRes->PARTIALLY_CORRECT ) {
  $partsRight++;   $partsRight++;
  $totalRight++;   $totalRight++;
  $thisright = 1;   $thisright = 1;
Line 274  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>");  
     $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";
    my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
    $r->print("<tr><td colspan='2' align='right'>$totaltitle: <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>".&Apache::loncommon::end_page());
   
     return OK;      return OK;
 }  }
Removed from v.1.32  
changed lines
  Added in v.1.41

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