--- loncom/interface/lonstatistics.pm 2002/07/29 21:00:53 1.35
+++ loncom/interface/lonstatistics.pm 2002/08/14 17:45:19 1.45
@@ -1,7 +1,7 @@
# 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.45 2002/08/14 17:45:19 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,6 @@ use Apache::lonhtmlcommon;
use Apache::lonproblemanalysis;
use Apache::lonproblemstatistics;
use Apache::lonstudentassessment;
-use Apache::lonchart;
use HTML::TokeParser;
use GDBM_File;
@@ -72,7 +71,8 @@ sub ProcessFormData{
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['sort','download',
'reportSelected',
- 'StudentAssessmentStudent']);
+ 'StudentAssessmentStudent',
+ 'ProblemStatisticsSort']);
&CheckFormElement($cache, 'Status', 'Status', 'Active');
&CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
&CheckFormElement($cache, 'reportSelected', 'reportSelected',
@@ -82,7 +82,18 @@ sub ProcessFormData{
&CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
&CheckFormElement($cache, 'sort', 'sort', 'fullname');
&CheckFormElement($cache, 'download', 'download', 'false');
+ &CheckFormElement($cache, 'StatisticsMaps',
+ 'StatisticsMaps', 'All Maps');
+ 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 +112,21 @@ 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 +145,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 +197,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
@@ -296,7 +297,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'};
@@ -313,13 +314,13 @@ 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) {
my $processTopResourceMapReturn=
- &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c);
+ &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c, $r);
if($processTopResourceMapReturn ne 'OK') {
untie(%cache);
return $processTopResourceMapReturn;
@@ -359,33 +360,31 @@ sub PrepareData {
$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 @who = ($cache{'download'});
$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') {
+ $cache{'DownloadAll'} = 'false';
my @allStudents;
if($cache{'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';
- }
+ if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents,
+ 'false',
+ $cacheDB, 'true',
+ 'true', $courseID,
+ $r, $c) ne 'OK') {
+ untie(%cache);
+ return 'Stop at download all';
}
- $cache{'DownloadAll'} = 'false';
}
if($c->aborted()) {
@@ -398,48 +397,11 @@ sub PrepareData {
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();
-}
-
-
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>';
}
@@ -449,9 +411,11 @@ sub BuildClasslist {
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) {
my ($username, $domain) = split(':', $_);
@@ -486,10 +450,12 @@ sub BuildClasslist {
$Str .= '</tr>'."\n";
$Str .= '</table></td></tr></table>'."\n";
+ $r->print($Str);
+ $r->rflush();
untie(%cache);
- return $Str;
+ return;
}
sub CreateMainMenu {
@@ -542,6 +508,7 @@ sub BuildStatistics {
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
'student_assessment' => 'Student Assessment',
+# 'activitylog' => 'Activity Log',
'reportSelected' => 'Class list');
my %cache;
@@ -549,30 +516,40 @@ 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'));
+
my ($returnValue, $students) = &PrepareData($c, $cacheDB,
\@studentInformation,
- \@headings);
+ \@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';
}
- $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 +559,34 @@ 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));
+ $c,$r);
} elsif($GoToPage eq 'Problem Analysis') {
- $r->print(
- &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB));
+ &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);
}
$r->print('</form>'."\n");