--- loncom/interface/lonstatistics.pm 2003/02/28 20:50:33 1.61
+++ loncom/interface/lonstatistics.pm 2003/04/21 15:12:37 1.67
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.61 2003/02/28 20:50:33 matthew Exp $
+# $Id: lonstatistics.pm,v 1.67 2003/04/21 15:12:37 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,8 +51,7 @@ Main handler for statistics and chart.
use Apache::lonproblemstatistics;
use Apache::lonstudentassessment;
use Apache::lonpercentage;
- use GDBM_File;
-
+ use Apache::lonmysql;
=over 4
=cut
@@ -83,8 +82,8 @@ use Apache::lonproblemanalysis();
use Apache::lonproblemstatistics();
use Apache::lonstudentassessment();
use Apache::lonpercentage;
-use GDBM_File;
-
+use Apache::lonmysql;
+use Time::HiRes;
#######################################################
#######################################################
@@ -235,8 +234,7 @@ sub PrepareClasslist {
@StudentDataOrder = qw/fullname username domain id section status/;
foreach my $field (@StudentDataOrder) {
$StudentData{$field}->{'title'} = $field;
- $StudentData{$field}->{'base_width'} =
- scalar (my @Tmp = split(//,$field));
+ $StudentData{$field}->{'base_width'} = length($field);
$StudentData{$field}->{'width'} =
$StudentData{$field}->{'base_width'};
}
@@ -251,7 +249,7 @@ sub PrepareClasslist {
$studenthash->{$field}=$student_data->[$i];
# Keep track of the width of the fields
next if (! exists($StudentData{$field}));
- my $length = scalar(my @Tmp1 = split(//,$student_data->[$i]));
+ my $length = length($student_data->[$i]);
if ($StudentData{$field}->{'width'} < $length) {
$StudentData{$field}->{'width'} = $length;
}
@@ -437,6 +435,33 @@ sub SetSelectedMaps {
}
}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &Sequences_with_Assess()
+
+Returns an array containing the subset of @Sequences which contain
+assessments.
+
+=cut
+
+#######################################################
+#######################################################
+sub Sequences_with_Assess {
+ my @Sequences_to_Show;
+ foreach my $map_symb (@SelectedMaps) {
+ foreach my $sequence (@Sequences) {
+ next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all');
+ next if ($sequence->{'num_assess'} < 1);
+ push (@Sequences_to_Show,$sequence);
+ }
+ }
+ return @Sequences_to_Show;
+}
+
#######################################################
#######################################################
@@ -464,12 +489,12 @@ sub PrepareCourseData {
#
# Compute column widths
foreach my $seq (@Sequences) {
- my $name_length = scalar(my @Tmp1 = split(//,$seq->{'title'}));
+ my $name_length = length($seq->{'title'});
my $num_parts = $seq->{'num_assess_parts'};
#
# The number of columns needed for the summation text:
# " 1/5" = 1+3 columns, " 10/99" = 1+5 columns
- my $sum_length = 1+1+2*(scalar(my @Tmp2 = split(//,$num_parts)));
+ my $sum_length = 1+1+2*(length($num_parts));
my $num_col = $num_parts+$sum_length;
if ($num_col < $name_length) {
$num_col = $name_length;
@@ -748,377 +773,8 @@ sub SectionSelect {
return $Str;
}
-##############################################
-##############################################
-
-sub CheckFormElement {
- my ($cache, $ENVName, $cacheName, $default)=@_;
-
- if(defined($ENV{'form.'.$ENVName})) {
- $cache->{$cacheName} = $ENV{'form.'.$ENVName};
- } elsif(!defined($cache->{$cacheName})) {
- $cache->{$cacheName} = $default;
- } else {
- $ENV{'form.'.$ENVName} = $cache->{$cacheName};
- }
- return;
-}
-
-sub ProcessFormData{
- my ($cache)=@_;
-
- $cache->{'reportKey'} = 'false';
-
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['download',
- 'reportSelected',
- 'StudentAssessmentStudent',
- 'ProblemStatisticsSort']);
- &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
- if ($cache->{'DownloadAll'} ne 'false') {
- # Clean the hell out of that cache!
- # We cannot untie the hash at this scope (stupid libgd :( )
- # So, remove every single key. What a waste of time....
- # Of course, if you are doing this you are probably resigned
- # to waiting a while.
- &Apache::lonnet::logthis("Cleaning out the cache file");
- while (my ($key,undef)=each(%$cache)) {
- next if ($key eq 'DownloadAll');
- delete($cache->{$key});
- }
- }
- &CheckFormElement($cache, 'Status', 'Status', 'Active');
- &CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
- &CheckFormElement($cache, 'reportSelected', 'reportSelected',
- 'Class list');
- $cache->{'reportSelected'} =
- &Apache::lonnet::unescape($cache->{'reportSelected'});
- &CheckFormElement($cache, 'sort', 'sort', 'fullname');
- &CheckFormElement($cache, 'download', 'download', 'false');
- &CheckFormElement($cache, 'StatisticsMaps',
- 'StatisticsMaps', 'All Maps');
- &CheckFormElement($cache, 'StatisticsProblemSelect',
- 'StatisticsProblemSelect', 'All Problems');
- &CheckFormElement($cache, 'StatisticsPartSelect',
- 'StatisticsPartSelect', 'All Parts');
- 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'})) {
- $cache->{'reportSelected'} = 'Student Assessment';
- }
- if(defined($ENV{'form.NextStudent'})) {
- $cache->{'StudentAssessmentMove'} = 'next';
- } elsif(defined($ENV{'form.PreviousStudent'})) {
- $cache->{'StudentAssessmentMove'} = 'previous';
- } else {
- $cache->{'StudentAssessmentMove'} = 'selected';
- }
- &CheckFormElement($cache, 'StudentAssessmentStudent',
- 'StudentAssessmentStudent', 'All Students');
- $cache->{'StudentAssessmentStudent'} =
- &Apache::lonnet::unescape($cache->{'StudentAssessmentStudent'});
- &CheckFormElement($cache, 'DefaultColumns', 'DefaultColumns', 'false');
-
- # 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;
- if(defined($ENV{'form.ReselectColumns'})) {
- my @reselected = (ref($ENV{'form.ReselectColumns'}) ?
- @{$ENV{'form.ReselectColumns'}}
- : ($ENV{'form.ReselectColumns'}));
- foreach (@reselected) {
- if(/HeadingColumn/) {
- push(@headingColumns, $_);
- $foundColumn = 1;
- } elsif(/SequenceColumn/) {
- push(@sequenceColumns, $_);
- $foundColumn = 1;
- }
- }
- }
-
- $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'} = 'Analyze';
- my $data;
- (undef, $data)=split(':::', $_);
- $cache->{'AnalyzeInfo'}=$data;
- } elsif(/form\.HeadingColumn/) {
- my $value = $_;
- $value =~ s/form\.//;
- push(@headingColumns, $value);
- $foundColumn=1;
- } elsif(/form\.SequenceColumn/) {
- my $value = $_;
- $value =~ s/form\.//;
- push(@sequenceColumns, $value);
- $foundColumn=1;
- }
- }
-
- if($foundColumn) {
- $cache->{'HeadingsFound'} = join(':', @headingColumns);
- $cache->{'SequencesFound'} = join(':', @sequenceColumns);;
- }
- if(!defined($cache->{'HeadingsFound'}) ||
- $cache->{'DefaultColumns'} ne 'false') {
- $cache->{'HeadingsFound'}='HeadingColumnFull Name';
- }
- if(!defined($cache->{'SequencesFound'}) ||
- $cache->{'DefaultColumns'} ne 'false') {
- $cache->{'SequencesFound'}='All Sequences';
- }
- $cache->{'DefaultColumns'} = 'false';
-
- return;
-}
-
##################################################
##################################################
-
-=pod
-
-=item &SortStudents()
-
-Determines which students to display and in which order. Which are
-displayed are determined by their status(active/expired). The order
-is determined by the sort button pressed (default to username). The
-type of sorting is username, lastname, or section.
-
-=over 4
-
-Input: $students, $CacheData
-
-$students: A array pointer to a list of students (username:domain)
-
-$CacheData: A pointer to the hash tied to the cached data
-
-Output: \@order
-
-@order: An ordered list of students (username:domain)
-
-=back
-
-=cut
-
-sub SortStudents {
- my ($cache)=@_;
-
- my @students = split(':::',$cache->{'NamesOfStudents'});
- my @sorted1Students=();
- foreach (@students) {
- if($cache->{'Status'} eq 'Any' ||
- $cache->{$_.':Status'} eq $cache->{'Status'}) {
- push(@sorted1Students, $_);
- }
- }
-
- my $sortBy = '';
- if(defined($cache->{'sort'})) {
- $sortBy = ':'.$cache->{'sort'};
- } else {
- $sortBy = ':fullname';
- }
- my @order = sort { lc($cache->{$a.$sortBy}) cmp lc($cache->{$b.$sortBy}) ||
- lc($cache->{$a.':fullname'}) cmp lc($cache->{$b.':fullname'}) }
- @sorted1Students;
-
- return \@order;
-}
-
-=pod
-
-=item &SpaceColumns()
-
-Determines the width of all the columns in the chart. It is based on
-the max of the data for that column and its header.
-
-=over 4
-
-Input: $students, $studentInformation, $headings, $ChartDB
-
-$students: An array pointer to a list of students (username:domain)
-
-$studentInformatin: The type of data for the student information. It is
-used as part of the key in $CacheData.
-
-$headings: The name of the student information columns.
-
-$ChartDB: The name of the cache database which is opened for read/write.
-
-Output: None - All data stored in cache.
-
-=back
-
-=cut
-
-sub SpaceColumns {
- my ($students,$studentInformation,$headings,$cache)=@_;
-
- # Initialize Lengths
- for(my $index=0; $index<(scalar @$headings); $index++) {
- my @titleLength=split(//,$headings->[$index]);
- $cache->{$studentInformation->[$index].':columnWidth'}=
- scalar @titleLength;
- }
-
- foreach my $name (@$students) {
- foreach (@$studentInformation) {
- my @dataLength=split(//,$cache->{$name.':'.$_});
- my $length=(scalar @dataLength);
- if($length > $cache->{$_.':columnWidth'}) {
- $cache->{$_.':columnWidth'}=$length;
- }
- }
- }
-
- return;
-}
-
-sub PrepareData {
- my ($c, $cacheDB, $studentInformation, $headings,$r)=@_;
-
- # Test for access to the cache data
- my $courseID=$ENV{'request.course.id'};
- my $isRecalculate=0;
- if(defined($ENV{'form.Recalculate'})) {
- $isRecalculate=1;
- }
-
- my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB,
- $isRecalculate);
- if($isCached < 0) {
- return "Unable to tie hash to db file.";
- }
-
- # Download class list information if not using cached data
- my %cache;
- 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);
- if($processTopResourceMapReturn ne 'OK') {
- untie(%cache);
- return $processTopResourceMapReturn;
- }
- # }
-
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
- }
-
- my $classlist=&Apache::loncoursedata::DownloadClasslist($courseID,
- $cache{'ClasslistTimestamp'},
- $c);
- foreach (keys(%$classlist)) {
- if(/^(con_lost|error|no_such_host)/i) {
- untie(%cache);
- return "Error getting student data.";
- }
- }
-
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
- }
-
- # Active is a temporary solution, remember to change
- Apache::loncoursedata::ProcessClasslist(\%cache,$classlist,$courseID,$c);
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
- }
-
- &ProcessFormData(\%cache);
- my $students = &SortStudents(\%cache);
- &SpaceColumns($students, $studentInformation, $headings, \%cache);
- $cache{'updateTime:columnWidth'}=24;
-
- my $download = $cache{'download'};
- my $downloadAll = $cache{'DownloadAll'};
- my @allStudents=();
- if($download ne 'false') {
- $cache{'download'} = 'false';
- } elsif($downloadAll ne 'false') {
- $cache{'DownloadAll'} = 'false';
- if($downloadAll eq 'sorted') {
- @allStudents = @$students;
- } else {
- @allStudents = split(':::', $cache{'NamesOfStudents'});
- }
- }
-
- untie(%cache);
-
- if($download ne 'false') {
- my @who = ($download);
- 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',
- 'true', $courseID,
- $r, $c) ne 'OK') {
- return 'Stop at download all';
- }
- }
-
- return ('OK', $students);
-}
-
sub DisplayClasslist {
my ($r)=@_;
#
@@ -1128,13 +784,13 @@ sub DisplayClasslist {
$Str .= '
'."\n";
$Str .= ''."\n";
foreach my $field (@Fields) {
- $Str .= ''.$field.
+ $Str .= ' | '.$field.
' | ';
}
$Str .= ' '."\n";
#
my $alternate = 0;
- foreach my $student (@Students) {
+ foreach my $student (@Students) { # @Students is a package variable
my $sname = $student->{'username'}.':'.$student->{'domain'};
if($alternate) {
$Str .= '';
@@ -1147,7 +803,7 @@ sub DisplayClasslist {
$Str .= '';
if ($field eq 'fullname') {
$Str .= '';
$Str .= $student->{$field}.' ';
@@ -1167,249 +823,69 @@ sub DisplayClasslist {
return;
}
-sub BuildClasslist {
- my ($cacheDB,$students,$studentInformation,$headings,$r)=@_;
-
- my %cache;
- unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
- return 'Unable to tie database.';
- }
-
-# my $Ptr = '';
-# $Ptr .= '';
-# $Ptr .= 'Select Sections';
-# $Ptr .= ' | '."\n";
-# $Ptr .= ''."\n";
-# my @sectionsSelected = split(':',$cache{'sectionsSelected'});
-# my @sections = split(':',$cache{'sectionList'});
-# $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
-# \@sectionsSelected,
-# 'Statistics');
-# $Ptr .= ' | ';
-# $r->print($Ptr);
-# $r->rflush();
-# my %mySections = ();
-# foreach (@sections) { $mySections{$_} = 'True'; }
-# $r->print(" $cache{'sectionsSelected'} ");
-
- my $Str='';
- $Str .= ''."\n";
- $Str .= ''."\n";
-
- my $displayString = 'DISPLAYDATA  | '."\n";
- $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache,
- $studentInformation,
- $headings, $displayString);
- $Str .= ' '."\n";
-
- my $alternate=0;
- foreach (@$students) {
-# if ($mySections{$cache{$_.':'.'section'}} ne 'True') {next;}
- my ($username, $domain) = split(':', $_);
- if($alternate) {
- $Str .= '';
- } else {
- $Str .= ' ';
- }
- $alternate = ($alternate + 1) % 2;
- foreach my $data (@$studentInformation) {
- $Str .= '';
- if($data eq 'fullname') {
- $Str .= '';
- $Str .= $cache{$_.':'.$data}.' ';
- $Str .= '';
- } elsif($data eq 'updateTime') {
- $Str .= '';
- $Str .= $cache{$_.':'.$data}.' ';
- $Str .= ' ';
- } else {
- $Str .= $cache{$_.':'.$data}.' ';
- }
-
- $Str .= ' | '."\n";
- }
- }
-
- $Str .= ' '."\n";
- $Str .= '
| '."\n";
- $r->print($Str);
- $r->rflush();
-
- untie(%cache);
-
- return;
-}
-
+##############################################
+##############################################
sub CreateMainMenu {
- my ($status, $reports)=@_;
-
+ my ($status,$reports,$current)=@_;
+ #
my $Str = '';
-
+ #
$Str .= ''."\n";
$Str .= ' '."\n";
-
+ #
return $Str;
}
-sub BuildStatistics {
- my ($r)=@_;
-
- my $c = $r->connection;
- my @studentInformation=('fullname','section','id','domain','username',
- 'updateTime');
- my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name',
- 'Last Updated');
- my $spacing = ' ';
-
- my %reports = ('classlist' => 'Class list',
- 'problem_statistics' => 'Problem Statistics',
- 'student_assessment' => 'Student Assessment',
- 'percentage' => 'Correct-problems Plot',
-# 'activitylog' => 'Activity Log',
- 'reportSelected' => 'Class list');
-
- my %cache;
- my $courseID=$ENV{'request.course.id'};
- my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
- "_$ENV{'user.domain'}_$courseID\_statistics.db";
-
- $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
-
- my ($returnValue, $students) = &PrepareData($c, $cacheDB,
- \@studentInformation,
- \@headings,$r);
- if($returnValue ne 'OK') {
- $r->print($returnValue."\n".' |
|