--- loncom/interface/lonquickgrades.pm 2004/12/11 23:33:05 1.33
+++ loncom/interface/lonquickgrades.pm 2020/09/08 04:24:18 1.49.6.6.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.33 2004/12/11 23:33:05 albertel Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.6.2.1 2020/09/08 04:24:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,15 +25,17 @@
#
# http://www.lon-capa.org/
#
-# Created Nov. 14, 2002 by Jeremy Bowers
package Apache::lonquickgrades;
use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http REDIRECT);
use POSIX;
use Apache::loncommon;
use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::grades;
+use Apache::lonuserstate;
sub handler {
my $r = shift;
@@ -46,66 +48,209 @@ sub real_handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
# Handle header-only request
+ if ($env{'browser.mathml'}) {
+ &Apache::loncommon::content_type($r,'text/xml');
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ }
if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
- &Apache::loncommon::content_type($r,'text/xml');
- } else {
+ $r->send_http_header;
+ return OK;
+ }
+
+ my $cangrade=&Apache::lonnet::allowed('mgr');
+ my $showPoints =
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+
+ my $reinitresult;
+
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('grades',$cnum,$cdom);
+ if ($blocked) {
+ my $checkrole = "cm./$cdom/$cnum";
+ if ($env{'request.course.sec'} ne '') {
+ $checkrole .= "/$env{'request.course.sec'}";
+ }
+ unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
+ ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
+ &grades_blocked($r,$blocktext,$showPoints);
+ return OK;
+ }
+ }
+ }
+
+ unless ($cangrade) {
+ # Check for critical messages and redirect if present.
+ my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'grades');
+ if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $url);
+ return REDIRECT;
}
+
+ # Check if course needs to be re-initialized
+ my $loncaparev = $r->dir_config('lonVersion');
+ ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+
+ if ($reinitresult eq 'switch') {
+ &Apache::loncommon::content_type($r,'text/html');
+ $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'};
+ &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.').'
'.
+ '';
+ my %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::Close_PrgWin($r,\%prog_state);
+ my $closure = <
+//
+
+ENDCLOSE
+ if ($ferr) {
+ $r->print($closure.&Apache::loncommon::end_page());
+ my $requrl = $r->uri;
+ $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
+ $env{'user.reinit'} = 1;
+ return HTTP_NOT_ACCEPTABLE;
+ } else {
+ $r->print($closure);
+ }
+ }
+ }
+
+ unless ($reinitresult eq 'update') {
+ # Send header, don't cache this page
+ &Apache::loncommon::no_cache($r);
$r->send_http_header;
- return OK;
+ &startpage($r,$showPoints);
}
+ $r->rflush();
- # Send header, don't cache this page
- if ($ENV{'browser.mathml'}) {
- &Apache::loncommon::content_type($r, 'text/xml');
+ &startGradeScreen($r);
+
+#
+# Pick student
+#
+ my $uname;
+ my $udom;
+ my $stdid;
+ if ($cangrade) {
+ if ($env{'form.uname'}) { $uname=$env{'form.uname'}; }
+ if ($env{'form.udom'}) { $udom=$env{'form.udom'}; }
+ if ($env{'form.id'}) { $stdid=$env{'form.id'}; }
+ if (($stdid) && ($udom)) {
+ $uname=(&Apache::lonnet::idget($udom,[$stdid],'ids'))[1];
+ }
+ if (($stdid) && (!$uname)) {
+ $r->print(''.&mt("Unknown Student/Employee ID: [_1]",$stdid).'
');
+ $stdid='';
+ }
+ if (($uname eq '') && ($udom eq '')) {
+ $uname = $env{'user.name'};
+ $udom = $env{'user.domain'};
+ }
+ $r->print('\n"); }
my $requrl = $r->uri;
- $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
+ $env{'user.error.msg'} = "$requrl:bre:0:0:Navmap initialization failed.";
return HTTP_NOT_ACCEPTABLE;
}
+ if ($cangrade) { $r->print("\n\n"); }
+ &endGradeScreen($r);
+ return OK;
+}
- # Keep this hash in sync with %statusIconMap in lonnavmaps; they
- # should match color/icon
- my $res = $navmap->firstResource(); # temp resource to access constants
-
- # Header
- my $title = $showPoints ? "Points Display" : "Completed Problems Display";
- $r->print(&Apache::loncommon::bodytag($title, '', ''));
-
- if (!$showPoints && !$notshowSPRSlink ) {
- $r->print(<This screen shows how many problems (or problem parts) you have completed, and
-how many you have not yet done. You can also look at a detailed
-score sheet.
-HEADER
+sub grades_blocked {
+ my ($r,$blocktext,$caller) = @_;
+ my $title = 'Points Display';
+ if ($caller eq 'spreadsheet') {
+ $title = 'Spreadsheet';
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.grading'} ne 'standard') {
+ $title = 'Completed Problems Display';
}
+ my $brcrum = [{href=>"/adm/quickgrades",text => $title}];
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/quickgrades',
+ text=> $title});
+ my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs($title);
+ &Apache::loncommon::content_type($r,'text/html');
+ &Apache::loncommon::no_cache($r);
+ $r->send_http_header;
+ $r->print(&Apache::loncommon::start_page($title).
+ $breadcrumbs.
+ $blocktext.
+ &Apache::loncommon::end_page());
+ return;
+}
- $r->print("This may take a few moments to display.");
+#
+# Go through the complete course and collect data
+#
- $r->rflush();
+sub getData {
+
+ my ($showPoints,$uname,$udom)=@_;
+
+ # Create the nav map
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
- # End navmap using boilerplate
+ if (!defined($navmap)) {
+ return ();
+ }
+
+ my $res = $navmap->firstResource(); # temp resource to access constants
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
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
@@ -138,39 +283,42 @@ HEADER
my $stack = $iterator->getStack();
for my $part (@{$parts}) {
- my $completionStatus = $curRes->getCompletionStatus($part);
my $dateStatus = $curRes->getDateStatus($part);
-
- if ($completionStatus == $curRes->EXCUSED()) {
+ my $weight = $curRes->weight($part);
+ my $problemstatus = $curRes->problemstatus($part);
+
+ if ($curRes->solved($part) eq 'excused') {
next;
}
if ($showPoints) {
my $score = 0;
# If we're not telling status and the answer date isn't passed yet,
# it's an "attempted" point
- if ($curRes->problemstatus($part) eq 'no' &&
+ if ((($problemstatus eq 'no') ||
+ ($problemstatus eq 'no_feedback_ever')) &&
($dateStatus != $curRes->ANSWER_OPEN)) {
my $status = $curRes->simpleStatus($part);
if ($status == $curRes->ATTEMPTED) {
- $partsAttempted += $curRes->weight($part);
+ $partsAttempted += $weight;
$totalAttempted += $partsAttempted;
}
} else {
- $score = $curRes->weight($part) * $curRes->awarded($part);
+ $score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
}
$partsRight += $score;
$totalRight += $score;
- $partsCount += $curRes->weight($part);
+ $partsCount += $weight;
if ($curRes->opendate($part) < $now) {
- $totalPossible += $curRes->weight($part);
+ $totalPossible += $weight;
}
- $totalParts += $curRes->weight($part);
+ $totalParts += $weight;
} else {
my $status = $curRes->simpleStatus($part);
my $thisright = 0;
$partsCount++;
- if ($status == $curRes->CORRECT ) {
+ if ($status == $curRes->CORRECT ||
+ $status == $curRes->PARTIALLY_CORRECT ) {
$partsRight++;
$totalRight++;
$thisright = 1;
@@ -181,7 +329,6 @@ HEADER
$totalAttempted++;
}
- my $dateStatus = $curRes->getDateStatus($part);
$totalParts++;
if ($curRes->opendate($part) < $now) {
$totalPossible++;
@@ -212,11 +359,18 @@ HEADER
}
$curRes = $iterator->next();
}
+ return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,
+ $topLevelParts,$topLevelRight,$topLevelAttempted);
+}
- $iterator = $navmap->getIterator(undef, undef, undef, 1);
- $depth = 1;
- $iterator->next(); # ignore first BEGIN_MAP
- $curRes = $iterator->next();
+#
+# Outputting everything.
+#
+
+sub outputTable {
+
+ my ($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,$totalRight,
+ $totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
my @start = (255, 255, 192);
my @end = (0, 192, 0);
@@ -224,14 +378,24 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('' .
- &mt('Folder') . ' | ');
- $title = &mt($showPoints ? "Points Scored" : "Done");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .''.&mt('Folder').' | ');
+ my $title = &mt($showPoints ? "Points Scored" : "Done");
if ($totalAttempted) {
- $title .= " / " . &mt("Attempted");
+ $title .= " / " . &mt("Attempted");
}
- $r->print("$title / "
- . &mt('Total') . " |
---|
\n\n");
+ $r->print("$title".($notshowTotals?'':" / ".&mt('Total')).' | '
+ .&Apache::loncommon::end_data_table_header_row());
+#
+# Output of folder scores
+#
+
+ my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+ my $depth = 1;
+ $iterator->next(); # ignore first BEGIN_MAP
+ my $curRes = $iterator->next();
+
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -246,17 +410,29 @@ HEADER
if ($total > 0) {
my $ratio;
$ratio = $correct / $total;
- my $color = mixColors(\@start, \@end, $ratio);
- $r->print("
");
+ my $color = &mixColors(\@start, \@end, $ratio);
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .' | ');
my $thisIndent = '';
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
$r->print("$thisIndent$title | ");
if ($totalAttempted) {
- $r->print("$thisIndent$correct / $attempted / $total |
\n");
+ $r->print(''
+ .$thisIndent
+ .''
+ .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
+ .' | '
+ .&Apache::loncommon::end_data_table_row()
+ );
} else {
- $r->print("$thisIndent$correct / $total | \n");
+ $r->print(''
+ .$thisIndent
+ .''
+ .$correct.($notshowTotals?'':' / '.$total)
+ .' | '
+ .&Apache::loncommon::end_data_table_row());
}
}
}
@@ -267,25 +443,92 @@ HEADER
# If there were any problems at the top level, print an extra "catchall"
if ($topLevelParts > 0) {
my $ratio = $topLevelRight / $topLevelParts;
- my $color = mixColors(\@start, \@end, $ratio);
- $r->print("");
+ my $color = &mixColors(\@start, \@end, $ratio);
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .' | ');
$r->print(&mt("Problems Not Contained In A Folder")." | ");
- $r->print("$topLevelRight / $topLevelParts |
");
+ $r->print("$topLevelRight / $topLevelParts"
+ .&Apache::loncommon::end_data_table_row());
}
- my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+#
+# show totals (if applicable), close table
+#
+ if ($showPoints) {
+ 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");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .''.$totaltitle.': '.$totalRight.' ');
+ $r->print(&mt('Max Possible To Date')." $maxHelpLink: $totalPossible ");
+ $title = $showPoints ? "Points" : "Parts";
+ $r->print(&mt("Total $title In Course").': '.$totalParts.' | '
+ .&Apache::loncommon::end_data_table_row());
+ }
- $r->print("Total $title: $totalRight ");
- $r->print(&mt("Max Possible To Date")." $maxHelpLink: $totalPossible ");
- $title = $showPoints ? "Points" : "Parts";
- $r->print(&mt("Total $title In Course").": $totalParts |
\n\n");
+ $r->print(&Apache::loncommon::end_data_table());
+ return;
+}
+sub startpage {
+ my ($r,$showPoints) = @_;
+ my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
+ my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
+ $r->print(&Apache::loncommon::start_page($title,undef,
+ {'bread_crumbs' => $brcrum})
+ );
+}
- $r->print("