--- loncom/interface/lonstatistics.pm 2002/05/30 13:36:18 1.24 +++ loncom/interface/lonstatistics.pm 2002/05/31 13:47:01 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonstatistics.pm,v 1.24 2002/05/30 13:36:18 stredwic Exp $ +# $Id: lonstatistics.pm,v 1.25 2002/05/31 13:47:01 minaeibi Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,6 +78,7 @@ my $lastres; my $DiscFlag; my $HWN; my $P_Order; +my %color; my %foil_to_concept; my @Concepts; my %ConceptData; @@ -87,12 +88,6 @@ my %Header = (0,"Homework Sets Order",1, my %Answer = (); -sub unescape { - my $str=shift; - $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - return $str; -} - sub Activity { my $file="/home/minaeibi/minaei"; my $userid='billskat'; @@ -101,32 +96,46 @@ sub Activity { open(FILEID, "<$file"); my $line; my @allaccess; + my $Count=0; while ($line=) { my ($time,$machine,$what)=split(':',$line); - #$r->print("time=$time machine=$machine:-> $what\n"); - #$r->rflush(); - $what=&unescape($what); + $what=&Apache::lonnet::unescape($what); my @accesses=split('&',$what); foreach my $access (@accesses) { my ($date,$resource,$who,$domain,$post,@posts)=split(':',$access); if ($who ne $userid) { next; } - #if (!$resource) { next; } - push (@allaccess,unescape($access)); + if (!$resource) { next; } + my $res=&Apache::lonnet::unescape($resource); + #if (($key=~/\.(\w+)\.(\w+)\.submission$/)) { + #if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) { + # foreach my $Key(split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) { + # if ($Key=~/^stores\_(\w+)\_tries$/) { + + # if (($res =~ /^\/res\/adm/)) { + $Count++; + $r->print("
$Count) $date: $who --> $res"); + if ($post) { + $Count++; + $r->print("
$Count) Sent data ".join(':', + &Apache::lonnet::unescape(@posts)).''); + } + $r->rflush(); + # } + ## push (@allaccess,unescape($access)); #print $machine; } } - @allaccess=sort(@allaccess); - my $Count=0; - foreach my $access (@allaccess) { - my ($date,$resource,$who,$domain,$post,@posts)=split(':',$access); - $Count++; -# $r->print("$Count ".localtime($date)." $who $resource\n"); - $r->print("
$Count) $date: $who --> $resource"); - $r->rflush(); - if ($post) { - $r->print("
Sent data ".join(':',unescape(@posts)).''); - } - } +# @allaccess=sort(@allaccess); +# $Count=0; +# foreach my $access (@allaccess) { +# my ($date,$resource,$who,$domain,$post,@posts)=split(':',$access); +# $Count++; +# $r->print("
$Count) $date: $who --> $resource"); +# $r->rflush(); +# if ($post) { +# $r->print("
Sent data ".join(':',unescape(@posts)).''); +# } +# } } @@ -265,9 +274,9 @@ sub DrawTable { for (my $n=0; $n<=$#Concepts; $n++ ) { $Str .= "\n"."". "\n"."".($n+1)."". - "\n"." ".$Concepts[$n]." ". - "\n"." ".$data1[$n]." ". - "\n"." ".$data2[$n]." ". + "\n".' '.$Concepts[$n]." ". + "\n".' '.$data1[$n]." ". + "\n".' '.$data2[$n]." ". "\n".""; } $Str.='From:['.localtime($ConceptData{'Int.'.$k}). @@ -309,7 +318,6 @@ sub DrawGraph { $Max = int($Max); } else { $Max = 1; } - my $Titr=($ConceptData{'Interval'}>1) ? $Src.'_interval_'.($k+1) : $Src; # $GData=$Titr.'&Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2; $GData="$Titr&Concepts&Answers&$Max&$P_No&". @@ -351,8 +359,8 @@ sub AnalyzeProblem { '" target="_blank">'.$hash{'title_'.$rid}.''; $Str .= "\n"."". "\n"." $P_No ". - "\n"." ".$Temp." ". - "\n"." ".$hash{'src_'.$rid}." ". + "\n"." ".$Temp." ". + "\n"." ".$hash{'src_'.$rid}." ". "\n"." ".''.''. "\n".""; $P_No++; @@ -1291,18 +1299,18 @@ sub TableRow { "\n".''.($RealIdx+1).''. # "\n".''.$PrOrd.$Temp.''. "\n".''.$Temp.''. - "\n".' '.$StdNo.''. - "\n".''.$TotalTries.''. - "\n".''.$MxTries.''. - "\n".''.$Avg.''. - "\n".' '.$YES.''. - "\n".' '.$Override.''. - "\n".' '.$Wrng.''. - "\n".''.$DoD.''. - "\n".' '.$SD.''. - "\n".' '.$Sk.''. - "\n".' '.$_D1.''. - "\n".' '.$_D2.''; + "\n".' '.$StdNo.''. + "\n".''.$TotalTries.''. + "\n".''.$MxTries.''. + "\n".''.$Avg.''. + "\n".' '.$YES.''. + "\n".' '.$Override.''. + "\n".' '.$Wrng.''. + "\n".' '.$DoD.''. + "\n".' '.$SD.''. + "\n".' '.$Sk.''. + "\n".' '.$_D1.''. + "\n".' '.$_D2.''; $r->print("\n".$Ptr.'' ); } $GraphDat{$RealIdx}=$DoD.':'.$Wrng; @@ -1356,28 +1364,50 @@ sub GetGraphData { sub initial { # --------------------------------- Initialize the global varaibles - undef @students; - undef @cols; - undef %maps; - undef %section; - undef %StuBox; - undef @list; - undef %CachData; - undef %GraphDat; - undef %DiscFac; - undef %OpResp; - undef %ConceptData; - undef $CurMap; - undef $CurSec; - undef $CurStu; - undef $p_count; - undef $Pos; - undef $GData; - $DiscFlag=0; - $P_Order=100000; - $HWN=$P_Order; + undef @students; + undef @cols; + undef %maps; + undef %section; + undef %StuBox; + undef @list; + undef %CachData; + undef %GraphDat; + undef %DiscFac; + undef %OpResp; + undef %ConceptData; + undef $CurMap; + undef $CurSec; + undef $CurStu; + undef $p_count; + undef $Pos; + undef $GData; + $DiscFlag=0; + $P_Order=100000; + $HWN=$P_Order; + &setbgcolor(0); +} + +# For loading the colored table for display or un-colored for print +sub setbgcolor { + my $PrintTable=shift; + undef %color; + if ($PrintTable){ + $color{"gb"}="#FFFFFF"; + $color{"red"}="#FFFFFF"; + $color{"yellow"}="#FFFFFF"; + $color{"green"}="#FFFFFF"; + $color{"purple"}="#FFFFFF"; + } else { + $color{"gb"}="#DDFFFF"; + $color{"red"}="#FFDDDD"; + $color{"yellow"}="#EEFFCC"; + $color{"green"}="#DDFFDD"; + $color{"purple"}="#FFDDFF"; + } } + + # my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}". # "_$ENV{'user.domain'}_$cid\_classlist.db"; # if (-e "$CacheDB") { @@ -1398,7 +1428,6 @@ sub initial { # } # untie(%students); - sub ClassList { &GetStatus(); @@ -1508,7 +1537,6 @@ sub CreateForm { $Ptr .= ''; $Ptr .= ''; #$Ptr .= ''; - #$Ptr .= ''; $r->print( $Ptr ); } else {