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

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

version 1.119, 2020/09/01 03:39:38 version 1.128, 2024/12/10 04:52:30
Line 86  sub real_handler { Line 86  sub real_handler {
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};          my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};          my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
           my $clientip = &Apache::lonnet::get_requestor_ip($r);
         my ($blocked,$blocktext) =          my ($blocked,$blocktext) =
             &Apache::loncommon::blocking_status('grades',$cnum,$cdom);              &Apache::loncommon::blocking_status('grades',$clientip,$cnum,$cdom);
         if ($blocked) {          if ($blocked) {
             my $checkrole = "cm./$cdom/$cnum";              my $checkrole = "cm./$cdom/$cnum";
             if ($env{'request.course.sec'} ne '') {              if ($env{'request.course.sec'} ne '') {
Line 119  sub real_handler { Line 120  sub real_handler {
             $r->send_http_header;              $r->send_http_header;
             $r->print(&Apache::loncommon::check_release_result(@reinit));              $r->print(&Apache::loncommon::check_release_result(@reinit));
             return OK;              return OK;
         } elsif ($reinitresult eq 'update') {          }
             my $cid = $env{'request.course.id'};          my ($cid,$cnum,$cdom);
             my $cnum = $env{'course.'.$cid.'.num'};          if ($reinitresult) {
             my $cdom = $env{'course.'.$cid.'.domain'};              $cid = $env{'request.course.id'};
               $cnum = $env{'course.'.$cid.'.num'};
               $cdom = $env{'course.'.$cid.'.domain'};
           }
           if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
             &Apache::loncommon::content_type($r,'text/html');              &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;              $r->send_http_header;
             &startpage($r,$showPoints);              &startpage($r,$showPoints);
             my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.              my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
                            '<br />'.                             '<br />'.
                            &mt('Your course session is being updated because of recent changes by course personnel.').                             &mt('Your course session is being updated because of recent changes by course personnel.').
                            ' '.&mt('Please be patient.').'<br /></div>'.                             ' '.&mt('Please be patient').'.<br /></div>'.
                            '<div style="padding:0;clear:both;margin:0;border:0"></div>';                             '<div style="padding:0;clear:both;margin:0;border:0"></div>';
             %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);              %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
             &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));              &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
             $r->rflush();              $r->rflush();
             my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");              my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
             &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));               &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); 
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);              &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             my $closure = <<ENDCLOSE;              my $closure = <<ENDCLOSE;
 <script type="text/javascript">  <script type="text/javascript">
Line 160  ENDCLOSE Line 165  ENDCLOSE
             $r->header_out(Location => $furl);              $r->header_out(Location => $furl);
             return REDIRECT;              return REDIRECT;
         }          }
           if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {
               my $possdel;
               if ($reinitresult eq 'supp') {
                   $possdel = 1;
               }
               my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
               unless ($refs_updated) {
                   &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
               }
           }
     }      }
   
     unless ($reinitresult eq 'update') {      unless (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
         # Send header, don't cache this page          # Send header, don't cache this page
         &Apache::loncommon::no_cache($r);          &Apache::loncommon::no_cache($r);
         $r->send_http_header;          $r->send_http_header;
Line 246  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 255  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 294  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 312  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 335  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 363  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 473  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 484  sub getData { Line 545  sub getData {
   
     my $res = $navmap->firstResource(); # temp resource to access constants      my $res = $navmap->firstResource(); # temp resource to access constants
   
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);      my $deeplinkcond = 1;
       my $iterator = $navmap->getIterator(undef, undef, undef, 1, undef, undef, $deeplinkcond);
     my $depth = 1;      my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP      $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();      my $curRes = $iterator->next();
Line 510  sub getData { Line 572  sub getData {
     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--; }
           my ($deeplink,$nodeeplinkcheck,$symb);
         if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout &&           $nodeeplinkcheck = 1;
             ($curRes->deeplink ne 'absent'))          if (ref($curRes)) {
               $symb = $curRes->symb();
               $deeplink = $curRes->deeplink('quickgrades');
               if ($deeplink eq 'absent') {
                   $nodeeplinkcheck = 0;
               }
           }
           if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout &&
               ($nodeeplinkcheck))
         {          {
             # Get number of correct, incorrect parts              # Get number of correct, incorrect parts
             my $parts = $curRes->parts();              my $parts = $curRes->parts();
Line 612  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 634  sub outputTable { Line 704  sub outputTable {
 # Output of folder scores  # Output of folder scores
 #  #
   
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);      my $deeplinkcond = 1;
       my $iterator = $navmap->getIterator(undef, undef, undef, 1, undef, undef, $deeplinkcond);
     my $depth = 1;      my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP      $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();      my $curRes = $iterator->next();
Line 698  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());
Line 765  sub dumpdata { Line 838  sub dumpdata {
   
 # Run through the map and get all data  # Run through the map and get all data
   
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);      my $deeplinkcond = 1;
       my $iterator = $navmap->getIterator(undef, undef, undef, 1, undef, undef, $deeplinkcond);
     my $depth = 1;      my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP      $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();      my $curRes = $iterator->next();
Removed from v.1.119  
changed lines
  Added in v.1.128

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