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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.49.6.8.2.3 and 1.49.6.8.2.4

version 1.49.6.8.2.3, 2023/09/07 23:53:42 version 1.49.6.8.2.4, 2023/10/06 20:36:59
Line 207  ENDCLOSE Line 207  ENDCLOSE
         $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);          $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);
   
     if (ref($navmap)) {      if (ref($navmap)) {
         &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,          my $nostdtotals;
                      $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,          if ($showPoints) {
                      $topLevelAttempted);              if ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard') {
                   my $hidetotals = $env{'course.'.$env{'request.course.id'}.'.hidetotals'};
                   if ($hidetotals eq 'all') {
                       $nostdtotals = 1;
                   } elsif ($hidetotals ne '') {
                       my $usec;
                       if (($uname eq $env{'user.name'}) && ($env{'user.domain'})) {
                           $usec = $env{'request.user.section'};
                       } elsif ($cangrade) {
                           $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
                       }
                       if ($usec ne '') {
                           my %secnototals;
                           map { $secnototals{$_} = 1; } split(/,/,$hidetotals);
                           if ($secnototals{$usec}) {
                               $nostdtotals = 1;
                           }
                       }
                   }
               }
           }
           &outputTable($r,$showPoints,$notshowTotals,$nostdtotals,$navmap,
                        $totalParts,$totalPossible,$totalRight,$totalAttempted,
                        $topLevelParts,$topLevelRight,$topLevelAttempted);
     } else {      } else {
         if ($cangrade) { $r->print("\n</form>\n"); }          if ($cangrade) { $r->print("\n</form>\n"); }
         my $requrl = $r->uri;          my $requrl = $r->uri;
Line 384  sub getData { Line 407  sub getData {
   
 sub outputTable {  sub outputTable {
   
     my ($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,$totalRight,      my ($r,$showPoints,$notshowTotals,$nostdtotals,$navmap,$totalParts,$totalPossible,
         $totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;          $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 470  sub outputTable { Line 493  sub outputTable {
 # show totals (if applicable), close table  # show totals (if applicable), close table
 #  #
     if ($showPoints) {      if ($showPoints) {
  my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");          unless ($nostdtotals) {
       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");      my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
  $r->print(&Apache::loncommon::start_data_table_row()      $r->print(&Apache::loncommon::start_data_table_row()
                  .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br />');                       .'<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>'      $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'
                  .&Apache::loncommon::end_data_table_row());                       .&Apache::loncommon::end_data_table_row());
           }
     }      }
   
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
Line 500  sub startGradeScreen { Line 525  sub startGradeScreen {
   
     my $showPoints =      my $showPoints =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
       my $hidetotals =
           $env{'course.'.$env{'request.course.id'}.'.hidetotals'};
     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'));        || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
Line 525  sub startGradeScreen { Line 552  sub startGradeScreen {
         push(@notes,&mt('Students do not see total points.')) if ($notshowTotals);          push(@notes,&mt('Students do not see total points.')) if ($notshowTotals);
         push(@notes,&mt('Students do not see link to spreadsheet.')) if ($notshowSPRSlink);          push(@notes,&mt('Students do not see link to spreadsheet.')) if ($notshowSPRSlink);
         push(@notes,&mt('Students will see points based on problem weights.')) if ($showPoints);          push(@notes,&mt('Students will see points based on problem weights.')) if ($showPoints);
           if (($showPoints) && ($hidetotals ne '')) {
               if ($hidetotals eq 'all') {
                   push(@notes,&mt('Students do not see course totals.'));
               } else {
                   my @secs = split(/,/,$hidetotals);
                   if (@secs == 1) {
                       push(@notes,&mt('Students in section [_1] do not see course totals.',
                                       $hidetotals));
                   } elsif (@secs > 1) {
                       push(@notes,&mt('Students in sections [_1] do not see course totals.',
                                       join(', ',@secs)));
                   }
               }
           }
         push(@notes,&mt('Students will see link to spreadsheet.')) if ($showSPRSlink);          push(@notes,&mt('Students will see link to spreadsheet.')) if ($showSPRSlink);
         push(@notes,&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));          push(@notes,&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
         $r->print(&Apache::loncommon::head_subbox(join('&nbsp;&nbsp;',@notes)));          $r->print(&Apache::loncommon::head_subbox(join('&nbsp;&nbsp;',@notes)));
Removed from v.1.49.6.8.2.3  
changed lines
  Added in v.1.49.6.8.2.4

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