--- loncom/interface/lonstatistics.pm 2002/08/14 20:42:48 1.46
+++ loncom/interface/lonstatistics.pm 2003/01/12 23:45:47 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.46 2002/08/14 20:42:48 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.58 2003/01/12 23:45:47 minaeibi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,7 +35,7 @@
#
###
-package Apache::lonstatistics;
+package Apache::lonstatistics;
use strict;
use Apache::Constants qw(:common :http);
@@ -47,6 +47,7 @@ use Apache::lonhtmlcommon;
use Apache::lonproblemanalysis;
use Apache::lonproblemstatistics;
use Apache::lonstudentassessment;
+use Apache::lonpercentage;
use HTML::TokeParser;
use GDBM_File;
@@ -73,17 +74,33 @@ sub ProcessFormData{
'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'}} :
@@ -122,7 +139,8 @@ sub ProcessFormData{
'ProblemStatisticsAscend', 'Ascending');
&CheckFormElement($cache, 'ProblemStatisticsSort',
'ProblemStatisticsSort', 'Homework Sets Order');
- &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', 'Hide Legend');
+ &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend',
+ 'Hide Legend');
&CheckFormElement($cache, 'SortProblems', 'SortProblems',
'Sort Within Sequence');
@@ -239,9 +257,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;
@@ -306,7 +326,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.";
@@ -318,14 +338,14 @@ sub PrepareData {
return "Unable to tie hash to db file.";
}
- if(!$isCached) {
+# if(!$isCached) {
my $processTopResourceMapReturn=
- &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c, $r);
+ &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c);
if($processTopResourceMapReturn ne 'OK') {
untie(%cache);
return $processTopResourceMapReturn;
}
- }
+ # }
if($c->aborted()) {
untie(%cache);
@@ -359,41 +379,40 @@ sub PrepareData {
&SpaceColumns($students, $studentInformation, $headings, \%cache);
$cache{'updateTime:columnWidth'}=24;
- if($cache{'download'} ne 'false') {
- my @who = ($cache{'download'});
+ my $download = $cache{'download'};
+ my $downloadAll = $cache{'DownloadAll'};
+ my @allStudents=();
+ if($download ne 'false') {
$cache{'download'} = 'false';
- if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false',
- $cacheDB, 'true',
- 'false', $courseID,
- $r, $c) ne 'OK') {
- untie(%cache);
- return 'Stop at download individual';
- }
- } elsif($cache{'DownloadAll'} ne 'false') {
+ } elsif($downloadAll ne 'false') {
$cache{'DownloadAll'} = 'false';
- my @allStudents;
- if($cache{'DownloadAll'} eq 'sorted') {
+ if($downloadAll eq 'sorted') {
@allStudents = @$students;
} else {
@allStudents = split(':::', $cache{'NamesOfStudents'});
}
- if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents,
- 'false',
- $cacheDB, 'true',
+ }
+
+ 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') {
- untie(%cache);
return 'Stop at download all';
}
}
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
- }
-
- untie(%cache);
-
return ('OK', $students);
}
@@ -405,19 +424,37 @@ sub BuildClasslist {
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,
+ $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">';
@@ -465,8 +502,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";
@@ -505,9 +542,11 @@ 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');
@@ -516,17 +555,17 @@ sub BuildStatistics {
my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
"_$ENV{'user.domain'}_$courseID\_statistics.db";
- $r->print(&Apache::lonhtmlcommon::Title('LON-CAPA Statistics'));
+ $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
- my ($returnValue, $students) = &PrepareData($c, $cacheDB,
- \@studentInformation,
+ my ($returnValue, $students) = &PrepareData($c, $cacheDB,
+ \@studentInformation,
\@headings,$r);
if($returnValue ne 'OK') {
$r->print($returnValue."\n".'</body></html>');
return OK;
}
if(!$c->aborted()) {
- &Apache::loncoursedata::CheckForResidualDownload($cacheDB,
+ &Apache::loncoursedata::CheckForResidualDownload($cacheDB,
'true', 'true',
$courseID,
$r, $c);
@@ -536,8 +575,8 @@ sub BuildStatistics {
if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
$GoToPage = $cache{'reportSelected'};
$reports{'reportSelected'} = $cache{'reportSelected'};
- if(defined($cache{'reportKey'}) &&
- !exists($reports{$cache{'reportKey'}}) &&
+ if(defined($cache{'reportKey'}) &&
+ !exists($reports{$cache{'reportKey'}}) &&
$cache{'reportKey'} ne 'false') {
$reports{$cache{'reportKey'}} = $cache{'reportSelected'};
}
@@ -559,9 +598,9 @@ sub BuildStatistics {
if($GoToPage eq 'Activity Log') {
&Apache::lonproblemstatistics::Activity();
} elsif($GoToPage eq 'Problem Statistics') {
- &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB,
- $students,
- $courseID,
+ &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB,
+ $students,
+ $courseID,
$c,$r);
} elsif($GoToPage eq 'Option Response Analysis') {
&Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r);
@@ -575,7 +614,7 @@ sub BuildStatistics {
\@studentInformation,
$r, $c);
} elsif($GoToPage eq 'Analyze') {
- &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students,
+ &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students,
$courseID, $r);
} elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
my $courseDescription = $ENV{'course.'.$courseID.'.description'};
@@ -587,6 +626,9 @@ sub BuildStatistics {
} elsif($GoToPage eq 'Class list') {
&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 +645,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
@@ -624,7 +673,7 @@ 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');