-//
-
-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);
- }
- }
- 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 'main') || ($reinitresult eq 'both')) {
- # Send header, don't cache this page
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- &startpage($r,$showPoints);
- }
- $r->rflush();
-
- &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"); }
+ # Create the nav map
+ my $navmap = Apache::lonnavmaps::navmap->new();
+
+ if (!defined($navmap)) {
my $requrl = $r->uri;
- $env{'user.error.msg'} = "$requrl:bre:0:0:Navmap initialization failed.";
+ $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
return HTTP_NOT_ACCEPTABLE;
}
- if ($cangrade) { $r->print("\n\n"); }
- &endGradeScreen($r);
- return OK;
-}
-
-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;
-}
-
-#
-# Go through the complete course and collect data
-#
-sub getData {
+ # 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 = "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})
+ );
- my ($showPoints,$uname,$udom)=@_;
+ if (!$showPoints && !$notshowSPRSlink ) {
+ $r->print(''
+ .&mt('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 [_1]a detailed score sheet[_2].'
+ ,'','')
+ .'
');
+ }
- # Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+ $r->print(''.&mt('This may take a few moments to display.').'
');
- if (!defined($navmap)) {
- return ();
- }
+ $r->rflush();
- my $res = $navmap->firstResource(); # temp resource to access constants
+ # End navmap using boilerplate
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
@@ -315,7 +134,7 @@ sub getData {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
- if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout)
+ if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout)
{
# Get number of correct, incorrect parts
my $parts = $curRes->parts();
@@ -325,36 +144,35 @@ sub getData {
my $stack = $iterator->getStack();
for my $part (@{$parts}) {
+ my $completionStatus = $curRes->getCompletionStatus($part);
my $dateStatus = $curRes->getDateStatus($part);
- my $weight = $curRes->weight($part);
- my $problemstatus = $curRes->problemstatus($part);
-
- if ($curRes->solved($part) eq 'excused') {
+
+ if ($completionStatus == $curRes->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 ((($problemstatus eq 'no') ||
- ($problemstatus eq 'no_feedback_ever')) &&
+ if ((($curRes->problemstatus($part) eq 'no') ||
+ ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
($dateStatus != $curRes->ANSWER_OPEN)) {
my $status = $curRes->simpleStatus($part);
if ($status == $curRes->ATTEMPTED) {
- $partsAttempted += $weight;
+ $partsAttempted += $curRes->weight($part);
$totalAttempted += $partsAttempted;
}
} else {
- $score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
+ $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
}
$partsRight += $score;
$totalRight += $score;
- $partsCount += $weight;
+ $partsCount += $curRes->weight($part);
if ($curRes->opendate($part) < $now) {
- $totalPossible += $weight;
+ $totalPossible += $curRes->weight($part);
}
- $totalParts += $weight;
+ $totalParts += $curRes->weight($part);
} else {
my $status = $curRes->simpleStatus($part);
my $thisright = 0;
@@ -371,6 +189,7 @@ sub getData {
$totalAttempted++;
}
+ my $dateStatus = $curRes->getDateStatus($part);
$totalParts++;
if ($curRes->opendate($part) < $now) {
$totalPossible++;
@@ -401,18 +220,11 @@ sub getData {
}
$curRes = $iterator->next();
}
- return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,
- $topLevelParts,$topLevelRight,$topLevelAttempted);
-}
-
-#
-# Outputting everything.
-#
-sub outputTable {
-
- my ($r,$showPoints,$notshowTotals,$nostdtotals,$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();
my @start = (255, 255, 192);
my @end = (0, 192, 0);
@@ -423,21 +235,12 @@ sub outputTable {
$r->print(&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()
.''.&mt('Folder').' | ');
- my $title = &mt($showPoints ? "Points Scored" : "Done");
+ $title = &mt($showPoints ? "Points Scored" : "Done");
if ($totalAttempted) {
- $title .= " / " . &mt("Attempted");
+ $title .= " / " . &mt("Attempted");
}
$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--; }
@@ -452,7 +255,7 @@ sub outputTable {
if ($total > 0) {
my $ratio;
$ratio = $correct / $total;
- my $color = &mixColors(\@start, \@end, $ratio);
+ my $color = mixColors(\@start, \@end, $ratio);
$r->print(&Apache::loncommon::start_data_table_row()
.'');
@@ -485,7 +288,7 @@ sub outputTable {
# 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);
+ my $color = mixColors(\@start, \@end, $ratio);
$r->print(&Apache::loncommon::start_data_table_row()
.' | ');
$r->print(&mt("Problems Not Contained In A Folder")." | ");
@@ -493,102 +296,23 @@ sub outputTable {
.&Apache::loncommon::end_data_table_row());
}
-#
-# show totals (if applicable), close table
-#
if ($showPoints) {
- unless ($nostdtotals) {
- my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+ my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
- $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(&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})
- );
-}
-
-sub startGradeScreen {
- my ($r)=@_;
-
- my $showPoints =
- $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
- my $hidetotals =
- $env{'course.'.$env{'request.course.id'}.'.hidetotals'};
- my $notshowSPRSlink =
- (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
- || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
- my $notshowTotals =
- $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
- my $showSPRSlink =
- $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
-
- my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
- if ((!$allowed_to_view) && ($env{'request.course.sec'} ne '')) {
- $allowed_to_view = &Apache::lonnet::allowed('vgr',
- "$env{'request.course.id'}/$env{'request.course.sec'}");
- }
-
- my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
- if ((!$allowed_to_edit) && ($env{'request.course.sec'} ne '')) {
- $allowed_to_edit = &Apache::lonnet::allowed('mgr',
- "$env{'request.course.id'}/$env{'request.course.sec'}");
+ $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());
}
- if ($allowed_to_view) {
- my @notes;
- 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 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,&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
- $r->print(&Apache::loncommon::head_subbox(join(' ',@notes)));
- } elsif (!$allowed_to_edit) {
- if (!$showPoints && !$notshowSPRSlink ) {
- $r->print(&Apache::loncommon::head_subbox(
- &mt('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 [_1]a detailed score sheet[_2].'
- ,'','')));
- }
- }
- return;
-}
+ $r->print(&Apache::loncommon::end_data_table()
+ .&Apache::loncommon::end_page());
-sub endGradeScreen {
- my ($r)=@_;
- $r->print(&Apache::loncommon::end_page());
- return;
+ return OK;
}
# Pass this two refs to arrays for the start and end color, and a number