--- loncom/interface/lonstatistics.pm 2002/07/29 21:00:53 1.35
+++ loncom/interface/lonstatistics.pm 2003/02/25 20:47:47 1.60
@@ -1,7 +1,6 @@
# The LearningOnline Network with CAPA
-# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.35 2002/07/29 21:00:53 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.60 2003/02/25 20:47:47 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,16 +25,39 @@
# http://www.lon-capa.org/
#
# (Navigate problems for statistical reports
-# YEAR=2001
-# 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
-# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
-# YEAR=2002
-# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
-# 5/12,5/14,5/15,5/19,5/26,7/16,25/7,29/7 Behrouz Minaei
#
###
-package Apache::lonstatistics;
+=pod
+
+=head1 NAME
+
+lonstatistics
+
+=head1 SYNOPSIS
+
+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 GDBM_File;
+
+=over 4
+
+=cut
+
+package Apache::lonstatistics;
use strict;
use Apache::Constants qw(:common :http);
@@ -47,10 +69,436 @@ use Apache::lonhtmlcommon;
use Apache::lonproblemanalysis;
use Apache::lonproblemstatistics;
use Apache::lonstudentassessment;
-use Apache::lonchart;
-use HTML::TokeParser;
+use Apache::lonpercentage;
use GDBM_File;
+use vars qw/@FullClasslist @Students @Sections @SelectedSections
+ $curr_student $prev_student $next_student
+ $top_map @Sequences @Assessments /;
+
+#######################################################
+#######################################################
+
+=pod
+
+=item Package Variables
+
+=item @FullClasslist The full classlist
+
+=item @Students The students we are concerned with for this invocation
+
+=item @Sections The sections available in this class
+
+=item $curr_student The student currently being examined
+
+=item $prev_student The student previous in the classlist
+
+=item $next_student The student next in the classlist
+
+=over
+
+=cut
+
+#######################################################
+#######################################################
+#
+# Classlist variables
+#
+my @FullClasslist;
+my @Students;
+my @Sections;
+my @SelectedSections;
+my $curr_student;
+my $prev_student;
+my $next_student;
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &clear_classlist_variables()
+
+undef the following package variables:
+
+=over
+
+=item @FullClasslist
+
+=item @Students
+
+=item @Sections
+
+=item @SelectedSections
+
+=item $curr_student
+
+=item $prev_student
+
+=item $next_student
+
+=back
+
+=cut
+
+#######################################################
+#######################################################
+sub clear_classlist_variables {
+ undef(@FullClasslist);
+ undef(@Students);
+ undef(@Sections);
+ undef(@SelectedSections);
+ undef($curr_student);
+ undef($prev_student);
+ undef($next_student);
+}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &PrepareClasslist()
+
+Build up the classlist information. The classlist information is kept in
+the following package variables:
+
+=over
+
+=item @FullClasslist
+
+=item @Students
+
+=item @Sections
+
+=item @SelectedSections
+
+=item $curr_student
+
+=item $prev_student
+
+=item $next_student
+
+=back
+
+$curr_student, $prev_student, and $next_student may not be defined, depending
+upon the calling context.
+
+=cut
+
+#######################################################
+#######################################################
+sub PrepareClasslist {
+ my $r = shift;
+ my %Sections;
+ &clear_classlist_variables();
+ #
+ # Retrieve the classlist
+ my $cid = $ENV{'request.course.id'};
+ my $cdom = $ENV{'course.'.$cid.'.domain'};
+ my $cnum = $ENV{'course.'.$cid.'.num'};
+ my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cid,
+ $cdom,$cnum);
+ if (exists($ENV{'form.Section'})) {
+ if (ref($ENV{'form.Section'})) {
+ @SelectedSections = @$ENV{'form.Section'};
+ # Remove the empty sections
+ for (my $i=0; $i<=$#SelectedSections; $i++) {
+ if ($SelectedSections[$i] =~ /^\s*$/) {
+ splice(@SelectedSections,$i,1);
+ }
+ }
+ } else {
+ if ($ENV{'form.Section'} !~ /^\s*$/) {
+ @SelectedSections = ($ENV{'form.Section'});
+ }
+ }
+ }
+ @SelectedSections = ('any') if (! @SelectedSections);
+ #
+ # Process the classlist
+ while (my ($student,$student_data) = each (%$classlist)) {
+ my $studenthash = ();
+ for (my $i=0; $i< scalar(@$field_names);$i++) {
+ $studenthash->{$field_names->[$i]}=$student_data->[$i];
+ }
+ push (@FullClasslist,$studenthash);
+ #
+ # Build up a list of sections
+ my $section = $studenthash->{'section'};
+ if (! defined($section) || $section =~/^\s*$/ || $section == -1) {
+ $studenthash->{'section'} = 'none';
+ $section = $studenthash->{'section'};
+ }
+ $Sections{$section}++;
+ #
+ # Only put in the list those students we are interested in
+ foreach my $sect (@SelectedSections) {
+ if (($sect eq 'any') || ($section eq $sect)) {
+ push (@Students,$studenthash);
+ last;
+ }
+ }
+ }
+ #
+ # Put the consolidated section data in the right place
+ @Sections = sort {$a cmp $b} keys(%Sections);
+ #
+ # Sort the Students
+ my $sortby = 'fullname';
+ $sortby = $ENV{'form.sort'} if (exists($ENV{'form.sort'}));
+ my @TmpStudents = sort { $a->{$sortby} cmp $b->{$sortby} ||
+ $a->{'fullname'} cmp $b->{'fullname'} } @Students;
+
+ @Students = @TmpStudents;
+ #
+ # Now deal with that current student thing....
+ if (exists($ENV{'form.StudentAssessmentStudent'})) {
+ my ($current_uname,$current_dom) =
+ split(':',$ENV{'form.StudentAssessmentStudent'});
+ my $i;
+ for ($i = 0; $i<=$#Students; $i++) {
+ next if (($Students[$i]->{'username'} ne $current_uname) ||
+ ($Students[$i]->{'domain'} ne $current_dom));
+ $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];
+ }
+ }
+}
+
+#######################################################
+#######################################################
+#
+# Course Sequences variables
+#
+my $top_map;
+my @Sequences;
+my @Assessments;
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &clear_sequence_variables()
+
+=cut
+
+#######################################################
+#######################################################
+sub clear_sequence_variables {
+ undef($top_map);
+ undef(@Sequences);
+ undef(@Assessments);
+}
+
+#######################################################
+#######################################################
+
+=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 'HASH');
+
+=pod
+
+ ##
+ ## Debugging code
+ ##
+ foreach my $s (@Sequences) {
+ next if ($s->{'title'} ne 'Bioenergetics: Enzyme Regulation');
+ &Apache::lonnet::logthis('-----------------------------------');
+ &Apache::lonnet::logthis('title = '.$s->{'title'});
+ &Apache::lonnet::logthis('symb = '.$s->{'symb'});
+ &Apache::lonnet::logthis('num_assess = '.$s->{'num_assess'});
+ foreach my $a (@{$s->{'contents'}}) {
+ &Apache::lonnet::logthis(' --------------------------------');
+ &Apache::lonnet::logthis(' title = '.$a->{'title'});
+ &Apache::lonnet::logthis(' symb = '.$a->{'symb'});
+ }
+ }
+
+=cut
+
+ return;
+}
+
+##############################################
+##############################################
+
+=pod
+
+=item &MapSelect($elementname,$status,$numvisible,$selected,$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.
+If the top sequence is selected, the value 'top' will result.
+
+=over 4
+
+=item $elementname The name of the HTML form element
+
+=item $status 'multiple' or 'single' selection box
+
+=item $numvisible The number of options to be visible
+
+=item $selected Array ref to the names of the already selected maps.
+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
+
+##############################################
+##############################################
+sub MapSelect {
+ my ($elementname,$status,$numvisible,$selected,$restriction)=@_;
+ if ($numvisible < 1) {
+ return;
+ }
+ #
+ # Set up array of selected items
+ my @Selected;
+ if (! defined($selected)) {
+ if (exists($ENV{'form.'.$elementname})) {
+ if (ref($ENV{'form.'.$elementname})) {
+ @Selected = @$ENV{'form.'.$elementname};
+ } else {
+ @Selected = ($ENV{'form.'.$elementname});
+ }
+ } else {
+ @Selected = ();
+ }
+ } else {
+ if (ref($selected)) {
+ @Selected = @$selected;
+ } else {
+ @Selected = ($selected);
+ }
+ }
+ #
+ # Set up the restriction call
+ if (! defined($restriction)) {
+ $restriction = sub { 1; };
+ }
+ #
+ # Build the form element
+ my $Str = "\n";
+ $Str .= '<select name="'.$elementname.'" ';
+ if ($status ne 'single') {
+ $Str .= 'multiple="true" ';
+ }
+ $Str .= 'size="'.$numvisible.'" >'."\n";
+ #
+ # Loop through the sequences
+ foreach my $s (@Sequences) {
+ next if (! $restriction->($s));
+ $Str .= ' <option value="'.$s->{'symb'}.'" ';
+ foreach (@Selected) {
+ if ($s->{'symb'} eq $_) {
+ $Str .= 'selected ';
+ last;
+ }
+ }
+ $Str .= '>'.$s->{'title'}."</option>\n";
+ }
+ $Str .= "</select>\n";
+ return $Str;
+}
+
+
+##############################################
+##############################################
+
+=pod
+
+=item &SectionSelect($elementname,$status,$numvisible)
+
+Returns html for a selection box allowing the user to choose one (or more)
+of the sections in the course.
+
+=over 4
+
+=item $elementname The name of the HTML form element
+
+=item $status 'multiple' or 'single' selection box
+
+=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
+
+##############################################
+##############################################
+sub SectionSelect {
+ my ($elementname,$status,$numvisible)=@_;
+ if ($numvisible < 1) {
+ return;
+ }
+ #
+ # Build the form element
+ my $Str = "\n";
+ $Str .= '<select name="'.$elementname.'" ';
+ if ($status ne 'single') {
+ $Str .= 'multiple="true" ';
+ }
+ $Str .= 'size="'.$numvisible.'" >'."\n";
+ #
+ # Loop through the sequences
+ foreach my $s (@Sections) {
+ $Str .= ' <option value="'.$s.'" ';
+ foreach (@SelectedSections) {
+ if ($s eq $_ || $_ =~ /^(any|all)$/) {
+ $Str .= 'selected ';
+ last;
+ }
+ }
+ $Str .= '>'.$s."</option>\n";
+ }
+ $Str .= "</select>\n";
+ return $Str;
+}
+
+##############################################
+##############################################
sub CheckFormElement {
my ($cache, $ENVName, $cacheName, $default)=@_;
@@ -59,8 +507,9 @@ sub CheckFormElement {
$cache->{$cacheName} = $ENV{'form.'.$ENVName};
} elsif(!defined($cache->{$cacheName})) {
$cache->{$cacheName} = $default;
+ } else {
+ $ENV{'form.'.$ENVName} = $cache->{$cacheName};
}
-
return;
}
@@ -70,19 +519,47 @@ sub ProcessFormData{
$cache->{'reportKey'} = 'false';
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['sort','download',
+ ['download',
'reportSelected',
- 'StudentAssessmentStudent']);
+ 'StudentAssessmentStudent',
+ 'ProblemStatisticsSort']);
+ &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
+ if ($cache->{'DownloadAll'} ne 'false') {
+ # Clean the hell out of that cache!
+ # We cannot untie the hash at this scope (stupid libgd :( )
+ # So, remove every single key. What a waste of time....
+ # Of course, if you are doing this you are probably resigned
+ # to waiting a while.
+ &Apache::lonnet::logthis("Cleaning out the cache file");
+ while (my ($key,undef)=each(%$cache)) {
+ next if ($key eq 'DownloadAll');
+ delete($cache->{$key});
+ }
+ }
&CheckFormElement($cache, 'Status', 'Status', 'Active');
&CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
&CheckFormElement($cache, 'reportSelected', 'reportSelected',
'Class list');
$cache->{'reportSelected'} =
&Apache::lonnet::unescape($cache->{'reportSelected'});
- &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
&CheckFormElement($cache, 'sort', 'sort', 'fullname');
&CheckFormElement($cache, 'download', 'download', 'false');
+ &CheckFormElement($cache, 'StatisticsMaps',
+ 'StatisticsMaps', 'All Maps');
+ &CheckFormElement($cache, 'StatisticsProblemSelect',
+ 'StatisticsProblemSelect', 'All Problems');
+ &CheckFormElement($cache, 'StatisticsPartSelect',
+ 'StatisticsPartSelect', 'All Parts');
+ if(defined($ENV{'form.Section'})) {
+ my @sectionsSelected = (ref($ENV{'form.Section'}) ?
+ @{$ENV{'form.Section'}} :
+ ($ENV{'form.Section'}));
+ $cache->{'sectionsSelected'} = join(':', @sectionsSelected);
+ } elsif(!defined($cache->{'sectionsSelected'})) {
+ $cache->{'sectionsSelected'} = $cache->{'sectionList'};
+ }
+ # student assessment
if(defined($ENV{'form.CreateStudentAssessment'}) ||
defined($ENV{'form.NextStudent'}) ||
defined($ENV{'form.PreviousStudent'})) {
@@ -101,15 +578,22 @@ sub ProcessFormData{
&Apache::lonnet::unescape($cache->{'StudentAssessmentStudent'});
&CheckFormElement($cache, 'DefaultColumns', 'DefaultColumns', 'false');
- if(defined($ENV{'form.Section'})) {
- my @sectionsSelected = (ref($ENV{'form.Section'}) ?
- @{$ENV{'form.Section'}} :
- ($ENV{'form.Section'}));
- $cache->{'sectionsSelected'} = join(':', @sectionsSelected);
- } elsif(!defined($cache->{'sectionsSelected'})) {
- $cache->{'sectionsSelected'} = $cache->{'sectionList'};
- }
+ # Problem analysis
+ &CheckFormElement($cache, 'Interval', 'Interval', '1');
+ # ProblemStatistcs
+ &CheckFormElement($cache, 'DisplayCSVFormat',
+ 'DisplayFormat', 'Display Table Format');
+ &CheckFormElement($cache, 'ProblemStatisticsAscend',
+ 'ProblemStatisticsAscend', 'Ascending');
+ &CheckFormElement($cache, 'ProblemStatisticsSort',
+ 'ProblemStatisticsSort', 'Homework Sets Order');
+ &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend',
+ 'Hide Legend');
+ &CheckFormElement($cache, 'SortProblems', 'SortProblems',
+ 'Sort Within Sequence');
+
+ # Search only form elements
my @headingColumns=();
my @sequenceColumns=();
my $foundColumn = 0;
@@ -128,18 +612,30 @@ sub ProcessFormData{
}
}
+ $cache->{'reportKey'} = 'false';
+ if($cache->{'reportSelected'} eq 'Analyze') {
+ $cache->{'reportKey'} = 'Analyze';
+ } elsif($cache->{'reportSelected'} eq 'DoDiffGraph') {
+ $cache->{'reportKey'} = 'DoDiffGraph';
+ } elsif($cache->{'reportSelected'} eq 'PercentWrongGraph') {
+ $cache->{'reportKey'} = 'PercentWrongGraph';
+ }
+
+ if(defined($ENV{'form.DoDiffGraph'})) {
+ $cache->{'reportSelected'} = 'DoDiffGraph';
+ $cache->{'reportKey'} = 'DoDiffGraph';
+ } elsif(defined($ENV{'form.PercentWrongGraph'})) {
+ $cache->{'reportSelected'} = 'PercentWrongGraph';
+ $cache->{'reportKey'} = 'PercentWrongGraph';
+ }
+
foreach (keys(%ENV)) {
- if(/form\.Analyze:::/) {
-# $cache->{'reportSelected'} = 'Analyze';
-# $cache->{'reportKey'} = 'Problem Analysis';
- my ($uri, $title, $part, $problem);
- (undef, $uri, $title, $part, $problem)=split(':::', $_);
- $cache->{'AnalyzeURI'} = $uri;
- $cache->{'AnalyzeTitle'} = $title;
- $cache->{'AnalyzePart'} = $part;
- $cache->{'AnalyzeProblem'} = $problem;
-
- &CheckFormElement($cache, 'Interval', 'Interval', '1');
+ if(/form\.Analyze/) {
+ $cache->{'reportSelected'} = 'Analyze';
+ $cache->{'reportKey'} = 'Analyze';
+ my $data;
+ (undef, $data)=split(':::', $_);
+ $cache->{'AnalyzeInfo'}=$data;
} elsif(/form\.HeadingColumn/) {
my $value = $_;
$value =~ s/form\.//;
@@ -168,34 +664,6 @@ sub ProcessFormData{
$cache->{'DefaultColumns'} = 'false';
return;
-
- # Select page to display
- if(defined($ENV{'form.ProblemStatistics'}) ||
- defined($ENV{'form.ProblemStatisticsRecalculate'}) ||
- defined($ENV{'form.DisplayCSVFormat'})) {
- $cache->{'GoToPage'} = 'ProblemStatistics';
- &CheckFormElement($cache, 'DisplayCSVFormat',
- 'DisplayFormat', 'Display Table Format');
- &CheckFormElement($cache, 'Ascend','ProblemStatisticsAscend',
- 'Ascending');
- &CheckFormElement($cache, 'Maps', 'ProblemStatisticsMap',
- 'All Maps');
- } elsif(defined($ENV{'form.ProblemAnalysis'})) {
- $cache->{'GoToPage'} = 'ProblemAnalysis';
- &CheckFormElement($cache, 'Interval', 'Interval', '1');
- } elsif(defined($ENV{'form.DoDiffGraph'})) {
- $cache->{'GoToPage'} = 'DoDiffGraph';
- } elsif(defined($ENV{'form.PercentWrongGraph'})) {
- $cache->{'GoToPage'} = 'PercentWrongGraph';
- } elsif(defined($ENV{'form.ActivityLog'})) {
- $cache->{'GoToPage'} = 'ActivityLog';
- } else {
- $cache->{'GoToPage'} = 'Menu';
- }
-
- &CheckFormElement($cache, 'Status', 'Status', 'Active');
-
- return;
}
=pod
@@ -238,9 +706,11 @@ sub SortStudents {
my $sortBy = '';
if(defined($cache->{'sort'})) {
$sortBy = ':'.$cache->{'sort'};
+ } else {
+ $sortBy = ':fullname';
}
- my @order = sort { $cache->{$a.$sortBy} cmp $cache->{$b.$sortBy} ||
- $cache->{$a.':fullname'} cmp $cache->{$b.':fullname'} }
+ my @order = sort { lc($cache->{$a.$sortBy}) cmp lc($cache->{$b.$sortBy}) ||
+ lc($cache->{$a.':fullname'}) cmp lc($cache->{$b.':fullname'}) }
@sorted1Students;
return \@order;
@@ -296,7 +766,7 @@ sub SpaceColumns {
}
sub PrepareData {
- my ($c, $cacheDB, $studentInformation, $headings)=@_;
+ my ($c, $cacheDB, $studentInformation, $headings,$r)=@_;
# Test for access to the cache data
my $courseID=$ENV{'request.course.id'};
@@ -305,7 +775,7 @@ sub PrepareData {
$isRecalculate=1;
}
- my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB,
+ my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB,
$isRecalculate);
if($isCached < 0) {
return "Unable to tie hash to db file.";
@@ -313,18 +783,18 @@ sub PrepareData {
# Download class list information if not using cached data
my %cache;
- unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
+ unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
return "Unable to tie hash to db file.";
}
- if(!$isCached) {
+# if(!$isCached) {
my $processTopResourceMapReturn=
&Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c);
if($processTopResourceMapReturn ne 'OK') {
untie(%cache);
return $processTopResourceMapReturn;
}
- }
+ # }
if($c->aborted()) {
untie(%cache);
@@ -358,102 +828,130 @@ sub PrepareData {
&SpaceColumns($students, $studentInformation, $headings, \%cache);
$cache{'updateTime:columnWidth'}=24;
- if($cache{'download'} ne 'false') {
- my $who = $cache{'download'};
- my $courseData =
- &Apache::loncoursedata::DownloadCourseInformation(
- $who, $courseID,
- $cache{$who.':lastDownloadTime'});
- &Apache::loncoursedata::ProcessStudentData(\%cache, $courseData, $who);
+ my $download = $cache{'download'};
+ my $downloadAll = $cache{'DownloadAll'};
+ my @allStudents=();
+ if($download ne 'false') {
$cache{'download'} = 'false';
- } elsif($cache{'DownloadAll'} ne 'false') {
- my @allStudents;
- if($cache{'DownloadAll'} eq 'sorted') {
+ } elsif($downloadAll ne 'false') {
+ $cache{'DownloadAll'} = 'false';
+ if($downloadAll eq 'sorted') {
@allStudents = @$students;
} else {
@allStudents = split(':::', $cache{'NamesOfStudents'});
}
- foreach (@allStudents) {
- my $courseData =
- &Apache::loncoursedata::DownloadCourseInformation(
- $_, $courseID,
- $cache{$_.':lastDownloadTime'});
- &Apache::loncoursedata::ProcessStudentData(\%cache, $courseData,
- $_);
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
- }
- }
- $cache{'DownloadAll'} = 'false';
- }
-
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
}
untie(%cache);
+ if($download ne 'false') {
+ my @who = ($download);
+ if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false',
+ $cacheDB, 'true',
+ 'false', $courseID,
+ $r, $c) ne 'OK') {
+ return 'Stop at download individual';
+ }
+ } elsif($downloadAll ne 'false') {
+ if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents,
+ 'false',
+ $cacheDB, 'true',
+ 'true', $courseID,
+ $r, $c) ne 'OK') {
+ return 'Stop at download all';
+ }
+ }
+
return ('OK', $students);
}
-
-# Create progress
-sub Create_PrgWin {
+sub DisplayClasslist {
my ($r)=@_;
- $r->print(<<ENDPOP);
- <script>
- popwin=open('','popwin','width=400,height=100');
- popwin.document.writeln('<html><body bgcolor="#88DDFF">'+
- '<title>LON-CAPA Statistics</title>'+
- '<h4>Computation Progress</h4>'+
- '<form name=popremain>'+
- '<input type=text size=35 name=remaining value=Starting></form>'+
- '</body></html>');
- popwin.document.close();
- </script>
-ENDPOP
-
- $r->rflush();
-}
-
-# update progress
-sub Update_PrgWin {
- my ($totalStudents,$index,$name,$r)=@_;
- $r->print('<script>popwin.document.popremain.remaining.value="'.
- 'Computing '.$index.'/'.$totalStudents.': '.
- $name.'";</script>');
+ #
+ my @Fields = ('fullname','username','domain','id','section');
+ #
+ my $Str='';
+ $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?sort='.$field.'">'.$field.
+ '</a></th>';
+ }
+ $Str .= '</tr>'."\n";
+ #
+ my $alternate = 0;
+ foreach my $student (@Students) {
+ my $sname = $student->{'username'}.':'.$student->{'domain'};
+ if($alternate) {
+ $Str .= '<tr bgcolor="#ffffe6">';
+ } else {
+ $Str .= '<tr bgcolor="#ffffc6">';
+ }
+ $alternate = ($alternate + 1) % 2;
+ #
+ foreach my $field (@Fields) {
+ $Str .= '<td>';
+ if ($field eq 'fullname') {
+ $Str .= '<a href="/adm/statistics?reportSelected=';
+ $Str .= &Apache::lonnet::escape('Student Assessment');
+ $Str .= '&StudentAssessmentStudent=';
+ $Str .= &Apache::lonnet::escape($student->{$field}).'">';
+ $Str .= $student->{$field}.' ';
+ $Str .= '</a>';
+ } else {
+ $Str .= $student->{$field};
+ }
+ $Str .= '</td>';
+ }
+ $Str .= "</tr>\n";
+ }
+ $Str .= '</table></td></tr></table>'."\n";
+ #
+ $r->print($Str);
$r->rflush();
+ #
+ return;
}
-# close Progress Line
-sub Close_PrgWin {
- my ($r)=@_;
- $r->print('<script>popwin.close()</script>');
- $r->rflush();
-}
-
-
sub BuildClasslist {
- my ($cacheDB,$students,$studentInformation,$headings)=@_;
+ my ($cacheDB,$students,$studentInformation,$headings,$r)=@_;
my %cache;
- unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+ unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
return '<html><body>Unable to tie database.</body></html>';
}
+# my $Ptr = '';
+# $Ptr .= '<table border="0"><tbody>';
+# $Ptr .= '<tr><td align="right"><b>Select Sections</b>';
+# $Ptr .= '</td>'."\n";
+# $Ptr .= '<td align="left">'."\n";
+# my @sectionsSelected = split(':',$cache{'sectionsSelected'});
+# my @sections = split(':',$cache{'sectionList'});
+# $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
+# \@sectionsSelected,
+# 'Statistics');
+# $Ptr .= '</td></tr></table><br>';
+# $r->print($Ptr);
+# $r->rflush();
+# my %mySections = ();
+# foreach (@sections) { $mySections{$_} = 'True'; }
+# $r->print("<br>$cache{'sectionsSelected'}<br>");
+
my $Str='';
$Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
my $displayString = '<td align="left"><a href="/adm/statistics?';
$displayString .= 'sort=LINKDATA">DISPLAYDATA </a></td>'."\n";
- $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, $studentInformation,
+ $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache,
+ $studentInformation,
$headings, $displayString);
$Str .= '</tr>'."\n";
+
my $alternate=0;
foreach (@$students) {
+# if ($mySections{$cache{$_.':'.'section'}} ne 'True') {next;}
my ($username, $domain) = split(':', $_);
if($alternate) {
$Str .= '<tr bgcolor="#ffffe6">';
@@ -486,10 +984,12 @@ sub BuildClasslist {
$Str .= '</tr>'."\n";
$Str .= '</table></td></tr></table>'."\n";
+ $r->print($Str);
+ $r->rflush();
untie(%cache);
- return $Str;
+ return;
}
sub CreateMainMenu {
@@ -499,8 +999,8 @@ sub CreateMainMenu {
$Str .= '<table border="0"><tbody><tr>'."\n";
$Str .= '<td></td><td></td>'."\n";
- $Str .= '<td align="center"><b>Analysis Reports:</b></td>'."\n";
- $Str .= '<td align="center"><b>Student Status:</b></td></tr>'."\n";
+ $Str .= '<td align="center"><b>Select a Report</b></td>'."\n";
+ $Str .= '<td align="center"><b>Student Status</b></td></tr>'."\n";
$Str .= '<tr>'."\n";
$Str .= '<td align="center"><input type="submit" name="Refresh" ';
$Str .= 'value="Refresh" /></td>'."\n";
@@ -539,9 +1039,12 @@ sub BuildStatistics {
my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name',
'Last Updated');
my $spacing = ' ';
+
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
'student_assessment' => 'Student Assessment',
+ 'percentage' => 'Correct-problems Plot',
+# 'activitylog' => 'Activity Log',
'reportSelected' => 'Class list');
my %cache;
@@ -549,30 +1052,40 @@ sub BuildStatistics {
my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
"_$ENV{'user.domain'}_$courseID\_statistics.db";
- my ($returnValue, $students) = &PrepareData($c, $cacheDB,
- \@studentInformation,
- \@headings);
+ $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
+
+ my ($returnValue, $students) = &PrepareData($c, $cacheDB,
+ \@studentInformation,
+ \@headings,$r);
if($returnValue ne 'OK') {
- $r->print('<html><body>'.$returnValue."\n".'</body></html>');
+ $r->print($returnValue."\n".'</body></html>');
return OK;
}
+ if(!$c->aborted()) {
+ &Apache::loncoursedata::CheckForResidualDownload($cacheDB,
+ 'true', 'true',
+ $courseID,
+ $r, $c);
+ }
my $GoToPage;
- if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+ if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
$GoToPage = $cache{'reportSelected'};
$reports{'reportSelected'} = $cache{'reportSelected'};
-# if(defined($cache{'reportKey'}) && $cache{'reportKey'} ne 'false') {
-# $reports{$cache{'reportKey'}} = $cache{'reportSelected'};
-# }
+ if(defined($cache{'reportKey'}) &&
+ !exists($reports{$cache{'reportKey'}}) &&
+ $cache{'reportKey'} ne 'false') {
+ $reports{$cache{'reportKey'}} = $cache{'reportSelected'};
+ }
if(defined($cache{'OptionResponses'})) {
- $reports{'problem_analysis'} = 'Problem Analysis';
+ $reports{'problem_analysis'} = 'Option Response Analysis';
}
- $r->print(&Apache::lonhtmlcommon::Title('LON-CAPA Statistics'));
$r->print('<form name="Statistics" ');
$r->print('method="post" action="/adm/statistics">');
$r->print(&CreateMainMenu($cache{'Status'}, \%reports));
+ $r->rflush();
untie(%cache);
} else {
$r->print('<html><body>Unable to tie database.</body></html>');
@@ -582,35 +1095,38 @@ sub BuildStatistics {
if($GoToPage eq 'Activity Log') {
&Apache::lonproblemstatistics::Activity();
} elsif($GoToPage eq 'Problem Statistics') {
- $r->print(
- &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB,
- $students,
- $courseID,
- $c,$r));
- } elsif($GoToPage eq 'Problem Analysis') {
- $r->print(
- &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB));
+ &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB,
+ $students,
+ $courseID,
+ $c,$r);
+ } elsif($GoToPage eq 'Option Response Analysis') {
+ &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r);
} elsif($GoToPage eq 'Student Assessment') {
- $r->print(
- &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
- $students,
- $courseID,
- 'Statistics',
- \@headings,
- $spacing,
- \@studentInformation,
- $r, $c));
+ &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
+ $students,
+ $courseID,
+ 'Statistics',
+ \@headings,
+ $spacing,
+ \@studentInformation,
+ $r, $c);
} elsif($GoToPage eq 'Analyze') {
- $r->print(&Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB,
- $students,
- $courseID));
- } elsif($GoToPage eq 'DoDiffGraph') {
- &Apache::lonproblemstatistics::BuildDiffGraph($r);
- } elsif($GoToPage eq 'PercentWrongGraph') {
- &Apache::lonproblemstatistics::BuildWrongGraph($r);
+ &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students,
+ $courseID, $r);
+ } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
+ my $courseDescription = $ENV{'course.'.$courseID.'.description'};
+ $courseDescription =~ s/\ /"_"/eg;
+ &Apache::lonproblemstatistics::BuildGraphicChart($GoToPage, $cacheDB,
+ $courseDescription,
+ $students, $courseID,
+ $r, $c);
} elsif($GoToPage eq 'Class list') {
- $r->print(&BuildClasslist($cacheDB, $students, \@studentInformation,
- \@headings));
+ &DisplayClasslist($r);
+# &BuildClasslist($cacheDB, $students, \@studentInformation,
+# \@headings, $r);
+ } elsif($GoToPage eq 'Correct-problems Plot') {
+ &Apache::lonpercentage::BuildPercentageGraph($cacheDB, $students,
+ $courseID, $c, $r);
}
$r->print('</form>'."\n");
@@ -627,10 +1143,17 @@ sub handler {
# $jr = $r;
+ my $loaderror=&Apache::lonnet::overloaderror($r);
+ if ($loaderror) { return $loaderror; }
+ $loaderror=
+ &Apache::lonnet::overloaderror($r,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+ if ($loaderror) { return $loaderror; }
+
unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
$ENV{'user.error.msg'}=
$r->uri.":vgr:0:0:Cannot view grades for complete course";
- return HTTP_NOT_ACCEPTABLE;
+ return HTTP_NOT_ACCEPTABLE;
}
# Set document type for header only
@@ -648,16 +1171,30 @@ sub handler {
unless($ENV{'request.course.fn'}) {
my $requrl=$r->uri;
$ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
- return HTTP_NOT_ACCEPTABLE;
+ return HTTP_NOT_ACCEPTABLE;
}
$r->content_type('text/html');
$r->send_http_header;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['sort']);
+
+ &PrepareClasslist($r);
+
+ &PrepareCourseData($r);
+
&BuildStatistics($r);
return OK;
}
1;
+
+=pod
+
+=back
+
+=cut
+
__END__