--- loncom/interface/lonquickgrades.pm 2024/07/03 18:51:56 1.49.6.9 +++ loncom/interface/lonquickgrades.pm 2010/11/27 20:51:26 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# $Id: lonquickgrades.pm,v 1.49.6.9 2024/07/03 18:51:56 raeburn Exp $ +# $Id: lonquickgrades.pm,v 1.50 2010/11/27 20:51:26 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,13 +29,12 @@ package Apache::lonquickgrades; use strict; -use Apache::Constants qw(:common :http REDIRECT); +use Apache::Constants qw(:common :http); use POSIX; use Apache::loncommon; use Apache::lonlocal; use Apache::lonnet; use Apache::grades; -use Apache::lonuserstate; sub handler { my $r = shift; @@ -58,227 +57,61 @@ sub real_handler { 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 $clientip = &Apache::lonnet::get_requestor_ip($r); - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('grades',$clientip,$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); - 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("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 @@ -311,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; @@ -357,6 +189,7 @@ sub getData { $totalAttempted++; } + my $dateStatus = $curRes->getDateStatus($part); $totalParts++; if ($curRes->opendate($part) < $now) { $totalPossible++; @@ -387,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); @@ -409,21 +235,12 @@ sub outputTable { $r->print(&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row() .'