--- loncom/interface/lonquickgrades.pm 2020/09/01 03:35:54 1.118
+++ loncom/interface/lonquickgrades.pm 2022/10/19 18:09:04 1.124
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.118 2020/09/01 03:35:54 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.124 2022/10/19 18:09:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -86,8 +86,9 @@ sub real_handler {
if ($env{'request.course.id'}) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
my ($blocked,$blocktext) =
- &Apache::loncommon::blocking_status('grades',$cnum,$cdom);
+ &Apache::loncommon::blocking_status('grades',$clientip,$cnum,$cdom);
if ($blocked) {
my $checkrole = "cm./$cdom/$cnum";
if ($env{'request.course.sec'} ne '') {
@@ -119,23 +120,27 @@ sub real_handler {
$r->send_http_header;
$r->print(&Apache::loncommon::check_release_result(@reinit));
return OK;
- } elsif ($reinitresult eq 'update') {
- my $cid = $env{'request.course.id'};
- my $cnum = $env{'course.'.$cid.'.num'};
- my $cdom = $env{'course.'.$cid.'.domain'};
+ }
+ my ($cid,$cnum,$cdom);
+ if ($reinitresult) {
+ $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');
$r->send_http_header;
&startpage($r,$showPoints);
my $preamble = '
'.
'
'.
&mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&mt('Please be patient.').'
'.
+ ' '.&mt('Please be patient').'.
'.
'';
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
$r->rflush();
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);
my $closure = <
@@ -160,9 +165,19 @@ ENDCLOSE
$r->header_out(Location => $furl);
return REDIRECT;
}
+ if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {
+ my $possdel;
+ if ($reinitresult eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::lonnet::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
&Apache::loncommon::no_cache($r);
$r->send_http_header;
@@ -246,16 +261,18 @@ ENDCLOSE
my $showCategories=
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
- my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
- &getData($showPoints,$uname,$udom);
+ my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
+ $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);
if (ref($navmap)) {
if ($showCategories) {
- &outputCategories($r,$showPoints,$notshowTotals,
- $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+ &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);
+ &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,
+ $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
+ $topLevelAttempted);
}
} else {
if ($cangrade) { $r->print("\n\n"); }
@@ -266,7 +283,6 @@ ENDCLOSE
if ($cangrade) { $r->print("\n\n"); }
&endGradeScreen($r);
return OK;
-
}
sub grades_blocked {
@@ -338,11 +354,11 @@ sub startGradeScreen {
(($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=
+ my $notshowTotals =
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
my $showSPRSlink =
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
- my $showCategories=
+ my $showCategories =
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
@@ -402,9 +418,9 @@ sub startGradeScreen {
}
sub endGradeScreen {
- my ($r)=@_;
- $r->print(''.&Apache::loncommon::end_page());
- return;
+ my ($r)=@_;
+ $r->print(''.&Apache::loncommon::end_page());
+ return;
}
# -----------
@@ -483,11 +499,12 @@ sub getData {
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;
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();
-
+
# General overview of the following: Walk along the course resources.
# For every problem in the resource, tell its parent maps how many
# parts and how many parts correct it has. After that, each map will
@@ -509,9 +526,17 @@ sub getData {
while ( $depth > 0 ) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
-
- if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout &&
- ($curRes->deeplink ne 'absent'))
+ my ($deeplink,$nodeeplinkcheck,$symb);
+ $nodeeplinkcheck = 1;
+ 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
my $parts = $curRes->parts();
@@ -601,7 +626,8 @@ sub getData {
}
$curRes = $iterator->next();
}
- return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+ return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,
+ $topLevelParts,$topLevelRight,$topLevelAttempted);
}
#
@@ -610,8 +636,8 @@ sub getData {
sub outputTable {
- my ($r,$showPoints,$notshowTotals,
- $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+ my ($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,$totalRight,
+ $totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
my @start = (255, 255, 192);
my @end = (0, 192, 0);
@@ -632,7 +658,8 @@ sub outputTable {
# 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;
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();
@@ -763,7 +790,8 @@ sub dumpdata {
# 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;
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();