--- loncom/interface/lonstatistics.pm 2002/07/30 21:31:48 1.37
+++ 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.37 2002/07/30 21:31:48 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.39 2002/08/05 20:53:38 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -83,6 +83,7 @@ sub ProcessFormData{
&CheckFormElement($cache, 'sort', 'sort', 'fullname');
&CheckFormElement($cache, 'download', 'download', 'false');
+ # student assessment
if(defined($ENV{'form.CreateStudentAssessment'}) ||
defined($ENV{'form.NextStudent'}) ||
defined($ENV{'form.PreviousStudent'})) {
@@ -110,6 +111,18 @@ sub ProcessFormData{
$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, 'ProblemStatisticsMaps',
+ 'ProblemStatisticsMaps', 'All Maps');
+
+ # Search only form elements
my @headingColumns=();
my @sequenceColumns=();
my $foundColumn = 0;
@@ -131,6 +144,18 @@ 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)) {
@@ -140,8 +165,6 @@ sub ProcessFormData{
my $data;
(undef, $data)=split(':::', $_);
$cache->{'AnalyzeInfo'}=$data;
-
- &CheckFormElement($cache, 'Interval', 'Interval', '1');
} elsif(/form\.HeadingColumn/) {
my $value = $_;
$value =~ s/form\.//;
@@ -170,34 +193,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
@@ -298,7 +293,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'};
@@ -315,13 +310,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;
@@ -369,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,
@@ -386,8 +385,9 @@ sub PrepareData {
untie(%cache);
return 'aborted';
}
+ $count++;
}
- $cache{'DownloadAll'} = 'false';
+ &Close_PrgWin($r);
}
if($c->aborted()) {
@@ -438,10 +438,10 @@ 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)) {
+ unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
return '<html><body>Unable to tie database.</body></html>';
}
@@ -451,9 +451,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(':', $_);
@@ -488,10 +490,12 @@ sub BuildClasslist {
$Str .= '</tr>'."\n";
$Str .= '</table></td></tr></table>'."\n";
+ $r->print($Str);
+ $r->rflush();
untie(%cache);
- return $Str;
+ return;
}
sub CreateMainMenu {
@@ -544,6 +548,7 @@ sub BuildStatistics {
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
'student_assessment' => 'Student Assessment',
+ 'activitylog' => 'Activity Log',
'reportSelected' => 'Class list');
my %cache;
@@ -553,14 +558,14 @@ sub BuildStatistics {
my ($returnValue, $students) = &PrepareData($c, $cacheDB,
\@studentInformation,
- \@headings);
+ \@headings,$r);
if($returnValue ne 'OK') {
$r->print('<html><body>'.$returnValue."\n".'</body></html>');
return OK;
}
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'}) &&
@@ -577,6 +582,7 @@ sub BuildStatistics {
$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>');
@@ -591,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('</form>'."\n");