--- loncom/interface/lonstatistics.pm	2002/05/14 23:17:06	1.18
+++ loncom/interface/lonstatistics.pm	2002/05/30 13:36:18	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.18 2002/05/14 23:17:06 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.24 2002/05/30 13:36:18 stredwic 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 Behrouz Minaei
+# 5/12,5/14,5/15,5/19,5/26 Behrouz Minaei
 #
 ###
 
@@ -86,6 +86,51 @@ my %Header = (0,"Homework Sets Order",1,
               9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd");
 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';
+    $r->print("<br>Using $file");
+    $r->rflush();
+    open(FILEID, "<$file");
+    my $line;
+    my @allaccess;
+    while ($line=<FILEID>) {
+	my ($time,$machine,$what)=split(':',$line);
+	#$r->print("time=$time machine=$machine:-> $what\n");
+	#$r->rflush();
+	$what=&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));
+	    #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("<br>$Count) $date: $who --> $resource");
+	$r->rflush();
+	if ($post) { 
+	    $r->print("<br><b>Sent data ".join(':',unescape(@posts)).'</b>');
+	}
+    }
+}
+
+
+
 sub InitAnalysis {
     my ($rid, $student)=@_;
     my ($uname,$udom)=split(/\:/,$student);
@@ -119,6 +164,7 @@ sub InitAnalysis {
     foreach my $concept (@{$Answer{"$parts.concepts"}}) {
 	foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
 	    $foil_to_concept{$foil} = $concept;
+	    #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"};
 	}
     }
     return $symb;
@@ -150,7 +196,9 @@ sub ShowOpGraph {
     my ($InpStr, $Int_No)=@_;
     my ($rid,$part)=split(/\:/,substr($InpStr,8));
     $ConceptData{"Interval"}=$Int_No;
+    #Initialize the option response true answers
     my $symb=&InitAnalysis($rid,$students[0]);
+    #compute the intervals
     &Interval($rid,$part,$symb);
     my $URI = $hash{'src_'.$rid};
     my $Src = $hash{'title_'.$rid};
@@ -158,6 +206,7 @@ sub ShowOpGraph {
     $r->print('<br><b>'.$URI.'</b>');
     $r->rflush();
     
+    #Java script Progress window
     &Create_PrgWin();
     &Update_PrgWin("Starting to analyze problem");
     for (my $index=0;$index<=$#students;$index++) {
@@ -166,9 +215,13 @@ sub ShowOpGraph {
     }
     &Close_PrgWin();
 
+    $r->print('<br>');
     for (my $k=0; $k<$Int_No; $k++ ) {
 	&DrawGraph($k,$Src);
     }
+    for (my $k=0; $k<$Int_No; $k++ ) {
+	&DrawTable($k);
+    }
 #$Apache::lonxml::debug=1;
 #&Apache::lonhomework::showhash(%ConceptData);
 #$Apache::lonxml::debug=0;
@@ -177,14 +230,13 @@ sub ShowOpGraph {
 }
 
 
-sub DrawGraph {
-    my ($k,$Src)=@_;
+sub DrawTable {
+    my $k=shift;
     my $Max=0;
     my @data1;
     my @data2;
     my $Correct=0;
     my $Wrong=0;
-    # Adjust Data and find the Max 
     for (my $n=0; $n<=$#Concepts; $n++ ) {
 	my $tmp=$Concepts[$n];
 	$data1[$n]=$ConceptData{"$tmp.$k.true"};
@@ -218,38 +270,61 @@ sub DrawGraph {
                 "\n"."<td bgcolor=#FFDDDD> ".$data2[$n]." </td>".
                 "\n"."</tr>";
     }
-    $Str.='<td></td><td><b>From:['.localtime($ConceptData{'Int.'.($k-1)}).
-          '] To: ['.localtime($ConceptData{"Int.$k"}).
+    $Str.='<td></td><td><b>From:['.localtime($ConceptData{'Int.'.$k}).
+          '] To: ['.localtime($ConceptData{'Int.'.($k+1)}-1).
           "]</b></td><td>$Correct</td><td>$Wrong</td>";
 
     $Str .= "\n".'</table>';
 
     $r->print($Str);
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%ConceptData);
+#$Apache::lonxml::debug=0;
+}
 
-    if ( $Max > 1 ) { 
-	$Max += (10 - $Max % 10);
-	$Max = int($Max);
-    } else { $Max = 1; }
+
+sub DrawGraph {
+    my ($k,$Src)=@_;
+    my $Max=0;
+    my @data1;
+    my @data2;
+
+    # Adjust Data and find the Max 
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	my $tmp=$Concepts[$n];
+	$data1[$n]=$ConceptData{"$tmp.$k.true"};
+	$data2[$n]=$ConceptData{"$tmp.$k.false"};
+	my $Sum=$data1[$n]+$data2[$n];
+	if ( $Max<$Sum ) {$Max=$Sum;}
+    }
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	if ($data1[$n]+$data2[$n]<$Max) {
+	    $data2[$n]+=$Max-($data1[$n]+$data2[$n]);
+	}
+    }
+    my $P_No = $#data1+1;
 
     if ( $Max > 1 ) { 
 	$Max += (10 - $Max % 10);
 	$Max = int($Max);
     } else { $Max = 1; }
-    my $Titr=($ConceptData{'Interval'}>1) ? $Src.'_interval_'.$k : $Src;
+
+    
+    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&".
            (join(',',@data1)).'&'.(join(',',@data2));
 
-    $r->print('<br><IMG src="/cgi-bin/graph.gif?'.$GData.'" />');
+    $r->print('<IMG src="/cgi-bin/graph.gif?'.$GData.'" border=1/>');
 }
 
 
 sub AnalyzeProblem {
-# -------------------------------- Selecting the number of intervals
+    # selecting the number of intervals
     my $OpSel='';
     my $CurInt = $ENV{'form.interval'};
     if ($CurInt eq '') {$CurMap = '1';}
-    my $Ptr = '<b>Select number of intervals</b>'."\n".
+    my $Ptr = '<br><b>Select number of intervals</b>'."\n".
        	      '<select name="interval">'."\n";                     	     	     
     for (my $n=1;$n<=7;$n++) {	          
 	$Ptr .= '<option';
@@ -259,12 +334,13 @@ sub AnalyzeProblem {
     $Ptr .= '</select>'."\n";
     $r->print( $Ptr );
 
+    #the table of option response problems
     $r->print('<br><b> Option Response Problems in this course:</b><br><br>');
     my $Str = "\n".'<table border=2>'.
               "\n".'<tr>'.
               "\n".'<th> # </th>'.
 	      "\n".'<th> Problem Title </th>'.
-	      "\n".'<th> Resouse </th>'.
+	      "\n".'<th> Resource </th>'.
 	      "\n".'<th> Address </th>'.
 	      "\n".'</tr>';
 
@@ -289,6 +365,7 @@ sub AnalyzeProblem {
 
 
 sub Decide {
+    #deciding the true or false answer belongs to each interval
     my ($type,$foil,$time)=@_; 
     my $k=0;
     while ($time>$ConceptData{'Int.'.($k+1)} && 
@@ -297,6 +374,7 @@ sub Decide {
 }
 
 
+#restore the student submissions and finding the result
 sub OpStatus {
     my ($rid,$student)=@_;
     my ($uname,$udom)=split(/\:/,$student);
@@ -445,7 +523,7 @@ sub StudentReport {
 	      "\n".'<th> Tries </th>'.
 	      "\n".'</tr>';
     my ($temp)=keys(%result);
-    unless ($temp=~/^error\:/) {
+    unless ($temp=~/^(con_lost|error|no_such_host)/i) {
         foreach my $CurCol (@cols) {
 	    if (!$CurCol){
 		my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
@@ -538,7 +616,7 @@ sub StudentReport {
 
 sub CreateTable {
     my ($Hd, $Hid)=@_;
-    if ($ENV{'form.showcsv'}) {
+    if ($ENV{'form.showcsv'}) { 
 	if ( $Hd == 1 ) {
 	    $r->print('<br>"'.$hash{'title_'.$Hid}.'","'.$hash{'src_'.$Hid}.'"');
 	}
@@ -573,6 +651,7 @@ sub CloseTable {
  
 # ------------------------------------------- Prepare Statistics Table
 sub PreStatTable {
+
     my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$cid\_statistics.db";
     my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
@@ -605,8 +684,8 @@ sub PreStatTable {
     $Ptr .= '<pre>'.
     '<b>  #Stdnts</b>: Total Number of Students opened the problem.<br>'. 
     '<b>  Tries  </b>: Total Number of Tries for solving the problem.<br>'. 
-    '<b>  Max   </b> : Maximunm Number of Tries for solving the problem.<br>'. 
-    '<b>  Avg.   </b>: Average Number of the tries. [ Tries / #Stdnts ]<br>'.
+    '<b>  Mod    </b>: Maximunm Number of Tries for solving the problem.<br>'. 
+    '<b>  Mean   </b>: Average Number of the tries. [ Tries / #Stdnts ]<br>'.
     '<b>  #YES   </b>: Number of students solved the problem correctly.<br>'. 
     '<b>  #yes   </b>: Number of students solved the problem by override.<br>'.
     '<b>  %Wrng  </b>: Percentage of students tried to solve the problem but'.
@@ -614,10 +693,10 @@ sub PreStatTable {
 #    '  DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ]<br>'. Kashy formula
     '<b>  DoDiff </b>: Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'. #Gerd formula
     '<b>  S.D.  </b> : Standard Deviation of the tries.'.
-    '[ sqrt(sum((Xi - Avg.)^2)) / (#Stdnts-1)'.
+    '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.
     ' where Xi denotes every student\'s tries ]<br>'.
     '<b>  Skew.  </b>: Skewness of the students tries.'.
-	' [ (sqrt( sum((Xi - Avg.)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
+	' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
     '<b>  Dis.F. </b>: Discrimination Factor: A Standard for '.
 	'evaluating the problem according to a Criterion<br>'.
 	'<b>           [Applied Criterion in %27 Upper Students - '.
@@ -670,15 +749,18 @@ sub usection {
     my ($udom,$unam,$courseid,$ActiveFlag)=@_;
     $courseid=~s/\_/\//g;
     $courseid=~s/^(\w)/\/$1/;
-    foreach (split(/\&/,&Apache::lonnet::reply('dump:'.
-             $udom.':'.$unam.':roles',
-             &Apache::lonnet::homeserver($unam,$udom)))){
-        my ($key,$value)=split(/\=/,$_);
-        $key=&Apache::lonnet::unescape($key);
+
+    my %result=&Apache::lonnet::dump('roles',$udom,$unam);
+    my ($checkForResult)=keys(%result);
+    if ($checkForResult=~/^(con_lost|error|no_such_host)/i) {
+	return -1;
+    }
+    foreach my $key (keys (%result)) {
+	my $value=$result{$key};
         if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
             my $section=$1;
             if ($key eq $courseid.'_st') { $section=''; }
-	    my ($dummy,$end,$start)=split(/\_/,&Apache::lonnet::unescape($value));
+	    my ($dummy,$end,$start)=split(/\_/,$value);
 	    if ( $ActiveFlag ne 'Any' ) {
 		my $now=time;
 		my $notactive=0;
@@ -725,7 +807,7 @@ sub ExtractStudentData {
     my $SecLimit;
     my $MapLimit;
     my ($temp)=keys(%result);
-    unless ($temp=~/^error\:/) {
+    unless ($temp=~/^(con_lost|error|no_such_host)/i) {
         foreach my $CurCol(@cols) {
 	    ($PrOrd,$ResId)=split(/\:/,$CurCol);
 	    if ( !$CurCol ) { next; }
@@ -848,6 +930,7 @@ sub ExtractStudentData {
 }
 
 
+
 # ------------------------------------------------------------ Build page table
 sub tracetable {
     my ($rid,$beenhere)=@_;
@@ -995,7 +1078,6 @@ sub Build_Statistics {
 
     @list = sort (@list);
 
-
     &Discriminant();
 
     $OpSel2='';
@@ -1135,6 +1217,7 @@ sub Cache_Statistics {
     my @list = ();
     my $Useful;
     my $UnUseful;
+#    $r->print('<input type="hidden" name="show" value="excel" />'."\n"); 
     my %myHeader = reverse( %Header );
     $Pos = $myHeader{$ENV{'form.sort'}};
     if ($Pos > 0) {$Pos++;}
@@ -1295,46 +1378,72 @@ sub initial {
   $HWN=$P_Order;
 }
 
+#	my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
+#                  "_$ENV{'user.domain'}_$cid\_classlist.db";
+#	if (-e "$CacheDB") {
+#	    if (tie(%students,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
+#		&CachClassList();
+#	    }
+#            else {
+#	        $r->print("Unable to tie hash to db file");
+#            }
+#        }
+#        else {
+#	    if (tie(%students,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {
+#	        &MakeClassList();
+#	    }
+#            else {
+#	        $r->print("Unable to tie hash to db file");
+#            }
+#        }
+#        untie(%students);
+
 
 sub ClassList {
 
     &GetStatus();
 
     $cid=$ENV{'request.course.id'};
-    my $chome=$ENV{'course.'.$cid.'.home'};
     my ($cdom,$cnum)=split(/\_/,$cid);
 # ----------------------- Get first and last resource, see if there is anything
     $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
     $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}};
     if (($firstres) && ($lastres)) {
-	#my %result = &Apache::lonnet::dump('classlist',$sdom,$sname);
-	my $classlst=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':classlist',$chome);
+#	my %students = &Apache::lonnet::dump('classlist',$cdom,$cnum);
+#    $Apache::lonxml::debug=1;
+#    &Apache::lonhomework::showhash(%students);
+#    $Apache::lonxml::debug=0;
+#	my $StudNo = 0;
+#	my $now=time;
+#	my ($temp)=keys(%students);
+#	unless ($temp=~/^error\:/) {
+#	    foreach my $KeyPoint(sort keys(%students)) {
+
+
 	my $StudNo = 0;
 	my $now=time;
-	unless ($classlst=~/^error\:/) {
-	    foreach (sort split(/\&/,$classlst)) {
-		my ($name,$value)=split(/\=/,$_);
-		my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
-		$name=&Apache::lonnet::unescape($name);
-		my ($sname,$sdom)=split(/\:/,$name);
+
+	my %classlist=&Apache::lonnet::dump('classlist',$cdom,$cnum);
+
+	my ($checkForError)=keys(%classlist);
+	if($checkForError=~/^(con_lost|error|no_such_host)/i) {
+	    $r->print('<h1>Could not access course data</h1>');
+	} else {
+	    foreach my $name (keys (%classlist)) {
+		my $value=$classlist{$name};
+		my ($end,$start)=split(/\:/,$value);
 		my $active=1;
 		my $Status=$ENV{'form.status'};
 		$Status = ($Status) ? $Status : 'Active';
 		if ( ( ($end) && $now > $end ) && 
-                     ( ($Status eq 'Active') ) ) { $active=0; }
+		     ( ($Status eq 'Active') ) ) { $active=0; }
 		if ( ($Status eq 'Expired') && 
-                     ($end == 0 || $now < $end) ) { $active=0; }
+		     ($end == 0 || $now < $end) ) { $active=0; }
 		if ($active) {
 		    my $thisindex=$#students+1;
-		    $name=&Apache::lonnet::unescape($name);
 		    $students[$thisindex]=$name;
 		    my ($sname,$sdom)=split(/\:/,$name);
-		    #my %reply=&Apache::lonnet::idrget($sdom,$sname);
-		    #my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
-		    #         ':environment:lastname&generation&firstname&middlename',
-		    #         &Apache::lonnet::homeserver($sname,$sdom));
 		    my $ssec=&usection($sdom,$sname,$cid,$Status);
-#		    if ($ssec==-1 ) {next;}
 		    if ($ssec==-1 || $ssec eq 'adm' ) {next;}
 		    $ssec=($ssec) ? $ssec : '(none)';
 		    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
@@ -1344,12 +1453,10 @@ sub ClassList {
 			$StuBox{$sname}=$sdom;
 		    }
 		    $StudNo++;
-	        }
+		}
 	    }
 	}
-	else {
-	    $r->print('<h1>Could not access course data</h1>');
-	} 
+
         $r->print("Total number of students : ".($#students+1));
         $r->rflush();
 # --------------- Find all assessments and put them into some linear-like order
@@ -1387,10 +1494,12 @@ sub Title {
     $r->rflush();	
 }
 
+
 sub CreateForm {
     $r->print("\n".'<form name=stat method=post action="/adm/statistics" >');
     my $content = $ENV{'form.sort'};
-    if (!($ENV{'form.showcsv'}) && ($content eq '' || $content eq 'Return to Menu')) {
+    if (!($ENV{'form.showcsv'}) && 
+        ($content eq '' || $content eq 'Return to Menu')) {
 	my $Ptr = '<h3>';
 	$Ptr .= '<input type=submit name=sort value="Problem Stats"/>';
 	$Ptr .= '<br><br>';
@@ -1398,9 +1507,12 @@ sub CreateForm {
 	$Ptr .= '<br><br>';
 	$Ptr .= '<input type=submit name=sort value="Student Assessment"/>';
 	$Ptr .= '</h3>';
+	#$Ptr .= '<input type=submit name=sort value="Activity Log"/>';
+	#$Ptr .= '</h3>';
 	$r->print( $Ptr );
     }
     else {
+	&ClassList();
 	if ( $content eq 'Student Assessment' || 
 	     $content eq 'Create Student Report' ) {
 	    &MapSecOptions();
@@ -1420,13 +1532,16 @@ sub CreateForm {
 
 sub Menu {
     &initial();
-    #$Apache::lonxml::debug=1;
-    #&Apache::lonhomework::showhash(%ENV);
-    #$Apache::lonxml::debug=0;
+#    $Apache::lonxml::debug=1;
+#    &Apache::lonhomework::showhash(%ENV);
+#    $Apache::lonxml::debug=0;
     &Title();
-    &ClassList();
     my $InpStr = $ENV{'form.sort'};
-    if ($InpStr=~/^Analyze\_/) {
+    if ($InpStr eq 'Activity Log') {
+	&Activity();
+    }    
+    elsif ($InpStr=~/^Analyze\_/) {
+	&ClassList();
 	&ShowOpGraph($InpStr,$ENV{'form.interval'});
     }
     elsif ( $InpStr eq 'DoDiff Graph' || $InpStr eq '%Wrong Graph' ) {      
@@ -1442,6 +1557,7 @@ sub Menu {
     $r->rflush();
 }
 
+
 sub StudentOptions {
     my $OpSel5='';
     $CurStu = $ENV{'form.student'};
@@ -1497,7 +1613,7 @@ sub GetStatus {
 
 sub MapSecOptions {
 # ----------------------------------- Loading the Maps Combobox
-    my $Ptr = '';
+    my $Ptr = '<br>';
     $Ptr .= '<input type="submit" name="sort" value="Return to Menu" />';
     $Ptr .= '<br><b> Select &nbsp; Map &nbsp; &nbsp; </b>'."\n".
        	    '<select name="maps">'."\n".