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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.123 and 1.128

version 1.123, 2022/10/19 00:03:10 version 1.128, 2024/12/10 04:52:30
Line 166  ENDCLOSE Line 166  ENDCLOSE
             return REDIRECT;              return REDIRECT;
         }          }
         if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {          if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {
             my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom);              my $possdel;
               if ($reinitresult eq 'supp') {
                   $possdel = 1;
               }
               my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
             unless ($refs_updated) {              unless ($refs_updated) {
                 &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);                  &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
             }              }
Line 257  ENDCLOSE Line 261  ENDCLOSE
     my $showCategories=      my $showCategories=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
   
       my $usec;
       if ($cangrade) {
           if (($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
               $usec = $env{'request.course.sec'};
           } else {
               $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
           }
       } else {
           $usec = $env{'request.course.sec'};
       }
   
     my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,      my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
         $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);          $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom,$usec);
   
     if (ref($navmap)) {      if (ref($navmap)) {
         if ($showCategories) {          if ($showCategories) {
Line 266  ENDCLOSE Line 281  ENDCLOSE
                               $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,                                $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
                               $topLevelAttempted);                                $topLevelAttempted);
         } else {          } else {
             &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 '') {
                           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"); }
Line 305  sub grades_blocked { Line 337  sub grades_blocked {
 }  }
   
 sub getStudentCatGrade {  sub getStudentCatGrade {
     my ($uname,$udom,%categories)=@_;      my ($uname,$udom,$usec,%categories)=@_;
     my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=      my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
        &getData(1,$uname,$udom);         &getData(1,$uname,$udom,$usec);
     return &output_category_table(undef,0,$navmap,0,%categories);      return &output_category_table(undef,0,$navmap,0,%categories);
 }  }
   
Line 323  sub getAllStudentData { Line 355  sub getAllStudentData {
     my $usernameidx = &Apache::loncoursedata::CL_SNAME();      my $usernameidx = &Apache::loncoursedata::CL_SNAME();
     my $domainidx   = &Apache::loncoursedata::CL_SDOM();      my $domainidx   = &Apache::loncoursedata::CL_SDOM();
     my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();      my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();
       my $sectionidx  = &Apache::loncoursedata::CL_SECTION();
   
     foreach my $key (keys(%{$classlist})) {      foreach my $key (keys(%{$classlist})) {
         my $student = $classlist->{$key};          my $student = $classlist->{$key};
         my $perc=&getStudentCatGrade($classlist->{$student}->[$usernameidx],          my $perc=&getStudentCatGrade($classlist->{$student}->[$usernameidx],
                                      $classlist->{$student}->[$domainidx],                                       $classlist->{$student}->[$domainidx],
                                        $classlist->{$student}->[$sectionidx],
                                      %categories);                                       %categories);
     }      }
 }  }
Line 346  sub startGradeScreen { Line 380  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 374  sub startGradeScreen { Line 410  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 points based on categories.')) if ($showCategories);         push(@notes,&mt('Students will see points based on categories.')) if ($showCategories);
        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'));
Line 484  sub excel_finish { Line 534  sub excel_finish {
   
 sub getData {  sub getData {
   
     my ($showPoints,$uname,$udom)=@_;      my ($showPoints,$uname,$udom,$usec)=@_;
   
     # Create the nav map      # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);      my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec);
   
     if (!defined($navmap)) {      if (!defined($navmap)) {
         return ();          return ();
Line 632  sub getData { Line 682  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 719  sub outputTable { Line 769  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());
Removed from v.1.123  
changed lines
  Added in v.1.128

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