--- loncom/interface/statistics/lonproblemstatistics.pm	2002/07/29 22:01:11	1.6
+++ loncom/interface/statistics/lonproblemstatistics.pm	2002/08/01 20:49:06	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonproblemstatistics.pm,v 1.6 2002/07/29 22:01:11 minaeibi Exp $
+# $Id: lonproblemstatistics.pm,v 1.9 2002/08/01 20:49:06 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,9 +56,16 @@ sub BuildProblemStatisticsPage {
     $Ptr .= '<table border="0"><tbody>';
     $Ptr .= '<tr><td align="right"><b>Select Map</b></td>'."\n";
     $Ptr .= '<td align="left">';
-    $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics');
+    $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics',
+                                               'Statistics');
+    $Ptr .= '</td></tr>'."\n";
+    $Ptr .= '<tr><td align="right"><b>Sorting Type:</b></td>'."\n";
+    $Ptr .= '<td align="left">'."\n";
+    $Ptr .= &Apache::lonhtmlcommon::AscendOrderOptions(
+                                            $cache{'ProblemStatisticsAscend'}, 
+                                            'ProblemStatistics',
+                                            'Statistics');
     $Ptr .= '</td></tr>'."\n";
-    $Ptr .= &AscendOrderOptions($cache{'Ascend'});
     $Ptr .= &ProblemStatisticsButtons($cache{'DisplayFormat'});
     $Ptr .= '</table>';
     $Ptr .= &ProblemStatisticsLegend();
@@ -91,12 +98,12 @@ sub BuildProblemStatisticsPage {
     }
     #&Apache::lonstatistics::Close_PrgWin($r);
  
-    my ($upper, $lower) = &Discriminant(\%discriminant);
+    my ($upper, $lower) = &Discriminant(\%discriminant,$r);
     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.");
     my $color=&setbgcolor(0);
-    my %GraphDat= &BuildStatisticsTable(\%cache, \%discriminant, \@list, 
+    my %GraphDat= &BuildStatisticsTable(\%cache, $upper, $lower, \@list, 
                                         \%Header, $students, $r, $color);
     untie(%cache);
 }
@@ -157,6 +164,7 @@ sub ExtractStudentData {
     my $TotFirst = 0;
     my $TimeTot = 0;
     my $Discussed=0;
+    my $discrim='';
     my $tempSequenceOrder=100;
 
 #$Apache::lonxml::debug=1;
@@ -165,15 +173,15 @@ sub ExtractStudentData {
 
     foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
 	my $tempProblemOrder=100;
-	$tempSequenceOrder++;
-#        if($cache->{'ProblemStatisticsMap'} ne 'All Maps'  &&
-#           $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
+        if($cache->{'ProblemStatisticsMaps'} ne 'All Maps'  &&
+           $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) {
 #	    $r->print("<br>sequences=$cache->{'orderedSequences'}");
 #	    $r->print("<br>".$cache->{$sequence.':title'});
-#            next;
-#        }
+            next;
+        }
+	$tempSequenceOrder++;
 
-        my $Dis = '';
+        #$discrim .= '&';
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
 #	    $r->print("<br>problems=$cache->{$sequence.':problems'}");
             my $problem = $cache->{$problemID.':problem'};
@@ -192,6 +200,7 @@ sub ExtractStudentData {
             #}
 
             my %partData=undef;
+	    $partData{'count'}=0;
             # Initialize part data, display skips correctly
             # Skip refers to when a student made no submissions on that
             # part/problem.
@@ -199,6 +208,7 @@ sub ExtractStudentData {
                                                   $problemID.
                                                   ':parts'})) {
 		$tempProblemOrder++;
+		$partData{'count'}++;
 #		$r->print("<br>parts=$cache->{$sequence.':'.$problemID.':parts'}");
                 $partData{$part.':order'}=$tempProblemOrder;
                 $partData{$part.':tries'}=0;
@@ -225,13 +235,12 @@ sub ExtractStudentData {
 		    $Discussed=0;
                     my $code='-';
 
-                    $awarded = $cache->{$name.
-                                        "$Version:$problem:resource.".
+                    $awarded = $cache->{"$name:$Version:$problem:resource.".
                                         "$part.awarded"};
                     $partData{$part.':awarded'} = ($awarded) ? $awarded : 0;
                     $totalAwarded += $awarded;
 
-                    $tries = $cache->{$name.":$Version:$problem".
+                    $tries = $cache->{"$name:$Version:$problem".
                                       ":resource.$part.tries"};
                     $partData{$part.':tries'} = ($tries) ? $tries : 0;
                     $partData{$part.':wrong'} = $partData{$part.':tries'};
@@ -258,10 +267,10 @@ sub ExtractStudentData {
 
             # Loop through all the parts for the current problem in the 
             # correct order and prepare the output
+	    my $partCounter=0;
             foreach (split(/\:/,$cache->{$sequence.':'.$problemID.
                                          ':parts'})) {
-	    #$r->print("<br>".$cache->{$sequence.':title'});
-
+		$partCounter++;
                 my $Yes = 0;
                 if($partData{$_.':code'} eq 'C' || 
                    $partData{$_.':code'} eq 'O') {
@@ -270,10 +279,12 @@ sub ExtractStudentData {
                 my $pOrder=$partData{$_.':order'};
                 my $ptr = $tempSequenceOrder.':'.$pOrder.':'.$problemID;
 
-                if($_ > 1) {
+                if($partData{'count'} > 1) {
                     $ptr .= "*(part $_)";
-                    $Dis .= '&';
                 }
+                #if($partCounter > 1) {
+                    $discrim .= '&';
+                #}
 
 		my ($pr_no,$dod)=split('&',$ptr);
 #		my $DoDiff=$DoDiff->{$dod};
@@ -293,7 +304,7 @@ sub ExtractStudentData {
                     $Discussed=1;
                 }
                 my $time = $cache->{"$name:$LatestVersion:$problem:timestamp"};
-                $Dis .= $tempSequenceOrder.'@'.$pOrder.'='.$DisF.'+'.$Yes;
+                $discrim .= $tempSequenceOrder.'@'.$pOrder.'='.$DisF.'+'.$Yes;
                 $ptr .= '&'.$partData{$_.':tries'}.
                         '&'.$partData{$_.':wrong'}.
                         '&'.$partData{$_.':code'};
@@ -323,18 +334,17 @@ sub ExtractStudentData {
                 $tempProblemOrder++;
             }
         }
-	my $pstr;
-        if($totalTries) {
-	    my $DisFac = ($totalAwarded/$totalTries);
-	    my $DisFactor = sprintf( "%.4f", $DisFac );
-            my $TS = sprintf( "%.2f", $spent );
-            my $TS_yes = sprintf( "%.2f", $spent_yes );
-	   # $DiscFac{$DisFactor}=$Dis;
-	    $pstr=$DisFactor.':'.$name.':'.$ProbTot.':'.$TotalOpend.':'.
-                  $totalTries.':'.$ProbSolved.':'.$TotFirst.':'.
-                  $TS_yes.':'.$TS.':'.$TotDiscuss;
-	    (%$discriminant)->{$pstr}=$Dis;
-	}
+    }
+    my $pstr;
+    if($totalTries) {
+	my $DisFac = ($totalAwarded/$totalTries);
+	my $DisFactor = sprintf( "%.4f", $DisFac );
+        my $TS = sprintf( "%.2f", $spent );
+        my $TS_yes = sprintf( "%.2f", $spent_yes );
+	$pstr=$DisFactor.':'.$name.':'.$ProbTot.':'.$TotalOpend.':'.
+              $totalTries.':'.$ProbSolved.':'.$TotFirst.':'.
+              $TS_yes.':'.$TS.':'.$TotDiscuss;
+	(%$discriminant)->{$pstr}=$discrim;
     }
 }
 
@@ -354,8 +364,7 @@ sub MySort {
 
 
 sub BuildStatisticsTable {
-    my ($cache,$discriminantFactor,$list,$headings,$students,$r,$color)=@_;
-
+    my ($cache,$upper,$lower,$list,$headings,$students,$r,$color)=@_;
     my $NoElements = scalar @$list;
     my @List=sort(@$list);
 
@@ -381,14 +390,16 @@ sub BuildStatisticsTable {
     my $cIdx=0;
 
     foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
-
-        &CreateProblemStatisticsTableHeading(1,$cache->{$sequence.':source'},
+        if($cache->{'ProblemStatisticsMaps'} ne 'All Maps'  &&
+           $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) {
+            next;
+        }
+        &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, 
+                                             $cache->{$sequence.':source'},
                                              $cache->{$sequence.':title'}, 
                                              $headings,$r);
-
 	my ($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/,
                                                    $List[$cIdx]);
-
         my ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar);
 	$sequence+=100;
 	while ($SqOrd==$sequence && $cIdx<$NoElements) {
@@ -427,7 +438,11 @@ sub BuildStatisticsTable {
 	    $Temp = '<a href="'.$cache->{$ResId.':source'}.
                 '" target="_blank">'.$cache->{$ResId.':title'}.$Dummy.'</a>';
 
-	    my $res = &Apache::lonnet::declutter($cache->{'src_'.$ResId});
+	    #$r->print('<br>rid='.$ResId);
+	    #$r->print('<br>src='.$cache->{$ResId.':source'});
+	    #$r->print('<br>tit='.$cache->{$ResId.':title'});
+
+	    my $res = &Apache::lonnet::declutter($cache->{$ResId.':source'});
 	    my $urlres=$res;
 
 	    $ResId=~/(\d+)\.(\d+)/;
@@ -481,8 +496,9 @@ sub BuildStatisticsTable {
 	    }
 
 #--------------------- Compute the Discrimination Factors
-            my ($Up1,$Up2)=split(/\:/,':');#jason$DisUp->{$lpr[$i]});
-	    my ($Lw1,$Lw2)=split(/\:/,':');#jason$DisLow->{$lpr[$i]});
+            my ($Up1,$Up2)=split(/\:/,$upper->{$sequence.'@'.$pOrd});
+	    my ($Lw1,$Lw2)=split(/\:/,$lower->{$sequence.'@'.$pOrd});
+
 	    my $Dis1 = $Up1 - $Lw1;
 	    my $Dis2 = $Up2 - $Lw2;
 	    my $_D1 = sprintf("%.2f", $Dis1);
@@ -578,46 +594,46 @@ sub TableRow {
     my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override,
        $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$DiscNo,$Prob)=split(/\&/,$Str);	
 #    $r->print('<br>'.$Str);
-    if ($ENV{'form.showcsv'}) {
+    my $Ptr;
+    if($cache->{'DisplayFormat'} eq 'Display CSV Format') {
         my ($ResId,$Dummy)=split(/\*/,$Prob);
-        my $Ptr =  "\n".'<br>'.
-               "\n".'"'.($RealIdx+1).'",'.
-               "\n".'"'.$cache->{'title_'.$ResId}.$Dummy.'",'.
-               "\n".'"'.$cache->{'src_'.$ResId}.'",'.
-               "\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".'"'.$DiscNo.'"';
+        $Ptr="\n".'<br>'.
+             "\n".'"'.($RealIdx+1).'",'.
+             "\n".'"'.$cache->{'title_'.$ResId}.$Dummy.'",'.
+             "\n".'"'.$cache->{'src_'.$ResId}.'",'.
+             "\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".'"'.$DiscNo.'"';
 
         $r->print("\n".$Ptr);
-    }
-    else{
-        my $Ptr =  "\n".'<tr>'.
-               "\n".'<td>'.($RealIdx+1).'</td>'.
-          #     "\n".'<td>'.$PrOrd.$Temp.'</td>'.
-               "\n".'<td>'.$Temp.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$StdNo.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$TotalTries.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$MxTries.'</td>'.
-               "\n".'<td bgcolor='.$color->{"gb"}.'>'.$Avg.'</td>'.
-               "\n".'<td bgcolor='.$color->{"gb"}.'> '.$YES.'</td>'.
-               "\n".'<td bgcolor='.$color->{"gb"}.'> '.$Override.'</td>'.
-               "\n".'<td bgcolor='.$color->{"red"}.'> '.$Wrng.'</td>'.
-               "\n".'<td bgcolor='.$color->{"red"}.'> '.$DoD.'</td>'.
-               "\n".'<td bgcolor='.$color->{"green"}.'> '.$SD.'</td>'.
-               "\n".'<td bgcolor='.$color->{"green"}.'> '.$Sk.'</td>'.
-               "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D1.'</td>'.
-	       "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D2.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$DiscNo.'</td>';
+    } else {
+        $Ptr="\n".'<tr>'.
+             "\n".'<td>'.($RealIdx+1).'</td>'.
+          #  "\n".'<td>'.$PrOrd.$Temp.'</td>'.
+             "\n".'<td>'.$Temp.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$StdNo.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$TotalTries.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$MxTries.'</td>'.
+             "\n".'<td bgcolor='.$color->{"gb"}.'>'.$Avg.'</td>'.
+             "\n".'<td bgcolor='.$color->{"gb"}.'> '.$YES.'</td>'.
+             "\n".'<td bgcolor='.$color->{"gb"}.'> '.$Override.'</td>'.
+             "\n".'<td bgcolor='.$color->{"red"}.'> '.$Wrng.'</td>'.
+             "\n".'<td bgcolor='.$color->{"red"}.'> '.$DoD.'</td>'.
+             "\n".'<td bgcolor='.$color->{"green"}.'> '.$SD.'</td>'.
+             "\n".'<td bgcolor='.$color->{"green"}.'> '.$Sk.'</td>'.
+             "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D1.'</td>'.
+	     "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D2.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$DiscNo.'</td>';
         $r->print("\n".$Ptr.'</tr>' );
     }
 #    $GraphDat->{$RealIdx}=$DoD.':'.$Wrng;
@@ -645,59 +661,10 @@ sub setbgcolor {
     return \%color;
 }
 
-
-sub StatusOptions {
-    my ($cache)=@_;
-
-    my $Status = $cache->{'Status'};
-    my $OpSel1 = '';
-    my $OpSel2 = '';
-    my $OpSel3 = '';
-
-    if($Status eq 'Any')         { $OpSel3 = ' selected'; }
-    elsif($Status eq 'Expired' ) { $OpSel2 = ' selected'; }
-    else                         { $OpSel1 = ' selected'; }
-
-    my $Ptr = '';
-    $Ptr .= '<tr><td align="right"><b>Student Status:</b></td>'."\n";
-    $Ptr .= '<td align="left"><select name="Status">';
-    $Ptr .= '<option'.$OpSel1.'>Active</option>'."\n";
-    $Ptr .= '<option'.$OpSel2.'>Expired</option>'."\n";
-    $Ptr .= '<option'.$OpSel3.'>Any</option>'."\n";
-    $Ptr .= '</select></td></tr>'."\n";
-
-    return $Ptr;
-}
-
-sub AscendOrderOptions {
-    my ($order)=@_;
-
-    my $OpSel1 = '';
-    my $OpSel2 = '';
-
-    if($order eq 'Ascending') {
-        $OpSel1 = ' selected';
-    } else {
-        $OpSel2 = ' selected';
-    }
-
-    my $Ptr = '';
-    $Ptr .= '<tr><td align="right"><b>Sorting Type:</b></td>'."\n";
-    $Ptr .= '<td align="left"><select name="Ascend">'."\n";
-    $Ptr .= '<option'.$OpSel1.'>Ascending</option>'."\n".
-	    '<option'.$OpSel2.'>Descending</option>'."\n";
-    $Ptr .= '</select></td></tr>'."\n";
-
-    return $Ptr;
-}
-
 sub ProblemStatisticsButtons {
     my ($displayFormat)=@_;
 
     my $Ptr = '<tr><td></td><td align="left">';
-    $Ptr .= '<input type=submit name="ProblemStatisticsRecalculate" ';
-    $Ptr .= 'value="Recalculate Statistics"/>'."\n";
-    $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="DoDiffGraph" ';
     $Ptr .= 'value="DoDiff Graph" />'."\n";
     $Ptr .= '&nbsp;&nbsp;&nbsp;';
@@ -706,9 +673,9 @@ sub ProblemStatisticsButtons {
     $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="DisplayCSVFormat" ';
     if($displayFormat eq 'Display CSV Format') {
-        $Ptr .= 'value="Display CSV Format" />'."\n";
-    } else {
         $Ptr .= 'value="Display Table Format" />'."\n";
+    } else {
+        $Ptr .= 'value="Display CSV Format" />'."\n";
     }
     $Ptr .= '</td></tr>';
 
@@ -773,7 +740,7 @@ sub ProblemStatisticsLegend {
 
 #------- Processing upperlist and lowerlist according to each problem
 sub ProcessDiscriminant {
-    my ($List) = @_;
+    my ($List,$r) = @_;
     my @sortedList = sort (@$List);
     my $Count = scalar @sortedList;
     my $Problem;
@@ -786,6 +753,7 @@ sub ProcessDiscriminant {
     my $nStudent=0;
     my %Proc=undef;
     while ($nIndex<$Count) {
+#        $r->print("<br> $nIndex) $sortedList[$nIndex]");
 	($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]);
 	@Dis=split(/\+/,$tmp);
 	my $Temp = $Problem;
@@ -797,9 +765,8 @@ sub ProcessDiscriminant {
 	    ($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]);
 	    @Dis=split(/\+/,$tmp);
 	} while ( $Problem eq $Temp && $nIndex < $Count );
-#	$Proc{$Temp}=($Sum1/$nStudent).':'.$nStudent;
 	$Proc{$Temp}=($Sum1/$nStudent).':'.($Sum2/$nStudent);
-#       $r->print("$nIndex) $Temp --> ($nStudent) $Proc{$Temp} <br>");
+#        $r->print("<br> $nIndex) $Temp --> ($nStudent) $Proc{$Temp}");
 	$Sum1=0;
 	$Sum2=0;
 	$nStudent=0;
@@ -810,8 +777,11 @@ sub ProcessDiscriminant {
 
 #------- Creating Discimination factor   
 sub Discriminant {
-    my ($discriminantFactor)=@_;
-    my @discriminantKeys=keys(%$discriminantFactor);
+    my ($discriminant,$r)=@_;
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%$discriminant);
+#$Apache::lonxml::debug=0;
+    my @discriminantKeys=keys(%$discriminant);
     my $Count = scalar @discriminantKeys;
 
     my $UpCnt = int(0.27*$Count);
@@ -825,8 +795,8 @@ sub Discriminant {
 	$Count++;    
 	if($low < $UpCnt || $Count > $up) {
             $low++;
-            my $str=$discriminantFactor->{$key};
-            foreach(split(/\:/,$str)){
+            my $str=$discriminant->{$key};
+            foreach(split(/\&/,$str)){
                 if($_) {
                     if($low<$UpCnt) { push(@LowList,$_); }
                     else            { push(@UpList,$_);  }
@@ -834,13 +804,11 @@ sub Discriminant {
             }
         }
     }
-    my %DisUp =  &ProcessDiscriminant(\@UpList);
-    my %DisLow = &ProcessDiscriminant(\@LowList);
+    my %DisUp =  &ProcessDiscriminant(\@UpList,$r);
+    my %DisLow = &ProcessDiscriminant(\@LowList,$r);
 
     return (\%DisUp, \%DisLow);
-}
-
-   
+}   
 
 #---- END Problem Statistics Web Page ----------------------------------------
 
@@ -852,14 +820,18 @@ sub BuildDiffGraph {
     my ($r)=@_;
 
     my $graphData = &GetGraphData('DiffGraph', $r);
-    return '<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />';
+    $r->print('<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />');
+
+    return;
 }
 
 sub BuildWrongGraph {
     my ($r)=@_;
 
     my $graphData = &GetGraphData('WrongGraph', $r);
-    return '<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />';
+    $r->print('<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />');
+
+    return;
 }