'.&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:Navmap 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 { + + my ($showPoints,$uname,$udom,$usec)=@_; # Create the nav map - my $navmap = Apache::lonnavmaps::navmap->new($r, - $ENV{"request.course.fn"}.".db", - $ENV{"request.course.fn"}."_parms.db", 1, 0); + my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec); if (!defined($navmap)) { - my $requrl = $r->uri; - $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed."; - return HTTP_NOT_ACCEPTABLE; + return (); } - # Keep this hash in sync with %statusIconMap in lonnavmaps; they - # should match color/icon my $res = $navmap->firstResource(); # temp resource to access constants - - # Header - $r->print(&Apache::loncommon::bodytag('Quick Score Display','', - '')); - - $r->print(<| Sequence | '); - $r->print('Done / Total | |
| '.&mt('Folder').' | '); + my $title = &mt($showPoints ? "Points Scored" : "Done"); + if ($totalAttempted) { + $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--; } if (ref($curRes) && $curRes->is_map()) { - my $stack = $iterator->getStack(); - my $src = Apache::lonnavmaps::getLinkForResource($stack); - my $srcHasQuestion = $src =~ /\?/; - my $link = $src. - ($srcHasQuestion?'&':'?') . - 'symb='.&Apache::lonnet::escape($curRes->symb()). - '"'; my $title = $curRes->compTitle(); my $correct = $curRes->{DATA}->{CHILD_CORRECT}; my $total = $curRes->{DATA}->{CHILD_PARTS}; - - $unaccountedTotal -= $total; - $unaccountedCorrect -= $correct; + my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED}; 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() + .' | '); - for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); } + my $thisIndent = ''; + for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } - $r->print("$title | "); - $r->print("$correct / $total | ' + .$thisIndent + .'' + .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total) + .' | ' + .&Apache::loncommon::end_data_table_row() + ); + } else { + $r->print('' + .$thisIndent + .'' + .$correct.($notshowTotals?'':' / '.$total) + .' | ' + .&Apache::loncommon::end_data_table_row()); + } } } @@ -205,26 +484,112 @@ HEADER } # If there were any problems at the top level, print an extra "catchall" - if ($unaccountedTotal > 0) { - my $ratio = $unaccountedCorrect / $unaccountedTotal; - my $color = mixColors(\@start, \@end, $ratio); - $r->print("
| "); - $r->print("Problems Not Contained In Sequences | "); - $r->print("$unaccountedCorrect / $unaccountedTotal | '); + $r->print(&mt("Problems Not Contained In A Folder")." | "); + $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) { + unless ($nostdtotals) { + 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("
| Total Parts Done: $totalRight "); - $r->print("Max Possible To Date $maxHelpLink: $totalPossible "); - $r->print("Total Parts In Course: $totalParts | ||