--- loncom/interface/lonstatistics.pm 2002/07/26 16:22:09 1.33
+++ loncom/interface/lonstatistics.pm 2003/02/18 20:27:33 1.59
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.33 2002/07/26 16:22:09 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.59 2003/02/18 20:27:33 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,11 +31,40 @@
# 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 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 +76,163 @@ use Apache::lonhtmlcommon;
use Apache::lonproblemanalysis;
use Apache::lonproblemstatistics;
use Apache::lonstudentassessment;
-use Apache::lonchart;
-use HTML::TokeParser;
+use Apache::lonpercentage;
use GDBM_File;
+my @FullClasslist;
+my @Students;
+my @Sections;
+my $curr_student;
+my $prev_student;
+my $next_student;
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &clear_classlist_variables()
+
+undef the following package variables:
+
+=over
+
+=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
+
+=back
+
+=cut
+
+#######################################################
+#######################################################
+sub clear_classlist_variables {
+ undef(@FullClasslist);
+ undef(@Students);
+ undef(@Sections);
+ 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 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
+
+=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);
+ my %valid_section;
+ if (exists($ENV{'form.Section'}) && $ENV{'form.Section'} !~ /(all|any)/) {
+ if (ref($ENV{'form.Section'})) {
+ foreach (@$ENV{'form.section'}) {
+ $valid_section{$_}++;
+ }
+ } else {
+ $valid_section{$_}++;
+ }
+ }
+ #
+ # 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'};
+ $section = 'no section' if (! defined($section) || $section =~/^\s*/ );
+ $Sections{$section}++;
+ #
+ # Only put in the list those students we are interested in
+ if (defined($ENV{'form.Section'}) &&
+ $ENV{'form.Section'} !~ /(all|any)/ &&
+ ! exists($valid_section{$section})) {
+ next;
+ }
+ push (@Students,$studenthash);
+ }
+ #
+ # Put the consolidated section data in the right place
+ @Sections = sort {$a<=>$b} keys(%Sections);
+ #
+ # Sort the Students
+ my $sortby = 'fullname';
+ @Students = sort {$a->{$sortby} <=> $b->{$sortby}} @Students;
+ #
+ # 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));
+ 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];
+ }
+ }
+}
+
+#######################################################
+#######################################################
sub CheckFormElement {
my ($cache, $ENVName, $cacheName, $default)=@_;
@@ -70,18 +252,47 @@ sub ProcessFormData{
$cache->{'reportKey'} = 'false';
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['sort','download','reportSelected',
- 'StudentAssessmentStudent']);
+ ['sort','download',
+ 'reportSelected',
+ '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'})) {
@@ -98,58 +309,92 @@ sub ProcessFormData{
'StudentAssessmentStudent', 'All Students');
$cache->{'StudentAssessmentStudent'} =
&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');
- 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');
+ # 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;
+ if(defined($ENV{'form.ReselectColumns'})) {
+ my @reselected = (ref($ENV{'form.ReselectColumns'}) ?
+ @{$ENV{'form.ReselectColumns'}}
+ : ($ENV{'form.ReselectColumns'}));
+ foreach (@reselected) {
+ if(/HeadingColumn/) {
+ push(@headingColumns, $_);
+ $foundColumn = 1;
+ } elsif(/SequenceColumn/) {
+ push(@sequenceColumns, $_);
+ $foundColumn = 1;
+ }
}
}
- return;
+ $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';
+ }
- # 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';
+ if(defined($ENV{'form.DoDiffGraph'})) {
+ $cache->{'reportSelected'} = 'DoDiffGraph';
+ $cache->{'reportKey'} = 'DoDiffGraph';
} elsif(defined($ENV{'form.PercentWrongGraph'})) {
- $cache->{'GoToPage'} = 'PercentWrongGraph';
- } elsif(defined($ENV{'form.ActivityLog'})) {
- $cache->{'GoToPage'} = 'ActivityLog';
- } else {
- $cache->{'GoToPage'} = 'Menu';
+ $cache->{'reportSelected'} = 'PercentWrongGraph';
+ $cache->{'reportKey'} = 'PercentWrongGraph';
}
- &CheckFormElement($cache, 'Status', 'Status', 'Active');
+ foreach (keys(%ENV)) {
+ 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\.//;
+ push(@headingColumns, $value);
+ $foundColumn=1;
+ } elsif(/form\.SequenceColumn/) {
+ my $value = $_;
+ $value =~ s/form\.//;
+ push(@sequenceColumns, $value);
+ $foundColumn=1;
+ }
+ }
+
+ if($foundColumn) {
+ $cache->{'HeadingsFound'} = join(':', @headingColumns);
+ $cache->{'SequencesFound'} = join(':', @sequenceColumns);;
+ }
+ if(!defined($cache->{'HeadingsFound'}) ||
+ $cache->{'DefaultColumns'} ne 'false') {
+ $cache->{'HeadingsFound'}='HeadingColumnFull Name';
+ }
+ if(!defined($cache->{'SequencesFound'}) ||
+ $cache->{'DefaultColumns'} ne 'false') {
+ $cache->{'SequencesFound'}='All Sequences';
+ }
+ $cache->{'DefaultColumns'} = 'false';
return;
}
@@ -194,9 +439,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;
@@ -252,7 +499,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'};
@@ -261,7 +508,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.";
@@ -269,18 +516,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);
@@ -314,122 +561,82 @@ 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);
- return ('OK', $students);
-}
-
-
-# Create progress
-sub Create_PrgWin {
- 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>');
- $r->rflush();
-}
-
-# close Progress Line
-sub Close_PrgWin {
- my ($r)=@_;
- $r->print('<script>popwin.close()</script>');
- $r->rflush();
-}
-
-# For loading the colored table for display or un-colored for print
-sub setbgcolor {
- my $PrintTable=shift;
- my %color;
- if ($PrintTable){
- $color{"gb"}="#FFFFFF";
- $color{"red"}="#FFFFFF";
- $color{"yellow"}="#FFFFFF";
- $color{"green"}="#FFFFFF";
- $color{"purple"}="#FFFFFF";
- } else {
- $color{"gb"}="#DDFFFF";
- $color{"red"}="#FFDDDD";
- $color{"yellow"}="#EEFFCC";
- $color{"green"}="#DDFFDD";
- $color{"purple"}="#FFDDFF";
+ 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 \%color;
+ return ('OK', $students);
}
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">';
@@ -462,10 +669,12 @@ sub BuildClasslist {
$Str .= '</tr>'."\n";
$Str .= '</table></td></tr></table>'."\n";
+ $r->print($Str);
+ $r->rflush();
untie(%cache);
- return $Str;
+ return;
}
sub CreateMainMenu {
@@ -475,8 +684,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";
@@ -515,9 +724,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;
@@ -525,31 +737,40 @@ sub BuildStatistics {
my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
"_$ENV{'user.domain'}_$courseID\_statistics.db";
- my %color=&setbgcolor(0);
- 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>');
@@ -559,36 +780,37 @@ 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,
- \%color));
- } 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));
+ &BuildClasslist($cacheDB, $students, \@studentInformation,
+ \@headings, $r);
+ } elsif($GoToPage eq 'Correct-problems Plot') {
+ &Apache::lonpercentage::BuildPercentageGraph($cacheDB, $students,
+ $courseID, $c, $r);
}
$r->print('</form>'."\n");
@@ -603,10 +825,19 @@ sub BuildStatistics {
sub handler {
my $r=shift;
+# $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
@@ -624,16 +855,25 @@ 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;
+ &PrepareClasslist($r);
+
&BuildStatistics($r);
return OK;
}
1;
+
+=pod
+
+=back
+
+=cut
+
__END__