--- loncom/interface/statistics/lonproblemstatistics.pm 2002/07/24 14:52:32 1.1
+++ loncom/interface/statistics/lonproblemstatistics.pm 2002/07/26 21:50:12 1.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonproblemstatistics.pm,v 1.1 2002/07/24 14:52:32 stredwic Exp $
+# $Id: lonproblemstatistics.pm,v 1.3 2002/07/26 21:50:12 minaeibi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,7 @@
# 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 Behrouz Minaei
+# 5/12,5/14,5/15,5/19,5/26,7/16,7/25 Behrouz Minaei
#
###
@@ -43,20 +43,12 @@ use Apache::lonhtmlcommon;
use Apache::loncoursedata;
use GDBM_File;
-my $r;
-my %DoDiff;
-my %Discuss;
-my %mapsort;
-my %hash;
-my %CachData;
-my %color;
-my %GraphDat;
+#my %mapsort;
sub BuildProblemStatisticsPage {
- my ($cacheDB, $students, $courseID, $c, $jr)=@_;
-
- $r = $jr;
+ my ($cacheDB, $students, $courseID, $c, $r,%color)=@_;
my %cache;
+ #my %DoDiff;
unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
return 'Unable to tie database.';
}
@@ -69,7 +61,7 @@ sub BuildProblemStatisticsPage {
$Ptr .= ''."\n";
$Ptr .= &AscendOrderOptions($cache{'Ascend'});
$Ptr .= &ProblemStatisticsButtons($cache{'DisplayFormat'});
- $Ptr .= '';
+ $Ptr .= '';
$Ptr .= &ProblemStatisticsLegend();
@@ -91,17 +83,23 @@ sub BuildProblemStatisticsPage {
}
my $discriminantFactor;
my @list=();
+ my %Discuss=&Apache::loncoursedata::LoadDiscussion($courseID);
+ my $index=0;
foreach (@$students) {
- $discriminantFactor = &ExtractStudentData(\%cache, $_, \@list);
+ $index++;
+ #&Apache::lonstatistics::Update_PrgWin(++$index,$r);
+ $discriminantFactor = &ExtractStudentData(\%cache, $_, \@list,
+ \%Discuss, $r);
}
- return $Ptr;
+ #&Apache::lonstatistics::Close_PrgWin($r);
+
my ($upper, $lower) = &Discriminant($discriminantFactor);
my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",
4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",
9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd", 13, "Disc.");
- &Apache::loncoursedata::LoadDiscussion($courseID, $courseID, \%Discuss);
- &BuildStatisticsTable(\%cache, $discriminantFactor, \@list, \%Header,
- $students);
+
+ my %GraphDat= &BuildStatisticsTable(\%cache, $discriminantFactor, \@list,
+ \%Header, $students, $r, \%color);
untie(%cache);
@@ -109,16 +107,16 @@ sub BuildProblemStatisticsPage {
}
sub BuildDiffGraph {
- my ($courseID)=@_;
+ my ($r)=@_;
- my $graphData = &GetGraphData('DiffGraph', $courseID);
+ my $graphData = &GetGraphData('DiffGraph', $r);
return '
';
}
sub BuildWrongGraph {
- my ($courseID)=@_;
+ my ($r)=@_;
- my $graphData = &GetGraphData('WrongGraph', $courseID);
+ my $graphData = &GetGraphData('WrongGraph', $r);
return '';
}
@@ -272,17 +270,10 @@ sub Build_log {
}
sub Activity {
-# $rid=~/(\d+)\.(\d+)/;
-# my $MapId=$1;
-# my $PrbId=$2;
-# my $MapOrg = $hash{'map_id_'.$MapId};
-# my $Map = &Apache::lonnet::declutter($MapOrg);
-# my $URI = $hash{'src_'.$rid};
-# my $Symb = $Map.'___'.$PrbId.'___'.&Apache::lonnet::declutter($URI);
my $file="/home/minaeibi/activity.log";
my $userid='adamsde1';
- $r->print("
Using $file");
- $r->rflush();
+# $r->print("
Using $file");
+# $r->rflush();
open(FILEID, "<$file");
my $line;
my @allaccess;
@@ -298,13 +289,13 @@ sub Activity {
my $res=&Apache::lonnet::unescape($resource);
if (($res =~ /\.(sequence|problem|htm|html|page)/)) {
$Count++;
- $r->print("
$Count) ".localtime($date).": $who --> $res");
+###888 $r->print("
$Count) ".localtime($date).": $who --> $res");
# if ($post) {
# $Count++;
# $r->print("
$Count) Sent data ".join(':',
# &Apache::lonnet::unescape(@posts)).'');
# }
- $r->rflush();
+###888 $r->rflush();
}
#push (@allaccess,unescape($access));
#print $machine;
@@ -403,7 +394,7 @@ sub NumericSort {
sub CreateProblemStatisticsTableHeading {
- my ($displayFormat,$sequenceSource,$sequenceTitle,$headings)=@_;
+ my ($displayFormat,$sequenceSource,$sequenceTitle,$headings,$r)=@_;
if($displayFormat eq 'Display CSV Format') {
$r->print('
"'.$sequenceTitle.'","');
$r->print($sequenceSource.'"');
@@ -425,7 +416,7 @@ sub CreateProblemStatisticsTableHeading
}
sub CloseTable {
- my ($cache)=@_;
+ my ($cache,$r)=@_;
if($cache->{'DisplayFormat'} eq 'Display CSV Format') {
return;
}
@@ -437,7 +428,7 @@ sub CloseTable {
# ------ Dump the Student's DB file and handling the data for statistics table
sub ExtractStudentData {
- my ($cache,$name,$list)=@_;
+ my ($cache,$name,$list,$Discuss,$r)=@_;
my %discriminantFactor;
my $totalTries = 0;
@@ -453,18 +444,24 @@ sub ExtractStudentData {
my $TimeTot = 0;
my $Discussed=0;
+$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%$cache);
+$Apache::lonxml::debug=0;
+
foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
- if($cache->{'ProblemStatisticsMap'} ne 'All Maps' &&
- $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
- next;
- }
+# if($cache->{'ProblemStatisticsMap'} ne 'All Maps' &&
+# $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
+ $r->print("
$name --- $sequence");
+ $r->print("
".$cache->{$sequence.':title'});
+# next;
+# }
my $Dis = '';
foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
my $problem = $cache->{$problemID.':problem'};
+ $r->print("
$problemID === $problem");
my $LatestVersion = $cache->{$name.':version:'.$problem};
-
- # Output dashes for all the parts of this problem if there
+ # Output dashes for all the parts of this problem if there
# is no version information about the current problem.
#if(!$LatestVersion) {
# foreach my $part (split(/\:/,$cache->{$sequence.':'.
@@ -491,7 +488,7 @@ sub ExtractStudentData {
# oldest version. Basically, it gets the most recent
# set of grade data for each part.
for(my $Version=1; $Version<=$LatestVersion; $Version++) {
- foreach my $part (split(/\:/,$cache->{$sequence.':'.
+ foreach my $part (split(/\:/,$cache->{$sequence.':'.
$problemID.
':parts'})) {
@@ -527,7 +524,6 @@ sub ExtractStudentData {
elsif ($val eq 'incorrect_by_override'){$code = 'I';}
elsif ($val eq 'excused') {$code = 'x';}
$partData{$part.':code'}=$code;
-
if($partData{$part.':wrong'} ne 0 &&
($code eq 'C' || $code eq 'O')) {
$partData{$part.':wrong'}--;
@@ -544,7 +540,6 @@ sub ExtractStudentData {
$partData{$_.':code'} eq 'O') {
$Yes=1;
}
- #my $ptr = "$hash{'title_'.$ResId}";
my $ptr = $tempProblemOrder.'&'.$problemID;
if($_ > 1) {
@@ -565,17 +560,18 @@ sub ExtractStudentData {
$DisF = $Fac;
}
- if ($Discuss{"$name:$problem"}) {
+ if ($Discuss->{"$name:$problem"}) {
$TotDiscuss++;
$Discussed=1;
}
my $time = $cache->{"$name:$LatestVersion:$problem:timestamp"};
$Dis .= $tempProblemOrder.'='.$DisF.'+'.$Yes;
- $ptr .= '&'.$partData{$_.'.Tries'}.
- '&'.$partData{$_.'.Wrongs'}.
- '&'.$partData{$_.'.Code'};
+ $ptr .= '&'.$partData{$_.'.tries'}.
+ '&'.$partData{$_.'.wrongs'}.
+ '&'.$partData{$_.'.code'};
push (@$list, $ptr."&$Discussed");
-
+ $r->print('
'.$name.'---'.$ptr);
+
#### if ($DoDiff>0.85) {
$TimeTot += $time;
@@ -630,14 +626,15 @@ sub MySort {
}
=cut
+
sub BuildStatisticsTable {
- my ($cache,$discriminantFactor,$list,$headings,$students)=@_;
+ my ($cache,$discriminantFactor,$list,$headings,$students,$r,%color)=@_;
#6666666
# my $file="/home/httpd/perl/tmp/183d.txt";
# open(OUT, ">$file");
#6666666
- &Create_PrgWin();
+## &Apache::lonstatistics::Create_PrgWin($r);
##777777
## my (%Activity) = &LoadActivityLog();
## $r->print('