--- loncom/interface/statistics/lonproblemstatistics.pm	2002/07/30 22:09:01	1.7
+++ 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.7 2002/07/30 22:09:01 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();
@@ -166,13 +173,13 @@ 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++;
 
         #$discrim .= '&';
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
@@ -383,8 +390,12 @@ 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(/\&/,
@@ -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+)/;
@@ -579,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;
@@ -646,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;';
@@ -707,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>';
 
@@ -842,9 +808,7 @@ sub Discriminant {
     my %DisLow = &ProcessDiscriminant(\@LowList,$r);
 
     return (\%DisUp, \%DisLow);
-}
-
-   
+}   
 
 #---- END Problem Statistics Web Page ----------------------------------------
 
@@ -856,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;
 }