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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.37 and 1.42

version 1.37, 2005/12/20 15:02:13 version 1.42, 2008/08/17 23:25:40
Line 35  use POSIX; Line 35  use POSIX;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::grades;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 47  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;
   
Line 86  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 96  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 149  HEADER Line 145  HEADER
     my $score = 0;      my $score = 0;
     # If we're not telling status and the answer date isn't passed yet,       # If we're not telling status and the answer date isn't passed yet, 
     # it's an "attempted" point      # it's an "attempted" point
     if ($curRes->problemstatus($part) eq 'no' &&      if ((($curRes->problemstatus($part) eq 'no') ||
                           ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
  ($dateStatus != $curRes->ANSWER_OPEN)) {   ($dateStatus != $curRes->ANSWER_OPEN)) {
  my $status = $curRes->simpleStatus($part);   my $status = $curRes->simpleStatus($part);
  if ($status == $curRes->ATTEMPTED) {   if ($status == $curRes->ATTEMPTED) {
Line 157  HEADER Line 154  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 279  HEADER Line 276  HEADER
  my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");   my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
   
  $title = $showPoints ? "Points" : "Parts Done";   $title = $showPoints ? "Points" : "Parts Done";
    my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
  $r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");   $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>");   $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");
  $title = $showPoints ? "Points" : "Parts";   $title = $showPoints ? "Points" : "Parts";
  $r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");   $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.37  
changed lines
  Added in v.1.42

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