--- loncom/interface/lonstatistics.pm 2010/09/11 19:08:19 1.148.2.4 +++ loncom/interface/lonstatistics.pm 2010/12/05 17:27:30 1.148.2.7 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.148.2.4 2010/09/11 19:08:19 raeburn Exp $ +# $Id: lonstatistics.pm,v 1.148.2.7 2010/12/05 17:27:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -456,11 +456,27 @@ sub selected_sequences_with_assessments return ('Can not open Coursemap'); } # - my @sequences = $navmap->retrieveResources(undef, + my $mapurl; + if (&Apache::loncommon::needs_gci_custom()) { + my $cid = $env{'request.course.id'}; + if ($cid) { + my $cdom = $env{'course.'.$cid.'.domain'}; + if ($cdom =~ /^\w+citest$/) { + my $sequence = &Apache::loncommon::get_citest_map($cdom); + my $cnum = $env{'course.'.$cid.'.num'}; + if ($sequence) { + $mapurl = '/uploaded/'.$cdom.'/'.$cnum.'/'.$sequence; + } + } + } + } + my @sequences = $navmap->retrieveResources($mapurl, sub { shift->is_map(); },1,0,1); - my $toplevelseq = $navmap->getById('0.0'); - if (!grep(/^\Q$toplevelseq\E$/,@sequences)) { - unshift(@sequences,$toplevelseq); + unless (&Apache::loncommon::needs_gci_custom()) { + my $toplevelseq = $navmap->getById('0.0'); + if (!grep(/^\Q$toplevelseq\E$/,@sequences)) { + unshift(@sequences,$toplevelseq); + } } my @sequences_with_assessments; @@ -504,13 +520,15 @@ sub map_select { $form .= 'multiple="multiple" '; } $form .= 'size="'.$numvisible.'" >'."\n"; - # - # Put in option for 'all' - $form .= ' \n"; @@ -799,8 +821,6 @@ return &Apache::lonhtmlcommon::generate_ } - - sub handler { my $r=shift; my $c = $r->connection(); @@ -838,7 +858,11 @@ sub handler { my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom); my $duedate = $courseopt->{$env{'request.course.id'}.'.0.duedate'}; if ((!$duedate) || ($duedate > $now)) { - $r->print(&Apache::loncommon::start_page("Course Statistics")); + my $brcrum = [{href=> '/adm/statistics', + text=> 'Statistics',}]; + my $args = {bread_crumbs => $brcrum, + bread_crumbs_component => 'Statistics Main Page'}; + $r->print(&Apache::loncommon::start_page('Course Statistics',undef,$args)); $r->print('

'.&mt('Display of statistics').'

'); if ($duedate > $now) { $r->print('

'.&mt('Aggregate test performance data will be available after the Concept Test end date: [_1].',