Diff for /loncom/interface/lonquickgrades.pm between versions 1.31 and 1.56

version 1.31, 2004/07/15 19:20:41 version 1.56, 2010/12/03 22:00:28
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;
   
Line 34  use Apache::Constants qw(:common :http); Line 33  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 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;
             &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')
         || ($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();  
       $r->rflush();
   
   #    my $uname='korte';
   #    my $udom='gerd';
   
       my $uname;
       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;
   
   }
   
     if (!defined($navmap)) {  sub startGradeScreen {
         my $requrl = $r->uri;      my ($r,$mode)=@_;
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";  
         return HTTP_NOT_ACCEPTABLE;      my $showPoints =
           $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')
         || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
       my $notshowTotals=
           $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
       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('<div id="LC_head_subbox">');
          if ($notshowTotals)  { $r->print ('&nbsp;'.&mt('Students do not see total points.').'&nbsp;'); }
          if ($notshowSPRSlink){ $r->print ('&nbsp;'.&mt('Students do not see link to spreadsheet.').'&nbsp;'); }
          if ($showPoints)     { $r->print ('&nbsp;'.&mt('Students will see points based on problem weights.').'&nbsp;'); }
          if ($showCategories) { $r->print ('&nbsp;'.&mt('Students will see points based on categories.').'&nbsp;'); }
          $r->print('&nbsp;'.&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading').'</div>');
     }      }
   
     # Keep this hash in sync with %statusIconMap in lonnavmaps; they  
     # should match color/icon      $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
     my $res = $navmap->firstResource(); # temp resource to access constants      $r->print("\n".'<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>'.
                                              ($showPoints?&mt('Points'):($showCategories?&mt('Grades'):&mt('Completion'))).'</b></a></li>');
     # Header  
     my $title = $showPoints ? "Points Display" : "Completed Problems Display";      if (!($showPoints || $notshowSPRSlink) || ($allowed_to_view)) {
     $r->print(&Apache::loncommon::bodytag($title, '', ''));         $r->print("\n".'<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
                                                                    &mt('Spreadsheet').'</b></a></li>');
     if (!$showPoints && !$notshowSPRSlink ) {  
         $r->print(<<HEADER);   
 <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  
 score sheet</a>.</p>  
 HEADER  
     }      }
       $r->print("\n".'</ul>'."\n");
       $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;">');
   }
   
     $r->print("This may take a few moments to display.");  sub endGradeScreen {
      my ($r)=@_;
      $r->print('</div></div></div>');
   }
   
     $r->rflush();  
   
     # End navmap using boilerplate  sub getData {
   
       my ($showPoints,$uname,$udom)=@_;
   
       &Apache::lonnet::logthis("About to call with $uname $udom");
   
       # 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 148  HEADER Line 206  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 156  HEADER Line 215  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 229  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 213  HEADER Line 272  HEADER
         }          }
         $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 225  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>' .      $r->print(&Apache::loncommon::start_data_table()
       &mt('Folder') . '</b></td>');               .&Apache::loncommon::start_data_table_header_row()
     $title = &mt($showPoints ? "Points Scored" : "Done");               .'<th>'.&mt('Folder').'</th>');
       my $title = &mt($showPoints ? "Points Scored" : "Done");
     if ($totalAttempted) {      if ($totalAttempted) {
  $title .= " / " . &mt("Attempted");          $title .= " / " . &mt("Attempted");
     }      }
     $r->print("<td align='center'>$title / "      $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
       . &mt('Total') . "</td><tr>\n\n");               .&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 247  HEADER Line 322  HEADER
             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>");
  if ($totalAttempted) {   if ($totalAttempted) {
     $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");      $r->print('<td valign="top">'
                                .$thisIndent
                                .'<span class="LC_nobreak">'
                                .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
                                .'</span></td>'
                                .&Apache::loncommon::end_data_table_row()
                       );
  } else {   } else {
     $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");      $r->print('<td valign="top">'
                                .$thisIndent
                                .'<span class="LC_nobreak">'
                                .$correct.($notshowTotals?'':' / '.$total)
                                .'</span></td>'
                                .&Apache::loncommon::end_data_table_row());
  }   }
             }              }
         }          }
Line 269  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()
                    .'<td style="background-color:'.$color.';">');
         $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");          $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
         $r->print("$topLevelRight / $topLevelParts</td></tr>");          $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(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");               .&Apache::loncommon::end_page());
     $title = $showPoints ? "Points" : "Parts";  
     $r->print(&mt("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.31  
changed lines
  Added in v.1.56


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