Diff for /loncom/interface/lonquickgrades.pm between versions 1.22.2.1 and 1.55

version 1.22.2.1, 2003/09/23 01:52:57 version 1.55, 2010/12/03 21:33:52
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Quick Student Grades Display  # Quick Student Grades Display
 #  #
 #   # $Id$
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # Created Nov. 14, 2002 by Jeremy Bowers  
   
 package Apache::lonquickgrades;  package Apache::lonquickgrades;
   
 use strict;  use strict;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use POSIX;  use POSIX;
   use Apache::loncommon;
   use Apache::lonlocal;
   use Apache::lonnet;
   use Apache::grades;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 44  sub real_handler { Line 47  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;
             $r->content_type('text/xml');  
         } else {  
             $r->content_type('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'}) {  
         $r->content_type('text/xml');  
     } else {  
         $r->content_type('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')
         || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
       my $notshowTotals=
           $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
       my $showCategories=
           $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
   
   
       my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
       my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
       $r->print(&Apache::loncommon::start_page($title,undef,
                                               {'bread_crumbs' => $brcrum})
                );
   
     # Create the nav map      &startGradeScreen($r,'quick');
     my $navmap = Apache::lonnavmaps::navmap->new(  
                         $ENV{"request.course.fn"}.".db",      $r->rflush();
                         $ENV{"request.course.fn"}."_parms.db", 1, 0, 1);  
   #    my $uname='korte';
     if (!defined($navmap)) {  #    my $udom='gerd';
         my $requrl = $r->uri;  
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";      my $uname;
         return HTTP_NOT_ACCEPTABLE;      my $udom;
   
       my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
          &getData($showPoints,$uname,$udom);
   
       if ($showCategories) {
          &outputCategories($r,$showPoints,$notshowTotals,
                    $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
       } else {
          &outputTable($r,$showPoints,$notshowTotals,
                    $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
     }      }
       &endGradeScreen($r);
       return OK;
   
     # Keep this hash in sync with %statusIconMap in lonnavmaps; they  }
     # should match color/icon  
     my $res = $navmap->firstResource(); # temp resource to access constants  sub startGradeScreen {
        my ($r,$mode)=@_;
     # Header  
     my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";      my $showPoints =
     $r->print(&Apache::loncommon::bodytag($title, '', ''));          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
       my $notshowSPRSlink =
     if (!$showPoints) {          (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
         $r->print(<<HEADER);         || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')
 <p>This screen shows how many problems (or problem parts) you have completed, and        || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
 how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed      my $notshowTotals=
 score sheet</a>.</p>          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
 HEADER      my $showCategories=
           $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
   
       my $allowed_to_view =  &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
       my $allowed_to_edit =  &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
   
       if ($allowed_to_view) {
          $r->print('<table><tr>');
          if ($notshowTotals)  { $r->print ('<td>'.&mt('Students do not see total points.').'</td>'); }
          if ($notshowSPRSlink){ $r->print ('<td>'.&mt('Students do not see link to spreadsheet.').'</td>'); }
          if ($showPoints)     { $r->print ('<td>'.&mt('Students will see points based on problem weights.').'</td>'); }
          if ($showCategories) { $r->print ('<td>'.&mt('Students will see points based on categories.').'</td>'); }
          $r->print('<td>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading').'</td></td></table>');
     }      }
   
     $r->print("This may take a few moments to display.");  
   
     $r->rflush();      $r->print('<ul class="LC_TabContentBigger" id="main">');
       $r->print('<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>'.
                                             ($showPoints?&mt('Points'):($showCategories?&mt('Grades'):&mt('Completion'))).'</b></a></li>');
   
       if (!($showPoints || $notshowSPRSlink) || ($allowed_to_view)) {
          $r->print('<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
                                                                    &mt('Spreadsheet').'</b></a></li>');
       }
       $r->print('</ul>');
       $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
   }
   
   sub endGradeScreen {
      my ($r)=@_;
      $r->print('</div></div></div>');
   }
   
   
   sub getData {
   
       my ($showPoints,$uname,$udom)=@_;
   
     $navmap->init();      &Apache::lonnet::logthis("About to call with $uname $udom");
   
     # End navmap using boilerplate      # Create the nav map
       my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
   
       my $res = $navmap->firstResource(); # temp resource to access constants
   
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);      my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $depth = 1;      my $depth = 1;
Line 119  HEADER Line 177  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 133  HEADER Line 192  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') ||
                           ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
    ($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 150  HEADER Line 226  HEADER
     }      }
     $totalParts += $curRes->weight($part);      $totalParts += $curRes->weight($part);
  } else {   } else {
     my $status = $curRes->status($part);      my $status = $curRes->simpleStatus($part);
     my $thisright = 0;      my $thisright = 0;
     $partsCount++;      $partsCount++;
     if ($status == $curRes->CORRECT ||       if ($status == $curRes->CORRECT ||
  $status == $curRes->EXCUSED) {   $status == $curRes->PARTIALLY_CORRECT ) {
  $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 171  HEADER Line 252  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 179  HEADER Line 261  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;
                 }                  }
             }              }
         }          }
         $curRes = $iterator->next();          $curRes = $iterator->next();
     }      }
       return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
   }
   
     $iterator = $navmap->getIterator(undef, undef, undef, 1);  #
     $depth = 1;  # Outputting everything.
     $iterator->next(); # ignore first BEGIN_MAP  #
     $curRes = $iterator->next();  
   sub outputTable {
   
       my ($r,$showPoints,$notshowTotals,
              $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
   
     my @start = (255, 255, 192);      my @start = (255, 255, 192);
     my @end   = (0, 192, 0);      my @end   = (0, 192, 0);
Line 200  HEADER Line 290  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(&Apache::loncommon::start_data_table()
     $title = $showPoints ? "Points Scored" : "Done";               .&Apache::loncommon::start_data_table_header_row()
     $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");               .'<th>'.&mt('Folder').'</th>');
       my $title = &mt($showPoints ? "Points Scored" : "Done");
       if ($totalAttempted) {
           $title .= " / " . &mt("Attempted");
       }
       $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
                .&Apache::loncommon::end_data_table_header_row());
   #
   # Output of folder scores
   #
   
       my $iterator = $navmap->getIterator(undef, undef, undef, 1);
       my $depth = 1;
       $iterator->next(); # ignore first BEGIN_MAP
       my $curRes = $iterator->next();
   
     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 212  HEADER Line 317  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;
                 $ratio = $correct / $total;                  $ratio = $correct / $total;
                 my $color = mixColors(\@start, \@end, $ratio);                  my $color = &mixColors(\@start, \@end, $ratio);
                 $r->print("<tr><td bgcolor='$color'>");                  $r->print(&Apache::loncommon::start_data_table_row()
                            .'<td style="background-color:'.$color.';">');
                                   
  my $thisIndent = '';   my $thisIndent = '';
                 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
                                .'<span class="LC_nobreak">'
                                .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
                                .'</span></td>'
                                .&Apache::loncommon::end_data_table_row()
                       );
    } else {
       $r->print('<td valign="top">'
                                .$thisIndent
                                .'<span class="LC_nobreak">'
                                .$correct.($notshowTotals?'':' / '.$total)
                                .'</span></td>'
                                .&Apache::loncommon::end_data_table_row());
    }
             }              }
         }          }
   
Line 234  HEADER Line 356  HEADER
     if ($topLevelParts > 0) {      if ($topLevelParts > 0) {
         my $ratio = $topLevelRight / $topLevelParts;          my $ratio = $topLevelRight / $topLevelParts;
         my $color = mixColors(\@start, \@end, $ratio);          my $color = mixColors(\@start, \@end, $ratio);
         $r->print("<tr><td bgcolor='$color'>");          $r->print(&Apache::loncommon::start_data_table_row()
         $r->print("Problems Not Contained In A Folder</td><td>");                   .'<td style="background-color:'.$color.';">');
         $r->print("$topLevelRight / $topLevelParts</td></tr>");          $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
           $r->print("$topLevelRight / $topLevelParts</td>"
                    .&Apache::loncommon::end_data_table_row());
     }      }
   
     my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");  #
   # show totals (if applicable), close table
   #
       if ($showPoints) {
           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(&Apache::loncommon::start_data_table_row()
                    .'<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>'
                    .&Apache::loncommon::end_data_table_row());
       }
   
     $r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");      $r->print(&Apache::loncommon::end_data_table()
     $r->print("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");               .&Apache::loncommon::end_page());
     $title = $showPoints ? "Points" : "Parts";  
     $r->print("Total $title In Course: <b>$totalParts</b></td></tr>\n\n");  
   
   }
   
     $r->print("</table></body></html>");  #
   # Outputting category-based grades.
   #
   
     $navmap->untieHashes();  sub outputCategories {
   
     return OK;      my ($r,$showPoints,$notshowTotals,
              $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 }  }
   
 # Pass this two refs to arrays for the start and end color, and a number  # Pass this two refs to arrays for the start and end color, and a number
 # from 0 to 1 for how much of the latter you want to mix in. It will  # from 0 to 1 for how much of the latter you want to mix in. It will
 # return a string ready to show ("#FFC309");  # return a string ready to show ("#FFC309");
   
 sub mixColors {  sub mixColors {
     my $start = shift;      my $start = shift;
     my $end = shift;      my $end = shift;

Removed from v.1.22.2.1  
changed lines
  Added in v.1.55


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