--- loncom/interface/lonstatistics.pm 2003/09/29 18:32:38 1.82 +++ loncom/interface/lonstatistics.pm 2005/02/17 08:29:43 1.114 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.82 2003/09/29 18:32:38 matthew Exp $ +# $Id: lonstatistics.pm,v 1.114 2005/02/17 08:29:43 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,20 +38,6 @@ lonstatistics Main handler for statistics and chart. -=head1 PACKAGES USED - - use strict; - use Apache::Constants qw(:common :http); - use Apache::lonnet(); - use Apache::lonhomework; - use Apache::loncommon; - use Apache::loncoursedata; - use Apache::lonhtmlcommon; - use Apache::lonproblemanalysis; - use Apache::lonproblemstatistics; - use Apache::lonstudentassessment; - use Apache::lonpercentage; - use Apache::lonmysql; =over 4 =cut @@ -71,20 +57,27 @@ use vars qw( $top_map @Sequences @SelectedMaps - @Assessments); + @Assessments + $enrollment_status); use Apache::lonnet(); use Apache::lonhomework; use Apache::loncommon; use Apache::loncoursedata; use Apache::lonhtmlcommon; +use Apache::lonmysql; +use Apache::lonlocal; +use Time::HiRes; +# +# Statistics Packages use Apache::lonproblemanalysis(); +use Apache::lonsubmissiontimeanalysis(); +use Apache::loncorrectproblemplot(); use Apache::lonproblemstatistics(); use Apache::lonstudentassessment(); use Apache::lonpercentage; -use Apache::lonmysql; -use Apache::lonlocal; -use Time::HiRes; +use Apache::lonstudentsubmissions(); +use Apache::lonsurveyreports(); ####################################################### ####################################################### @@ -236,17 +229,17 @@ sub PrepareClasslist { } # # Set up %StudentData - @StudentDataOrder = qw/fullname username domain id section status/; + @StudentDataOrder = qw/fullname username domain id section status comments/; foreach my $field (@StudentDataOrder) { - $StudentData{$field}->{'title'} = $field; - $StudentData{$field}->{'base_width'} = length($field); + $StudentData{$field}->{'title'} = &mt($field); + $StudentData{$field}->{'base_width'} = length(&mt($field)); $StudentData{$field}->{'width'} = $StudentData{$field}->{'base_width'}; } # # get the status requested - my $requested_status = 'Active'; - $requested_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); + $enrollment_status = 'Active'; + $enrollment_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); # # Process the classlist while (my ($student,$student_data) = each (%$classlist)) { @@ -276,8 +269,8 @@ sub PrepareClasslist { foreach my $sect (@SelectedSections) { if ( (($sect eq 'all') || ($section eq $sect)) && - (($studenthash->{'status'} eq $requested_status) || - ($requested_status eq 'Any')) + (($studenthash->{'status'} eq $enrollment_status) || + ($enrollment_status eq 'Any')) ){ push (@Students,$studenthash); last; @@ -479,13 +472,22 @@ assessments. ####################################################### ####################################################### sub Sequences_with_Assess { + my ($mode) = @_; + $mode = 'selected' if (! defined($mode)); my @Sequences_to_Show; - foreach my $map_symb (@SelectedMaps) { - foreach my $sequence (@Sequences) { - next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all'); - next if ($sequence->{'num_assess'} < 1); + 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; } @@ -514,20 +516,6 @@ sub PrepareCourseData { $top_map = $top if (ref($top)); @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY'); @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY'); - # - # Compute column widths - foreach my $seq (@Sequences) { - my $name_length = length($seq->{'title'}); - my $num_parts = $seq->{'num_assess_parts'}; - # - # Use 3 digits for each the sum and total, which means 7 total... - my $num_col = $num_parts+7; - if ($num_col < $name_length) { - $num_col = $name_length; - } - $seq->{'base_width'} = $name_length; - $seq->{'width'} = $num_col; - } return; } @@ -798,187 +786,72 @@ sub SectionSelect { return $Str; } -####################################################### -####################################################### - -=pod - -=item &CreateAndParseOutputSelector() - -Construct a selection list of options for output and parse output selections. - -=cut - -####################################################### -####################################################### -sub OutputDescriptions { - my (@OutputOptions) = @_; - my $Str = ''; - $Str .= "
'.&mt('Sections').' | '; + $Str .= ''.&mt('Enrollment Status').' | '; + $Str .= '
---|---|
'. + &Apache::lonstatistics::SectionSelect('Section','multiple',5). + ' | '; + $Str .= ''. + &Apache::lonhtmlcommon::StatusOptions(undef,undef,5). + ' | '; + + $Str .= '
'."\n";
$Str .= '
'."\n"; + # Create the menu + my $Str; + $Str .= ' '.&mt('Please select a report to generate').''; + foreach my $reportdata (@reports) { + $Str .=''. + $reportdata->{'name'}."\n"; + $Str .= ' '.(' 'x8).$reportdata->{'short_description'}. + "\n"; + } + $Str .="\n"; # return $Str; } @@ -1087,91 +992,127 @@ sub handler { } } # - # Set document type for header only - if($r->header_only) { - if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); - } else { - $r->content_type('text/html'); - } - &Apache::loncommon::no_cache($r); - $r->send_http_header; - return OK; - } - # # Send the header - $r->content_type('text/html'); + &Apache::loncommon::no_cache($r); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + if ($r->header_only) { return OK; } # # Extract form elements from query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['sort','reportSelected', 'SelectedStudent']); - if (! exists($ENV{'form.reportSelected'})) { - $ENV{'form.reportSelected'} = 'student_assessment'; - } # # Give the LON-CAPA page header - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); - $r->rflush(); - # - if (! &Apache::lonmysql::verify_sql_connection()) { - my $serveradmin = $r->dir_config('lonAdmEMail'); - $r->print(<-Please notify the server administrator $serveradmin. - -Course Statistics and Charts cannot be retrieved until the database is -restarted. Your data is intact but cannot be displayed at this time. - - |