'.&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 ? "Quick Points Display" : "Quick Completed Problems Display"; - $r->print(&Apache::loncommon::bodytag($title, '', '')); - - if ($showPoints) { - $r->print(<This may take a few moments to display.
"); +# +# Go through the complete course and collect data +# - $r->rflush(); +sub getData { - $navmap->init(); + my ($showPoints,$uname,$udom)=@_; - # End navmap using boilerplate + # Create the nav map + my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom); + + 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 @@ -123,8 +264,9 @@ HEADER # equally for both cases. my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0; + my $totalAttempted = 0; my $now = time(); - my $topLevelParts = 0; my $topLevelRight = 0; + my $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0; # Pre-run: Count parts correct while ( $depth > 0 ) { @@ -135,35 +277,59 @@ HEADER { # Get number of correct, incorrect parts my $parts = $curRes->parts(); - $totalParts += $curRes->countParts(); my $partsRight = 0; my $partsCount = 0; + my $partsAttempted = 0; my $stack = $iterator->getStack(); for my $part (@{$parts}) { + my $dateStatus = $curRes->getDateStatus($part); + my $weight = $curRes->weight($part); + my $problemstatus = $curRes->problemstatus($part); + + if ($curRes->solved($part) eq 'excused') { + next; + } if ($showPoints) { - my $score = $curRes->weight($part) * $curRes->awarded($part); + 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')) && + ($dateStatus != $curRes->ANSWER_OPEN)) { + my $status = $curRes->simpleStatus($part); + if ($status == $curRes->ATTEMPTED) { + $partsAttempted += $weight; + $totalAttempted += $partsAttempted; + } + } else { + $score = &Apache::grades::compute_points($weight, $curRes->awarded($part)); + } $partsRight += $score; $totalRight += $score; - $partsCount += $curRes->weight(); + $partsCount += $weight; if ($curRes->opendate($part) < $now) { - $totalPossible += $curRes->weight(); + $totalPossible += $weight; } + $totalParts += $weight; } else { - my $status = $curRes->getCompletionStatus($part); + my $status = $curRes->simpleStatus($part); my $thisright = 0; $partsCount++; - if ($status == $curRes->CORRECT || - $status == $curRes->CORRECT_BY_OVERRIDE || - $status == $curRes->EXCUSED || - $status == $curRes->ANSWER_SUBMITTED) { + if ($status == $curRes->CORRECT || + $status == $curRes->PARTIALLY_CORRECT ) { $partsRight++; $totalRight++; $thisright = 1; } + + if ($status == $curRes->ATTEMPTED) { + $partsAttempted++; + $totalAttempted++; + } - my $dateStatus = $curRes->getDateStatus($part); + $totalParts++; if ($curRes->opendate($part) < $now) { $totalPossible++; } @@ -171,9 +337,9 @@ HEADER } if ($depth == 1) { # in top-level only - $topLevelParts += scalar(@{$parts}); + $topLevelParts += $partsCount; $topLevelRight += $partsRight; - $r->print($curRes->compTitle() . '| 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--; } @@ -214,18 +405,35 @@ HEADER my $correct = $curRes->{DATA}->{CHILD_CORRECT}; my $total = $curRes->{DATA}->{CHILD_PARTS}; + 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() + .' | '); my $thisIndent = ''; for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } $r->print("$thisIndent$title | "); - $r->print("$thisIndent | ' + .$thisIndent + .'' + .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total) + .' | ' + .&Apache::loncommon::end_data_table_row() + ); + } else { + $r->print('' + .$thisIndent + .'' + .$correct.($notshowTotals?'':' / '.$total) + .' | ' + .&Apache::loncommon::end_data_table_row()); + } } } @@ -235,27 +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("
| "); - $r->print("Problems Not Contained In A Folder | "); - $r->print("$topLevelRight / $topLevelParts | '); + $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) { + 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("Max Possible To Date $maxHelpLink: $totalPossible "); - $title = $showPoints ? "Points" : "Parts"; - $r->print("Total $title In Course: $totalParts | ||