--- loncom/interface/statistics/lonstathelpers.pm 2010/09/11 19:08:23 1.59.12.1 +++ loncom/interface/statistics/lonstathelpers.pm 2010/02/28 23:58:55 1.60 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.59.12.1 2010/09/11 19:08:23 raeburn Exp $ +# $Id: lonstathelpers.pm,v 1.60 2010/02/28 23:58:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -262,29 +262,14 @@ END (' 'x4). ''.&mt('Unselect All').''; $Str .= $/.''.$/; - my ($iterator,$sequence_string,@Accumulator); + my $iterator = $navmap->getIterator(undef, undef, undef, 1); + my $sequence_string; my $seq_id = 0; - if (&Apache::loncommon::needs_gci_custom()) { - my $cdom = $env{'course.'.$cid.'.domain'}; - my $cnum = $env{'course.'.$cid.'.num'}; - my $mapurl = "/uploaded/$cdom/$cnum/default_1261144274.sequence"; - my $map = $navmap->getResourceByUrl($mapurl); - my $firstResource = $map->map_start(); - my $lastResource = $map->map_finish(); - $iterator = $navmap->getIterator($firstResource,$lastResource,undef,1); - @Accumulator = (&new_accumulator($map->compTitle, - $map->src, - $map->symb, - $seq_id++, - $inputname)); - } else { - $iterator = $navmap->getIterator(undef, undef, undef, 1); - @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'}, - '', - '', - $seq_id++, - $inputname)); - } + my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'}, + '', + '', + $seq_id++, + $inputname)); my @Sequence_Data; while (my $curRes = $iterator->next()) { if ($curRes == $iterator->END_MAP) { @@ -479,7 +464,8 @@ sub get_prev_curr_next { my @resources = &get_resources($navmap,$seq); foreach my $res (@resources) { foreach my $part (@{$res->parts}) { - if ($res->is_survey($part) && ($granularity eq 'part_survey')){ + if (($res->is_survey($part) || ($res->is_anonsurvey($part))) && + ($granularity eq 'part_survey')) { push (@Resource, { symb => $res->symb, part => $part,