[LON-CAPA-cvs] cvs: loncom /interface lonstatistics.pm
minaeibi
lon-capa-cvs@mail.lon-capa.org
Tue, 26 Nov 2002 18:02:38 -0000
minaeibi Tue Nov 26 13:02:38 2002 EDT
Modified files:
/loncom/interface lonstatistics.pm
Log:
cleaning up the code.
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.54 loncom/interface/lonstatistics.pm:1.55
--- loncom/interface/lonstatistics.pm:1.54 Mon Nov 18 15:39:46 2002
+++ loncom/interface/lonstatistics.pm Tue Nov 26 13:02:38 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.54 2002/11/18 20:39:46 matthew Exp $
+# $Id: lonstatistics.pm,v 1.55 2002/11/26 18:02:38 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);
@@ -314,7 +314,7 @@
$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.";
@@ -385,16 +385,16 @@
if($download ne 'false') {
my @who = ($download);
- if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false',
- $cacheDB, 'true',
+ 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',
+ if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents,
+ 'false',
+ $cacheDB, 'true',
'true', $courseID,
$r, $c) ne 'OK') {
return 'Stop at download all';
@@ -412,19 +412,37 @@
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">';
@@ -511,7 +529,7 @@
'updateTime');
my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name',
'Last Updated');
- my $spacing = ' ';
+ my $spacing = ' ';
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
@@ -527,15 +545,15 @@
$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);
@@ -545,8 +563,8 @@
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'};
}
@@ -568,9 +586,9 @@
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);
@@ -584,7 +602,7 @@
\@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'};
@@ -625,7 +643,7 @@
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
@@ -643,7 +661,7 @@
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');