--- loncom/interface/statistics/lonproblemstatistics.pm 2002/08/15 13:54:13 1.29 +++ loncom/interface/statistics/lonproblemstatistics.pm 2002/11/12 19:52:46 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonproblemstatistics.pm,v 1.29 2002/08/15 13:54:13 stredwic Exp $ +# $Id: lonproblemstatistics.pm,v 1.36 2002/11/12 19:52:46 minaeibi Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,12 +30,12 @@ # 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei # 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei # YEAR=2002 -# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei -# 5/12,5/14,5/15,5/19,5/26,7/16,7/25,7/29,8/5 Behrouz Minaei +# 1/22,2/1,2/6,2/25,3/2,3/26,4/7,5/6 Behrouz Minaei +# 5/12,5/26,7/16,7/29,8/5,10/31 Behrouz Minaei # ### -package Apache::lonproblemstatistics; +package Apache::lonproblemstatistics; use strict; use Apache::lonnet(); @@ -43,14 +43,11 @@ use Apache::lonhtmlcommon; use Apache::loncoursedata; use GDBM_File; -my $jr; sub InitializeProblemStatistics { my ($cacheDB, $students, $courseID, $c, $r)=@_; my %cache; - $jr = $r; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { $r->print('Unable to tie database1.'); return ('ERROR', undef); @@ -84,7 +81,7 @@ sub InitializeProblemStatistics { my $lastStatus = (defined($cache{'StatisticsLastStatus'})) ? $cache{'StatisticsLastStatus'} : 'Nothing'; my $whichStudents = join(':::',sort(@$students)); - if(!defined($cache{'StatisticsCached'}) || + if(!defined($cache{'StatisticsCached'}) || $lastStatus ne $cache{'Status'} || $whichStudents ne $cache{'StatisticsWhichStudents'}) { $isNotCached = 1; @@ -109,7 +106,7 @@ sub InitializeProblemStatistics { &Apache::loncoursedata::DownloadStudentCourseDataSeparate($students, 'true', $cacheDB, - 'true', + 'true', 'true', $courseID, $r, $c); @@ -147,7 +144,7 @@ sub InitializeProblemStatistics { return ('ERROR', undef); } - my $orderedProblems = &SortProblems(\%cache, + my $orderedProblems = &SortProblems(\%cache, $cache{'ProblemStatisticsSort'}, $cache{'SortProblems'}, $cache{'ProblemStatisticsAscend'}); @@ -173,15 +170,15 @@ sub BuildProblemStatisticsPage { $Ptr .= ''; $Ptr .= ''."\n"; $Ptr .= ''."\n"; $Ptr .= ''."\n"; $Ptr .= ''."\n"; $Ptr .= ''."\n"; @@ -192,7 +189,7 @@ sub BuildProblemStatisticsPage { \@sectionsSelected, 'Statistics'); $Ptr .= ''."\n"; - $Ptr .= &ProblemStatisticsButtons($cache{'DisplayFormat'}, + $Ptr .= &ProblemStatisticsButtons($cache{'DisplayFormat'}, $cache{'DisplayLegend'}, $cache{'SortProblems'}); $Ptr .= '
Select Map'; - $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics', + $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'Statistics', 'Statistics'); $Ptr .= '
Sorting Type:'."\n"; $Ptr .= &Apache::lonhtmlcommon::AscendOrderOptions( - $cache{'ProblemStatisticsAscend'}, - 'ProblemStatistics', - 'Statistics'); + $cache{'ProblemStatisticsAscend'}, + 'ProblemStatistics', + 'Statistics'); $Ptr .= '
Select Sections'; $Ptr .= '
'; @@ -213,8 +210,8 @@ sub BuildProblemStatisticsPage { $r->print('Unable to tie database.6'); return; } - &BuildStatisticsTable(\%cache, $cache{'DisplayFormat'}, - $cache{'SortProblems'}, $orderedProblems, + &BuildStatisticsTable(\%cache, $cache{'DisplayFormat'}, + $cache{'SortProblems'}, $orderedProblems, \@Header, $r, $color); untie(%cache); @@ -224,21 +221,50 @@ sub BuildProblemStatisticsPage { sub BuildGraphicChart { my ($graph,$cacheDB,$courseDescription,$students,$courseID,$r,$c)=@_; my %cache; - my $max = 0; + my $max; + unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { + return 'Unable to tie database.7'; + } - my ($result, undef) = + my $title = ''; + if($graph eq 'DoDiffGraph') { + $title = 'Degree-of-Difficulty'; + } else { + $title = 'Wrong-Percentage'; + } + + my $currentSequence = -1; + my $sortProblems = 'Sort Within Sequence'; + + my ($result, $orderedProblems) = &InitializeProblemStatistics($cacheDB, $students, $courseID, $c, $r); if($result ne 'OK') { return; } - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - return 'Unable to tie database.7'; - } - - my @problems = split(':::', $cache{'problemList'}); my @values = (); - foreach (@problems) { + + foreach(@$orderedProblems) { + my ($sequence,$problem,$part)=split(':', $_); + if($cache{'StatisticsMaps'} ne 'All Maps' && + $cache{'StatisticsMaps'} ne $cache{$sequence.':title'}) { + next; + } + + if( $currentSequence == -1 || + ($sortProblems eq 'Sort Within Sequence' && + $currentSequence != $sequence)) { + if($currentSequence != -1) { + &DrawGraph(\@values,$courseDescription,$title,$max,$r); + } + if($sortProblems eq 'Sort Within Sequence') { + $r->print('
'.$cache{$sequence.':title'}.''."\n"); + } + + $currentSequence = $sequence; + @values = (); + $max=0; + } my $data = 0; if($graph eq 'DoDiffGraph') { $data = sprintf("%.2f", $cache{$_.':degreeOfDifficulty'}), @@ -252,24 +278,37 @@ sub BuildGraphicChart { } untie(%cache); - my $sendValues = join(',', @values); - my $sendCount = scalar(@values); + &DrawGraph(\@values,$courseDescription,$title,$max,$r); - my $title = ''; - if($graph eq 'DoDiffGraph') { - $title = 'Degree-of-Difficulty'; - } else { - $title = 'Wrong-Percentage'; - } - my @GData = ($courseDescription, 'Problems', $title, $max, $sendCount, - $sendValues); + return; +} - $r->print(''."\n"); - $r->print(''); - $r->print('
'."\n"); - return; +sub DrawGraph { + my ($values,$courseDescription,$title,$Max,$r)=@_; + my $sendValues = join(',', @$values); + my $sendCount = scalar(@$values); + $r->print("
The Maximum Value is: $Max"); + if ( $Max > 1 ) { + if ($Max % 10) { + if ( int($Max) < $Max ) { + $Max++; + $Max = int($Max); + } + } + #(10 - $Max % 10); + } else { $Max = 1; } + +# my @GData = ($courseDescription, 'Problem_number', +# $title, $Max, $sendCount, $sendValues); + my @GData = ('','Problem_number',$title,$Max,$sendCount,$sendValues); + +# $r->print('
'."\n"); + $r->print('
'."\n"); + $r->print(''); +# $r->print('
'."\n"); + $r->print('
'."\n"); } #---- Problem Statistics Web Page --------------------------------------- @@ -287,7 +326,7 @@ sub CreateProblemStatisticsTableHeading $Str .= '&ProblemStatisticsSort='; $Str .= &Apache::lonnet::escape($_).'">'.$_.' '."\n"; } - $Str .= "\n".''."\n"; + $Str .= "\n".''."\n"; return $Str; } @@ -305,8 +344,8 @@ sub BuildStatisticsTable { next; } - if($currentSequence == -1 || - ($sortProblems eq 'Sort Within Sequence' && + if($currentSequence == -1 || + ($sortProblems eq 'Sort Within Sequence' && $currentSequence != $sequence)) { if($displayFormat ne 'Display CSV Format') { if($currentSequence ne -1) { @@ -435,10 +474,10 @@ sub ProblemStatisticsButtons { my $Ptr = ''; $Ptr .= '{$sequence.':title'}; $problemData{$id.':studentCount'} = $studentCount; $problemData{$id.':totalTries'} = $totalTries; @@ -623,7 +662,7 @@ sub SortDivideByTries { my @orderedData = sort { ($data->{$a.':totalTries'}) ? ($data->{$a.$sortOn}/$data->{$a.':totalTries'}):0 <=> - ($data->{$b.':totalTries'}) ? + ($data->{$b.':totalTries'}) ? ($data->{$b.$sortOn}/$data->{$b.':totalTries'}):0 } @$toSort; @@ -799,7 +838,6 @@ sub CalculateStatistics { $data->{$_.':discriminationFactor2'} = sprintf("%.2f", $df2); my %storestats; - my ($sequence) = split(':', $_); my $Average = ($data->{$_.':studentCount'}) ? $data->{$_.':totalTries'}/$data->{$_.':studentCount'} : 0; $storestats{$courseID.'___'.$cache->{$sequence.':source'}. @@ -812,7 +850,7 @@ sub CalculateStatistics { '___difficulty'}=$data->{$_.':degreeOfDifficulty'}; $cache->{$sequence.':source'} =~ /^(\w+)\/(\w+)/; if($data->{$_.':studentCount'}) { - &Apache::lonnet::put('resevaldata',\%storestats,$1,$2); + &Apache::lonnet::put('nohist_resevaldata',\%storestats,$1,$2); } }