--- loncom/interface/lonstatistics.pm 2005/01/05 20:34:20 1.112
+++ loncom/interface/lonstatistics.pm 2005/02/25 02:37:49 1.115
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.112 2005/01/05 20:34:20 matthew Exp $
+# $Id: lonstatistics.pm,v 1.115 2005/02/25 02:37:49 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,10 +54,6 @@ use vars qw(
%StudentData
@StudentDataOrder
@SelectedStudentData
- $top_map
- @Sequences
- @SelectedMaps
- @Assessments
$enrollment_status);
use Apache::lonnet();
@@ -413,173 +409,6 @@ sub next_student {
return $next_student;
}
-#######################################################
-#######################################################
-
-=pod
-
-=item &clear_sequence_variables()
-
-=cut
-
-#######################################################
-#######################################################
-sub clear_sequence_variables {
- undef($top_map);
- undef(@Sequences);
- undef(@Assessments);
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &SetSelectedMaps($elementname)
-
-Sets the @SelectedMaps array from $ENV{'form.'.$elementname};
-
-=cut
-
-#######################################################
-#######################################################
-sub SetSelectedMaps {
- my $elementname = shift;
- if (exists($ENV{'form.'.$elementname})) {
- if (ref($ENV{'form.'.$elementname})) {
- @SelectedMaps = @{$ENV{'form.'.$elementname}};
- } else {
- @SelectedMaps = ($ENV{'form.'.$elementname});
- }
- } else {
- @SelectedMaps = ('all');
- }
-}
-
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &Sequences_with_Assess()
-
-Returns an array containing the subset of @Sequences which contain
-assessments.
-
-=cut
-
-#######################################################
-#######################################################
-sub Sequences_with_Assess {
- my ($mode) = @_;
- $mode = 'selected' if (! defined($mode));
- my @Sequences_to_Show;
- foreach my $sequence (@Sequences) {
- next if ($sequence->{'num_assess'} < 1);
- if ($mode eq 'all') {
- push (@Sequences_to_Show,$sequence);
- } elsif ($mode eq 'selected') {
- foreach my $map_symb (@SelectedMaps) {
- if ($sequence->{'symb'} eq $map_symb || $map_symb eq 'all'){
- push (@Sequences_to_Show,$sequence);
- last; # Only put it in once
- }
- }
- }
-
- }
- return @Sequences_to_Show;
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &PrepareCourseData($r)
-
-=cut
-
-#######################################################
-#######################################################
-sub PrepareCourseData {
- my ($r) = @_;
- &clear_sequence_variables();
- my ($top,$sequences,$assessments) =
- &Apache::loncoursedata::get_sequence_assessment_data();
- if (! defined($top) || ! ref($top)) {
- # There has been an error, better report it
- &Apache::lonnet::logthis('top is undefined');
- return;
- }
- $top_map = $top if (ref($top));
- @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');
- @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY');
- return;
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &log_sequence($sequence,$recursive,$padding)
-
-Write data about the sequence to a logfile. If $recursive is not
-undef the data is written recursively. $padding is used for recursive
-calls.
-
-=cut
-
-#######################################################
-#######################################################
-sub log_sequence {
- my ($seq,$recursive,$padding) = @_;
- $padding = '' if (! defined($padding));
- if (ref($seq) ne 'HASH') {
- &Apache::lonnet::logthis('log_sequence passed bad sequnce');
- return;
- }
- &Apache::lonnet::logthis($padding.'sequence '.$seq->{'title'});
- while (my($key,$value) = each(%$seq)) {
- next if ($key eq 'contents');
- if (ref($value) eq 'ARRAY') {
- for (my $i=0;$i< scalar(@$value);$i++) {
- &Apache::lonnet::logthis($padding.$key.'['.$i.']='.
- $value->[$i]);
- }
- } else {
- &Apache::lonnet::logthis($padding.$key.'='.$value);
- }
- }
- if (defined($recursive)) {
- &Apache::lonnet::logthis($padding.'-'x20);
- &Apache::lonnet::logthis($padding.'contains:');
- foreach my $item (@{$seq->{'contents'}}) {
- if ($item->{'type'} eq 'container') {
- &log_sequence($item,$recursive,$padding.' ');
- } else {
- &Apache::lonnet::logthis($padding.'title = '.$item->{'title'});
- while (my($key,$value) = each(%$item)) {
- next if ($key eq 'title');
- if (ref($value) eq 'ARRAY') {
- for (my $i=0;$i< scalar(@$value);$i++) {
- &Apache::lonnet::logthis($padding.$key.'['.$i.']='.
- $value->[$i]);
- }
- } else {
- &Apache::lonnet::logthis($padding.$key.'='.$value);
- }
- }
- }
- }
- &Apache::lonnet::logthis($padding.'end contents of '.$seq->{'title'});
- &Apache::lonnet::logthis($padding.'-'x20);
- }
- return;
-}
-
##############################################
##############################################
@@ -643,12 +472,97 @@ sub StudentDataSelect {
return $Str;
}
+#######################################################
+#######################################################
+
+=pod
+
+=item &get_selected_maps($elementname)
+
+Input: Name of the <select> form element used to specify the maps.
+
+Returns: Array of symbs of selected maps or the description 'all'.
+ If form.$elementname does not exist, 'all' is returned.
+
+=cut
+
+#######################################################
+#######################################################
+sub get_selected_maps {
+ my ($elementname) = @_;
+ my @selected_maps;
+ if (exists($ENV{'form.'.$elementname})) {
+ if (ref($ENV{'form.'.$elementname})) {
+ @selected_maps = @{$ENV{'form.'.$elementname}};
+ } else {
+ @selected_maps = ($ENV{'form.'.$elementname});
+ }
+ } else {
+ @selected_maps = ('all');
+ }
+ return @selected_maps;
+}
+
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &sequences_with_assessments
+
+Retrieve the sequences which were selected by the user to show.
+
+Input: $mode: scalar. Either 'selected' or 'all'. If not specified,
+ 'selected' is used.
+
+Returns: an array containing a navmap object and navmap resources,
+ or an array containing a scalar with an error message.
+
+=cut
+
+#######################################################
+#######################################################
+sub sequences_with_assessments {
+ my ($mode) = @_;
+ $mode = 'selected' if (! defined($mode));
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ if (!defined($navmap)) {
+ return ('Can not open Coursemap');
+ }
+ #
+ my @sequences = $navmap->retrieveResources(undef,
+ sub { shift->is_map(); },1,0,1);
+ my @sequences_with_assessments;
+ for my $sequence ($navmap->getById('0.0'), @sequences) {
+ if ($navmap->hasResource($sequence,sub { shift->is_problem(); }, 0)){
+ push(@sequences_with_assessments,$sequence);
+ }
+ }
+ #
+ my @sequences_to_show;
+ foreach my $sequence (@sequences_with_assessments) {
+ if ($mode eq 'all') {
+ push (@sequences_to_show,$sequence);
+ } elsif ($mode eq 'selected') {
+ foreach my $map_symb (&get_selected_maps()) {
+ if ($sequence->symb eq $map_symb || $map_symb eq 'all'){
+ push (@sequences_to_show,$sequence);
+ last; # Only put it in once
+ }
+ }
+ }
+
+ }
+ return $navmap,@sequences_to_show;
+}
+
##############################################
##############################################
=pod
-=item &MapSelect($elementname,$status,$numvisible,$restriction)
+=item &map_select($elementname,$status,$numvisible,$restriction)
Returns html for a selection box allowing the user to choose one (or more)
of the sequences in the course. The values of the sequences are the symbs.
@@ -662,69 +576,67 @@ If the top sequence is selected, the val
=item $numvisible The number of options to be visible
-=item $restriction Code reference to subroutine which returns true or
-false. The code must expect a reference to a sequence data structure.
-
=back
=cut
##############################################
##############################################
-sub MapSelect {
- my ($elementname,$status,$numvisible,$restriction)=@_;
+sub map_select {
+ my ($elementname,$status,$numvisible)=@_;
if ($numvisible < 1) {
return;
}
#
# Set up array of selected items
- &SetSelectedMaps($elementname);
- #
- # Set up the restriction call
- if (! defined($restriction)) {
- $restriction = sub { 1; };
- }
+ my @selected_maps = &get_selected_maps($elementname);
#
# Build the form element
- my $Str = "\n";
- $Str .= '<select name="'.$elementname.'" ';
+ my $form = "\n";
+ $form .= '<select name="'.$elementname.'" ';
if ($status ne 'single') {
- $Str .= 'multiple="true" ';
+ $form .= 'multiple="true" ';
}
- $Str .= 'size="'.$numvisible.'" >'."\n";
+ $form .= 'size="'.$numvisible.'" >'."\n";
#
# Deal with 'all'
- foreach (@SelectedMaps) {
+ foreach (@selected_maps) {
if ($_ eq 'all') {
- @SelectedMaps = ('all');
+ @selected_maps = ('all');
last;
}
}
#
# Put in option for 'all'
- $Str .= ' <option value="all" ';
- foreach (@SelectedMaps) {
+ $form .= ' <option value="all" ';
+ foreach (@selected_maps) {
if ($_ eq 'all') {
- $Str .= 'selected ';
+ $form .= 'selected ';
last;
}
}
- $Str .= ">all</option>\n";
+ $form .= ">all</option>\n";
#
# Loop through the sequences
- foreach my $seq (@Sequences) {
- next if (! $restriction->($seq));
- $Str .= ' <option value="'.$seq->{'symb'}.'" ';
- foreach (@SelectedMaps) {
- if ($seq->{'symb'} eq $_) {
- $Str .= 'selected ';
+ my @sequences = &sequences_with_assessments();
+ my $navmap;
+ if (!ref($sequences[0])) {
+ return $sequences[0];
+ } else {
+ $navmap = shift(@sequences);
+ }
+ foreach my $seq (@sequences){
+ $form .= ' <option value="'.$seq->symb.'" ';
+ foreach (@selected_maps) {
+ if ($seq->symb eq $_) {
+ $form .= 'selected ';
last;
}
}
- $Str .= '>'.$seq->{'title'}."</option>\n";
+ $form .= '>'.$seq->compTitle."</option>\n";
}
- $Str .= "</select>\n";
- return $Str;
+ $form .= "</select>\n";
+ return $form;
}
##############################################
@@ -786,91 +698,6 @@ sub SectionSelect {
return $Str;
}
-###############################################
-###############################################
-
-=pod
-
-=item &Gather_Student_Data()
-
-Ensures all student data is up to date.
-
-=cut
-
-###############################################
-###############################################
-sub Gather_Student_Data {
- my ($r) = @_;
- my $c = $r->connection();
- #
- &Apache::loncoursedata::clear_internal_caches();
- #
- my @Sequences = &Apache::lonstatistics::Sequences_with_Assess();
- #
- my @Students = @Apache::lonstatistics::Students;
- #
- # Open the progress window
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'Statistics Compilation Status',
- 'Statistics Compilation Progress', scalar(@Students));
- #
- while (my $student = shift @Students) {
- return if ($c->aborted());
- my ($status,undef) = &Apache::loncoursedata::ensure_current_data
- ($student->{'username'},$student->{'domain'},
- $ENV{'request.course.id'});
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- &mt('last student'));
- }
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->rflush();
-}
-
-###############################################
-###############################################
-
-=pod
-
-=item &Gather_Full_Student_Data()
-
-Ensures all student data is up to date.
-
-=cut
-
-###############################################
-###############################################
-sub Gather_Full_Student_Data {
- my ($r,$formname,$inputname) = @_;
- my $status_type;
- if (defined($formname)) {
- $status_type = 'inline';
- } else {
- $status_type = 'popup';
- }
- my $c = $r->connection();
- #
- &Apache::loncoursedata::clear_internal_caches();
- #
- my @Students = @Apache::lonstatistics::Students;
- #
- # Open the progress window
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,&mt('Student Data Compilation Status'),
- &mt('Student Data Compilation Progress'), scalar(@Students),
- $status_type,undef,$formname,$inputname);
- #
- while (my $student = shift @Students) {
- return if ($c->aborted());
- my ($status,undef) = &Apache::loncoursedata::ensure_current_full_data
- ($student->{'username'},$student->{'domain'},
- $ENV{'request.course.id'});
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- &mt('last student'));
- }
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->rflush();
-}
-
##################################################
##################################################
sub DisplayClasslist {
@@ -1097,7 +924,8 @@ sub handler {
td.essay { border: 1px solid gray; }
</style>
ENDSTYLE
- $r->print('<html><head><title>'.
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'<head><title>'.
&mt('Course Statistics and Charts').
'</title>'.$style.
"</head>\n".
@@ -1147,9 +975,6 @@ ENDSTYLE
#
my $GoToPage = $ENV{'form.reportSelected'};
#
- # Set up the statistics and chart environment
- &PrepareCourseData($r);
- #
$r->print('<input type="hidden" name="reportSelected" value="'.
$GoToPage.'">');
if($GoToPage eq 'activitylog') {