--- loncom/interface/statistics/lonproblemstatistics.pm	2002/07/30 23:08:56	1.8
+++ 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.8 2002/07/30 23:08:56 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(/\&/,
@@ -584,7 +595,7 @@ sub TableRow {
        $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$DiscNo,$Prob)=split(/\&/,$Str);	
 #    $r->print('<br>'.$Str);
     my $Ptr;
-    if ($ENV{'form.showcsv'}) {
+    if($cache->{'DisplayFormat'} eq 'Display CSV Format') {
         my ($ResId,$Dummy)=split(/\*/,$Prob);
         $Ptr="\n".'<br>'.
              "\n".'"'.($RealIdx+1).'",'.
@@ -650,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;';
@@ -711,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>';
 
@@ -858,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;
 }