--- loncom/interface/lonstatistics.pm 2002/08/01 20:49:06 1.38 +++ loncom/interface/lonstatistics.pm 2002/08/05 20:53:38 1.39 @@ -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.39 2002/08/05 20:53:38 stredwic Exp $ # # Copyright Michigan State University Board of Trustees # @@ -364,13 +364,17 @@ sub PrepareData { &Apache::loncoursedata::ProcessStudentData(\%cache, $courseData, $who); $cache{'download'} = 'false'; } elsif($cache{'DownloadAll'} ne 'false') { + $cache{'DownloadAll'} = 'false'; my @allStudents; if($cache{'DownloadAll'} eq 'sorted') { @allStudents = @$students; } else { @allStudents = split(':::', $cache{'NamesOfStudents'}); } + &Create_PrgWin($r); + my $count=1; foreach (@allStudents) { + &Update_PrgWin(scalar(@allStudents),$count,$_,$r); my $courseData = &Apache::loncoursedata::DownloadCourseInformation( $_, $courseID, @@ -381,8 +385,9 @@ sub PrepareData { untie(%cache); return 'aborted'; } + $count++; } - $cache{'DownloadAll'} = 'false'; + &Close_PrgWin($r); } if($c->aborted()) { @@ -433,7 +438,7 @@ sub Close_PrgWin { 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 +451,11 @@ sub BuildClasslist { my $displayString = 'DISPLAYDATA '."\n"; - $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, $studentInformation, + $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, + $studentInformation, $headings, $displayString); $Str .= ''."\n"; + my $alternate=0; foreach (@$students) { my ($username, $domain) = split(':', $_); @@ -483,10 +490,12 @@ sub BuildClasslist { $Str .= ''."\n"; $Str .= ''."\n"; + $r->print($Str); + $r->rflush(); untie(%cache); - return $Str; + return; } sub CreateMainMenu { @@ -573,6 +582,7 @@ sub BuildStatistics { $r->print('
print('method="post" action="/adm/statistics">'); $r->print(&CreateMainMenu($cache{'Status'}, \%reports)); + $r->rflush(); untie(%cache); } else { $r->print('Unable to tie database.'); @@ -587,29 +597,26 @@ 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)); + &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students, + $courseID, $r); } elsif($GoToPage eq 'DoDiffGraph') { &Apache::lonproblemstatistics::BuildDiffGraph($r); } elsif($GoToPage eq 'PercentWrongGraph') { &Apache::lonproblemstatistics::BuildWrongGraph($r); } elsif($GoToPage eq 'Class list') { - $r->print(&BuildClasslist($cacheDB, $students, \@studentInformation, - \@headings)); + &BuildClasslist($cacheDB, $students, \@studentInformation, + \@headings, $r); } $r->print('
'."\n");