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

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

version 1.41, 2007/12/20 10:18:19 version 1.43.2.1, 2008/12/12 18:44:32
Line 85  sub real_handler { Line 85  sub real_handler {
     $r->print(&Apache::loncommon::start_page($title));      $r->print(&Apache::loncommon::start_page($title));
   
     if (!$showPoints && !$notshowSPRSlink ) {      if (!$showPoints && !$notshowSPRSlink ) {
         $r->print(<<HEADER);           $r->print('<p>'
 <p>This screen shows how many problems (or problem parts) you have completed, and                   .&mt('This screen shows how many problems (or problem parts) you have completed'
 how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed                       .', and how many you have not yet done.'
 score sheet</a>.</p>                       .' You can also look at [_1]a detailed score sheet[_2].'
 HEADER                       ,'<a href="/adm/studentcalc">','</a>')
                    .'</p>');
     }      }
   
     $r->print(&mt('This may take a few moments to display.'));      $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
   
     $r->rflush();      $r->rflush();
   
Line 145  HEADER Line 146  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 222  HEADER Line 224  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()
                .'<th>'.&mt('Folder').'</th>');
     $title = &mt($showPoints ? "Points Scored" : "Done");      $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 / ".&mt('Total').'</td>'
       . &mt('Total') . "</td><tr>\n\n");               .&Apache::loncommon::end_data_table_header_row());
     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 245  HEADER Line 248  HEADER
                 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">'
  } else {                               .$thisIndent
     $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");                               .'<span class="LC_nobreak">'
  }                               .$correct.' / '.$attempted.' / '.$total
                                .'</span></td>'
                                .&Apache::loncommon::end_data_table_row()
                       );
                   } else {
                       $r->print('<td valign="top">'
                                .$thisIndent
                                .'<span class="LC_nobreak">'
                                .$correct.' / '.$total
                                .'</span></td>'
                                .&Apache::loncommon::end_data_table_row());
                   }
             }              }
         }          }
   
Line 266  HEADER Line 281  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());
     }      }
   
     if ($showPoints) {      if ($showPoints) {
Line 276  HEADER Line 293  HEADER
   
  $title = $showPoints ? "Points" : "Parts Done";   $title = $showPoints ? "Points" : "Parts Done";
  my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total 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(&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>");   $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>'
                    .&Apache::loncommon::end_data_table_row());
     }      }
   
     $r->print("</table>".&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_data_table()
                .&Apache::loncommon::end_page());
   
     return OK;      return OK;
 }  }
Removed from v.1.41  
changed lines
  Added in v.1.43.2.1

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