--- loncom/interface/lonstatistics.pm 2003/05/13 14:30:26 1.70
+++ loncom/interface/lonstatistics.pm 2005/02/25 19:48:00 1.116
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.70 2003/05/13 14:30:26 matthew Exp $
+# $Id: lonstatistics.pm,v 1.116 2005/02/25 19:48:00 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
@@ -68,22 +54,26 @@ use vars qw(
%StudentData
@StudentDataOrder
@SelectedStudentData
- $top_map
- @Sequences
- @SelectedMaps
- @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 Time::HiRes;
+use Apache::lonstudentsubmissions();
+use Apache::lonsurveyreports();
#######################################################
#######################################################
@@ -206,7 +196,6 @@ upon the calling context.
#######################################################
#######################################################
sub PrepareClasslist {
- my $r = shift;
my %Sections;
&clear_classlist_variables();
#
@@ -236,17 +225,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 +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;
@@ -301,9 +290,10 @@ sub PrepareClasslist {
@Students = @TmpStudents;
#
# Now deal with that current student thing....
- if (exists($ENV{'form.StudentAssessmentStudent'})) {
+ $curr_student = undef;
+ if (exists($ENV{'form.SelectedStudent'})) {
my ($current_uname,$current_dom) =
- split(':',$ENV{'form.StudentAssessmentStudent'});
+ split(':',$ENV{'form.SelectedStudent'});
my $i;
for ($i = 0; $i<=$#Students; $i++) {
next if (($Students[$i]->{'username'} ne $current_uname) ||
@@ -311,15 +301,17 @@ sub PrepareClasslist {
$curr_student = $Students[$i];
last; # If we get here, we have our student.
}
- if ($i == 0) {
- $prev_student = 'none';
- } else {
- $prev_student = $Students[$i-1];
- }
- if ($i == $#Students) {
- $next_student = 'none';
- } else {
- $next_student = $Students[$i+1];
+ if (defined($curr_student)) {
+ if ($i == 0) {
+ $prev_student = undef;
+ } else {
+ $prev_student = $Students[$i-1];
+ }
+ if ($i == $#Students) {
+ $next_student = undef;
+ } else {
+ $next_student = $Students[$i+1];
+ }
}
}
#
@@ -330,7 +322,7 @@ sub PrepareClasslist {
@SelectedStudentData = ($ENV{'form.StudentData'});
}
} else {
- @SelectedStudentData = ('fullname');
+ @SelectedStudentData = ('username');
}
foreach (@SelectedStudentData) {
if ($_ eq 'all') {
@@ -342,70 +334,25 @@ sub PrepareClasslist {
return;
}
-#######################################################
-#######################################################
-
-=pod
-
-=item ¤t_student()
-
-Returns a pointer to a hash containing data about the currently
-selected student.
-
-=cut
-
-#######################################################
-#######################################################
-sub current_student {
- if (defined($curr_student)) {
- return $curr_student;
- } else {
- return 'All Students';
- }
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &previous_student()
-
-Returns a pointer to a hash containing data about the student prior
-in the list of students. Or something.
-
-=cut
-
-#######################################################
-#######################################################
-sub previous_student {
- if (defined($prev_student)) {
- return $prev_student;
- } else {
- return 'No Student Selected';
- }
-}
#######################################################
#######################################################
=pod
-=item &next_student()
+=item get_students
-Returns a pointer to a hash containing data about the next student
-to be viewed.
+Returns a list of the selected students
=cut
#######################################################
#######################################################
-sub next_student {
- if (defined($next_student)) {
- return $next_student;
- } else {
- return 'No Student Selected';
+sub get_students {
+ if (! @Students) {
+ &PrepareClasslist()
}
+ return @Students;
}
#######################################################
@@ -413,112 +360,35 @@ sub next_student {
=pod
-=item &clear_sequence_variables()
-
-=cut
-
-#######################################################
-#######################################################
-sub clear_sequence_variables {
- undef($top_map);
- undef(@Sequences);
- undef(@Assessments);
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &SetSelectedMaps($elementname)
+=item ¤t_student()
-Sets the @SelectedMaps array from $ENV{'form.'.$elementname};
+Returns a pointer to a hash containing data about the currently
+selected student.
=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');
- }
+sub current_student {
+ return $curr_student;
}
-
#######################################################
#######################################################
=pod
-=item &Sequences_with_Assess()
-
-Returns an array containing the subset of @Sequences which contain
-assessments.
-
-=cut
-
-#######################################################
-#######################################################
-sub Sequences_with_Assess {
- 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);
- push (@Sequences_to_Show,$sequence);
- }
- }
- return @Sequences_to_Show;
-}
-
-#######################################################
-#######################################################
-
-=pod
+=item &previous_student()
-=item &PrepareCourseData($r)
+Returns a pointer to a hash containing data about the student prior
+in the list of students. Or something.
=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');
- #
- # Compute column widths
- foreach my $seq (@Sequences) {
- my $name_length = length($seq->{'title'});
- my $num_parts = $seq->{'num_assess_parts'};
- #
- # The number of columns needed for the summation text:
- # " 1/5" = 1+3 columns, " 10/99" = 1+5 columns
- my $sum_length = 1+1+2*(length($num_parts));
- my $num_col = $num_parts+$sum_length;
- if ($num_col < $name_length) {
- $num_col = $name_length;
- }
- $seq->{'base_width'} = $name_length;
- $seq->{'width'} = $num_col;
- }
- return;
+sub previous_student {
+ return $prev_student;
}
#######################################################
@@ -526,60 +396,17 @@ sub PrepareCourseData {
=pod
-=item &log_sequence($sequence,$recursive,$padding)
+=item &next_student()
-Write data about the sequence to a logfile. If $recursive is not
-undef the data is written recursively. $padding is used for recursive
-calls.
+Returns a pointer to a hash containing data about the next student
+to be viewed.
=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;
+sub next_student {
+ return $next_student;
}
##############################################
@@ -645,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 &selected_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 selected_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('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.
@@ -664,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 = &selected_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;
}
##############################################
@@ -739,6 +649,7 @@ sub MapSelect {
Returns html for a selection box allowing the user to choose one (or more)
of the sections in the course.
+Uses the package variables @Sections and @SelectedSections
=over 4
=item $elementname The name of the HTML form element
@@ -747,13 +658,6 @@ of the sections in the course.
=item $numvisible The number of options to be visible
-=item $selected Array ref to the names of the already selected sections.
-If undef, $ENV{'form.'.$elementname} is used.
-If $ENV{'form.'.$elementname} is also empty, none will be selected.
-
-=item $restriction Code reference to subroutine which returns true or
-false. The code must expect a reference to a sequence data structure.
-
=back
=cut
@@ -766,6 +670,11 @@ sub SectionSelect {
return;
}
#
+ # Make sure we have the data we need to continue
+ if (! @Sections) {
+ &PrepareClasslist()
+ }
+ #
# Build the form element
my $Str = "\n";
$Str .= '<select name="'.$elementname.'" ';
@@ -793,14 +702,82 @@ sub SectionSelect {
##################################################
sub DisplayClasslist {
my ($r)=@_;
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({text=>'Select One Student'});
#
- my @Fields = ('fullname','username','domain','id','section');
+ # Output some of the standard interface components
+ my $Str;
+ $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student');
+ $Str .= '<p><table cellspacing="5">'."\n";
+ $Str .= '<tr>';
+ $Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';
+ $Str .= '<th align="center"><b>'.&mt('Enrollment Status').'</b></th>';
+ $Str .= '</tr>'.$/;
+ $Str .= '<tr>';
+ $Str .= '<td>'.
+ &Apache::lonstatistics::SectionSelect('Section','multiple',5).
+ '</td>';
+ $Str .= '<td>'.
+ &Apache::lonhtmlcommon::StatusOptions(undef,undef,5).
+ '</td>';
+
+ $Str .= '</tr>'.$/;
+ $Str .= '</table></p>';
+ $Str .= '<input type="submit" name="selectstudent" value="'.
+ &mt('Update Display').'" />';
+ $r->print($Str);
+ $r->rflush();
+ #
+ my @Fields = ('fullname','username','domain','id','section','status');
#
- my $Str='';
+ $Str = '';
+ if (! @Students) {
+ if ($SelectedSections[0] eq 'all') {
+ if (lc($ENV{'form.Status'}) eq 'any') {
+ $Str .= '<h2>'.
+ &mt('There are no students in the course.').
+ '</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'active') {
+ $Str .= '<h2>'.
+ &mt('There are no currently enrolled students in the course.').
+ '</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+ $Str .= '<h2>'.
+ &mt('There are no previously enrolled students in the course.').
+ '</h2>';
+ }
+ } else {
+ my $sections;
+ if (lc($ENV{'form.Status'}) eq 'any') {
+ $Str .= '<h2>'.
+ &mt('There are no students in the selected sections.').
+ '</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'active') {
+ $Str .= '<h2>'.
+ &mt('There are no currently enrolled students in the selected sections.').
+ '</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+ $Str .= '<h2>'.
+ &mt('There are no previously enrolled students in the selected sections.').
+ '</h2>';
+ }
+ }
+ $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'.
+ &mt('Click here to return to the chart').'</a>';
+ $r->print($Str);
+ $r->rflush();
+ return;
+ }
+
+ # "Click" is asinine but it is probably not my place to change the world.
+ $Str .= '<h2>Click on a students name or username to view their chart</h2>';
$Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
foreach my $field (@Fields) {
- $Str .= '<th><a href="/adm/statistics?reportSelected=classlist&sort='.$field.'">'.$field.
+ $Str .= '<th><a href="/adm/statistics?'.
+ 'reportSelected=student_assessment&'.
+ 'selectstudent=1&'.
+ 'sort='.$field.'">'.&mt($field).
'</a></th>';
}
$Str .= '</tr>'."\n";
@@ -817,13 +794,16 @@ sub DisplayClasslist {
#
foreach my $field (@Fields) {
$Str .= '<td>';
- if ($field eq 'fullname') {
+ if ($field eq 'fullname' || $field eq 'username') {
$Str .= '<a href="/adm/statistics?reportSelected=';
$Str .= &Apache::lonnet::escape('student_assessment');
- $Str .= '&StudentAssessmentStudent=';
+ $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
+ $Str .= '&SelectedStudent=';
$Str .= &Apache::lonnet::escape($sname).'">';
$Str .= $student->{$field}.' ';
$Str .= '</a>';
+ } elsif ($field eq 'status') {
+ $Str .= &mt($student->{$field});
} else {
$Str .= $student->{$field};
}
@@ -842,36 +822,58 @@ sub DisplayClasslist {
##############################################
##############################################
sub CreateMainMenu {
- my ($status,$reports,$current)=@_;
#
- my $Str = '';
+ # Define menu data
+ my @reports = ({ internal_name => 'problem_statistics',
+ name => &mt('Overall Problem Statistics'),
+ short_description =>
+ &mt('Student performance statistics on all problems.'),
+ },
+ { internal_name => 'problem_analysis',
+ name => &mt('Detailed Problem Analysis'),
+ short_description =>
+ &mt('Detailed statistics and graphs of student performance on problems.'),
+ },
+ { internal_name => 'submissiontime_analysis',
+ name => &mt('Submission Time Plots'),
+ short_description =>
+ &mt('Display and analysis of submission times on assessments.'),
+ },
+ { internal_name => 'student_submission_reports',
+ name => &mt('Student Submission Reports'),
+ short_description =>
+ &mt('Prepare reports of student submissions.'),
+ },
+ { internal_name => 'survey_reports',
+ name => &mt('Survey Reports'),
+ short_description =>
+ &mt('Prepare reports on survey results.'),
+ },
+ { internal_name => 'correct_problems_plot',
+ name => &mt('Correct Problems Plot'),
+ short_description =>
+ &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',
+ );
#
- $Str .= '<table border="0"><tbody><tr>'."\n";
- $Str .= '<td></td>'."\n";
- $Str .= '<td></td>'."\n";
- $Str .= '<td align="center"><b>Select a Report</b></td>'."\n";
- $Str .= '<tr>'."\n";
- #
- $Str .= '<td align="center">'.
- '<input type="submit" name="Refresh" value="Update Display" />'.
- "</td>\n";
- $Str .= '<td align="center">'.
- '<input type="submit" name="ClearCache" value="Clear Caches" />'.
- "</td>\n";
- #
- $Str .= '<td align="center">';
- $Str .= '<select name="reportSelected" >'."\n";
- foreach (sort(keys(%$reports))) {
- $Str .= '<option value="'.$_.'"';
- if($current eq $_) {
- $Str .= ' selected';
- }
- $Str .= '>'.$reports->{$_}.'</option>'."\n";
+ # Create the menu
+ my $Str;
+ $Str .= '<h2>'.&mt('Please select a report to generate').'</h2>';
+ foreach my $reportdata (@reports) {
+ $Str .=' <h3><a href="/adm/statistics?reportSelected='.
+ $reportdata->{'internal_name'}.'" >'.
+ $reportdata->{'name'}."</a></h3>\n";
+ $Str .= ' '.(' 'x8).$reportdata->{'short_description'}.
+ "\n";
}
- $Str .= '</select></td>'."\n";
- #
- $Str .= '</tr></tbody></table>'."\n";
- $Str .= '<hr>'."\n";
+ $Str .="</dl>\n";
#
return $Str;
}
@@ -902,93 +904,124 @@ 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',
- 'StudentAssessmentStudent']);
- if (! exists($ENV{'form.reportSelected'})) {
- $ENV{'form.reportSelected'} = 'student_assessment';
- }
+ 'SelectedStudent']);
#
# 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(<<END);
-<h2><font color="Red">Unable to connect to database!</font></h2>
-<p>
-Please notify the server administrator <b>$serveradmin</b>.
-</p><p>
-Course Statistics and Charts cannot be retrieved until the database is
-restarted. Your data is intact but cannot be displayed at this time.
-</p>
-</body>
-</html>
-END
- return;
- }
- #
- # Clean out the caches
- if (exists($ENV{'form.ClearCache'})) {
- &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
- }
- #
- # Set up the statistics and chart environment
- &PrepareClasslist($r);
- &PrepareCourseData($r);
- #
- # Begin form output
- $r->print('<form name="Statistics" ');
- $r->print('method="post" action="/adm/statistics">');
- #
- # Print main menu
- my %reports = ('classlist' => 'Class list',
- 'problem_statistics' => 'Problem Statistics',
- 'student_assessment' => 'Problem Status Chart',
- 'percentage' => 'Correct-problems Plot',
- 'option_response' => 'Option Response Analysis',
-# 'activitylog' => 'Activity Log',
- );
- $r->print(&CreateMainMenu($ENV{'form.status'},
- \%reports,$ENV{'form.reportSelected'}));
+ my $style = <<ENDSTYLE;
+<style type="text/css">
+ ul.sub_studentans { list-style-type: none }
+ ul.sub_correctans { list-style-type: none }
+ tr.even { background-color: \#CCCCCC }
+ td.essay { border: 1px solid gray; }
+</style>
+ENDSTYLE
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'<head><title>'.
+ &mt('Course Statistics and Charts').
+ '</title>'.$style.
+ "</head>\n".
+ &Apache::loncommon::bodytag('Course Statistics and Charts'));
$r->rflush();
+ #
+ # Either print out a menu for them or send them to a report
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/statistics',
+ title=>'Statistics',
+ text =>'Statistics',
+ faq=>139,
+ bug=>'Statistics and Charts'});
+ if (! exists($ENV{'form.reportSelected'}) ||
+ $ENV{'form.reportSelected'} eq '') {
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs
+ (undef,&mt('Statistics Main Page')).
+ &CreateMainMenu());
+ } else {
#
- my $GoToPage = $ENV{'form.reportSelected'};
- if($GoToPage eq 'activitylog') {
+ if (! &Apache::lonmysql::verify_sql_connection()) {
+ my $serveradmin = $r->dir_config('lonAdmEMail');
+ $r->print('<h2><font color="Red">'.
+ &mt('Unable to connect to database!').
+ '</font></h2>');
+ $r->print('<p>'.
+ &mt('Please notify the server administrator ').
+ '<b>'.$serveradmin.'</b></p>');
+ $r->print('<p>'.
+ &mt('Course Statistics and Charts cannot be '.
+ 'retrieved until the database is restarted. '.
+ 'Your data is intact but cannot be displayed '.
+ 'at this time.').'</p>');
+ $r->print('</body></html>');
+ return;
+ }
+ #
+ # Clean out the caches
+ if (exists($ENV{'form.ClearCache'})) {
+ &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
+ }
+ #
+ # Begin form output
+ $r->print('<form name="Statistics" ');
+ $r->print('method="post" action="/adm/statistics">');
+ $r->rflush();
+ #
+ my $GoToPage = $ENV{'form.reportSelected'};
+ #
+ $r->print('<input type="hidden" name="reportSelected" value="'.
+ $GoToPage.'">');
+ if($GoToPage eq 'activitylog') {
# &Apache::lonproblemstatistics::Activity();
- } elsif($GoToPage eq 'problem_statistics') {
- &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);
- } elsif($GoToPage eq 'option_response') {
-# &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);
- } elsif($GoToPage eq 'student_assessment') {
- &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
- } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
-# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);
- } elsif($GoToPage eq 'classlist') {
- &DisplayClasslist($r);
- } elsif($GoToPage eq 'Correct-problems Plot') {
-# &Apache::lonpercentage::BuildPercentageGraph($r,$c);
+ } elsif($GoToPage eq 'problem_statistics') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/statistics?reportselected=problem_statistics',
+ text=>'Overall Problem Statistics'});
+ &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);
+ } elsif($GoToPage eq 'problem_analysis') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/statistics?reportselected=problem_analysis',
+ text=>'Detailed Problem Analysis'});
+ &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);
+ } elsif($GoToPage eq 'submissiontime_analysis') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>
+ '/adm/statistics?reportselected=submissiontime_analysis',
+ text=>'Submission Time Plots'});
+ &Apache::lonsubmissiontimeanalysis::BuildSubmissionTimePage($r,$c);
+ } elsif($GoToPage eq 'student_submission_reports') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>
+ '/adm/statistics?reportselected=student_submission_reports',
+ text=>'Student Submission Reports'});
+ &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
+ } elsif($GoToPage eq 'survey_reports') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>
+ '/adm/statistics?reportselected=survey_reports',
+ text=>'Survey Reports'});
+ &Apache::lonsurveyreports::BuildSurveyReportsPage($r,$c);
+ } elsif($GoToPage eq 'correct_problems_plot') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/statistics?reportselected=correct_problems_plot',
+ text=>'Correct Problems Plot'});
+ &Apache::loncorrectproblemplot::BuildCorrectProblemsPage($r,$c);
+ } elsif($GoToPage eq 'student_assessment') {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/statistics?reportselected=student_assessment',
+ text=>'Chart'});
+ &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
+ }
+ #
+ $r->print("</form>\n");
}
- #
- $r->print("</form>\n");
$r->print("</body>\n</html>\n");
$r->rflush();
#