--- loncom/interface/lonstatistics.pm 2002/08/01 20:49:06 1.38
+++ loncom/interface/lonstatistics.pm 2002/08/13 12:21:46 1.42
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.38 2002/08/01 20:49:06 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.42 2002/08/13 12:21:46 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',
@@ -121,6 +121,9 @@ sub ProcessFormData{
'ProblemStatisticsAscend', 'Ascending');
&CheckFormElement($cache, 'ProblemStatisticsMaps',
'ProblemStatisticsMaps', 'All Maps');
+ &CheckFormElement($cache, 'ProblemStatisticsSort',
+ 'ProblemStatisticsSort', 'Homework Sets Order');
+ &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', 'Hide Legend');
# Search only form elements
my @headingColumns=();
@@ -356,33 +359,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()) {
@@ -395,45 +396,8 @@ 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)) {
@@ -446,9 +410,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(':', $_);
@@ -483,10 +449,12 @@ sub BuildClasslist {
$Str .= '</tr>'."\n";
$Str .= '</table></td></tr></table>'."\n";
+ $r->print($Str);
+ $r->rflush();
untie(%cache);
- return $Str;
+ return;
}
sub CreateMainMenu {
@@ -539,7 +507,7 @@ sub BuildStatistics {
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
'student_assessment' => 'Student Assessment',
- 'activitylog' => 'Activity Log',
+# 'activitylog' => 'Activity Log',
'reportSelected' => 'Class list');
my %cache;
@@ -547,13 +515,21 @@ 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,$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)) {
@@ -569,10 +545,10 @@ sub BuildStatistics {
$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>');
@@ -587,29 +563,24 @@ sub BuildStatistics {
$courseID,
$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,
+ &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
$students,
$courseID,
'Statistics',
\@headings,
$spacing,
\@studentInformation,
- $r, $c));
+ $r, $c);
} elsif($GoToPage eq 'Analyze') {
- $r->print(&Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB,
- $students,
- $courseID,$r));
- } 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') {
+ &Apache::lonproblemstatistics::BuildGraphicChart($GoToPage,$r,$cacheDB);
} elsif($GoToPage eq 'Class list') {
- $r->print(&BuildClasslist($cacheDB, $students, \@studentInformation,
- \@headings));
+ &BuildClasslist($cacheDB, $students, \@studentInformation,
+ \@headings, $r);
}
$r->print('</form>'."\n");