--- loncom/interface/lonstatistics.pm 2003/10/08 15:32:00 1.85
+++ loncom/interface/lonstatistics.pm 2004/02/12 22:23:30 1.96
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.85 2003/10/08 15:32:00 matthew Exp $
+# $Id: lonstatistics.pm,v 1.96 2004/02/12 22:23:30 matthew 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,7 +57,8 @@ use vars qw(
$top_map
@Sequences
@SelectedMaps
- @Assessments);
+ @Assessments
+ $enrollment_status);
use Apache::lonnet();
use Apache::lonhomework;
@@ -79,6 +66,8 @@ use Apache::loncommon;
use Apache::loncoursedata;
use Apache::lonhtmlcommon;
use Apache::lonproblemanalysis();
+use Apache::lonsubmissiontimeanalysis();
+use Apache::loncorrectproblemplot();
use Apache::lonproblemstatistics();
use Apache::lonstudentassessment();
use Apache::lonpercentage;
@@ -245,8 +234,8 @@ sub PrepareClasslist {
}
#
# 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 +265,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;
@@ -514,20 +503,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;
}
@@ -898,7 +873,7 @@ sub Gather_Student_Data {
($student->{'username'},$student->{'domain'},
$ENV{'request.course.id'});
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
+ &mt('last student'));
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->rflush();
@@ -1048,27 +1023,34 @@ sub CreateMainMenu {
short_description =>
&mt('Detailed statistics and graphs of student performance on problems.'),
},
- { internal_name => 'student_assessment',
- name => &mt('Problem Status Chart'),
+ { internal_name => 'submissiontime_analysis',
+ name => &mt('Submission Time Plots'),
+ short_description =>
+ &mt('Display and analysis of submission times on assessments.'),
+ },
+ { internal_name => 'correct_problems_plot',
+ name => &mt('Correct Problems Plot'),
short_description =>
- &mt('Brief view of each students performance in course.'),
+ &mt('Display a histogram of student performance in the course.'),
},
+# { internal_name => 'student_assessment',
+# name => &mt('Problem Status Chart'),
+# short_description =>
+# &mt('Brief view of each students performance in course.'),
+# },
# 'percentage' => 'Correct-problems Plot',
# 'activitylog' => 'Activity Log',
);
-
#
# Create the menu
my $Str;
- $Str = "".&mt('Statistics and Problem Analysis')."
\n";
- $Str .= &mt('Please select a report to generate.');
- $Str .= "\n";
+ $Str .= ''.&mt('Please select a report to generate').'
';
foreach my $reportdata (@reports) {
- $Str .=' - '.
- $reportdata->{'name'}."
\n";
- $Str .= ' - '.$reportdata->{'short_description'}.
- "
\n";
+ $reportdata->{'name'}."\n";
+ $Str .= ' '.(' 'x8).$reportdata->{'short_description'}.
+ "\n";
}
$Str .="
\n";
#
@@ -1101,21 +1083,11 @@ 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'},
@@ -1123,7 +1095,12 @@ sub handler {
'SelectedStudent']);
#
# Give the LON-CAPA page header
- $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
+ $r->print(''.
+ &mt('Course Statistics and Charts').
+ "\n".
+ &Apache::loncommon::bodytag('Course Statistics and Charts')."\n".
+ &Apache::loncommon::help_open_faq(139).
+ &Apache::loncommon::help_open_bug('Statistics and Charts'));
$r->rflush();
#
# Either print out a menu for them or send them to a report
@@ -1154,16 +1131,16 @@ sub handler {
&Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
}
#
- # Set up the statistics and chart environment
- &PrepareClasslist();
- &PrepareCourseData($r);
- #
# Begin form output
$r->print('