--- loncom/interface/statistics/lonproblemanalysis.pm	2002/08/13 00:37:18	1.5
+++ loncom/interface/statistics/lonproblemanalysis.pm	2002/08/14 16:18:55	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonproblemanalysis.pm,v 1.5 2002/08/13 00:37:18 stredwic Exp $
+# $Id: lonproblemanalysis.pm,v 1.7 2002/08/14 16:18:55 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ package Apache::lonproblemanalysis;
 
 use strict;
 use Apache::lonnet();
+use Apache::lonhtmlcommon();
 use GDBM_File;
 
 my $jr;
@@ -48,11 +49,26 @@ sub BuildProblemAnalysisPage {
 
     my %cache;
     unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $r->print('<html><body>Unable to tie database.</body></html>');
+        $r->print('Unable to tie database.');
         return;
     }
 
-    $r->print(&IntervalOptions($cache{'Interval'}));
+    my $Ptr = '';
+    $Ptr .= '<table border="0"><tbody>';
+    $Ptr .= '<tr><td align="right"><b>Select Sections</b>';
+    $Ptr .= '</td>'."\n";
+    $Ptr .= '<td align="left">'."\n";
+    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
+    my @sections = split(':',$cache{'sectionList'});
+    $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
+                                                          \@sectionsSelected,
+                                                          'Statistics');
+    $Ptr .= '</td></tr>'."\n";
+    $Ptr .= '<tr><td align="right"><b>Intervals</b></td>'."\n";
+    $Ptr .= '<td align="left">';
+    $Ptr .= &IntervalOptions($cache{'Interval'});
+    $Ptr .= '</td></tr></table><br>';
+    $r->print($Ptr);
     $r->rflush();
     $r->print(&OptionResponseTable($cache{'OptionResponses'}, \%cache));
 
@@ -69,17 +85,53 @@ sub BuildAnalyzePage {
 
     my $Str = '</form>';
     my %cache;
-    if(&Apache::loncoursedata::DownloadStudentCourseDataSeparate($students, 'true', 
-                                                                 $cacheDB, 'true', 
-                                                                 'true', $courseID, 
-                                                                 $r, $c) ne 'OK') {
+
+    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+        $Str .= 'Unable to tie database.';
+        $r->print($Str);
+        return;
+    }
+
+    # Remove students who don't have the proper section.
+    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
+    for(my $studentIndex=((scalar @$students)-1); $studentIndex>=0;
+        $studentIndex--) {
+        my $value = $cache{$students->[$studentIndex].':section'};
+        my $found = 0;
+        foreach (@sectionsSelected) {
+            if($_ eq 'none') {
+                if($value eq '' || !defined($value) || $value eq ' ') {
+                    $found = 1;
+                    last;
+                }
+            } else {
+                if($value eq $_) {
+                    $found = 1;
+                    last;
+                }
+            }
+        }
+        if($found == 0) {
+            splice(@$students, $studentIndex, 1);
+        }
+    }
+    untie(%cache);
+
+    if(&Apache::loncoursedata::DownloadStudentCourseDataSeparate($students, 
+                                                                 'true', 
+                                                                 $cacheDB, 
+                                                                 'true', 
+                                                                 'true', 
+                                                                 $courseID, 
+                                                                 $r, 
+                                                                 $c) ne 'OK') {
         $r->print($Str);
         return;
     }
 
 
     unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $Str .= '<html><body>Unable to tie database.</body></html>';
+        $Str .= 'Unable to tie database.';
         $r->print($Str);
         return;
     }
@@ -160,8 +212,7 @@ sub IntervalOptions {
         }
     }
 
-    my $Ptr = '<br><b>Select number of intervals</b>'."\n".
-       	      '<select name="Interval">'."\n";
+    my $Ptr = '<select name="Interval">'."\n";
     for(my $n=1; $n<=7;$ n++) {
 	$Ptr .= '<option';
         if($interval == $n) {
@@ -176,43 +227,57 @@ sub IntervalOptions {
 
 sub OptionResponseTable {
     my ($optionResponses,$cache)=@_;
-    my $Str = '';
-    $Str .= '<br><b> Option Response Problems in this course:</b>'."\n";
-    $Str .= '<br><br>'."\n";
-    $Str .= "<table border=2><tr><th> \# </th><th> Problem Title </th>";
-    $Str .= '<th> Resource </th><th> Analysis  </th></tr>'."\n";
 
-    my $number=1;
     my @optionResponses=split(':::', $optionResponses);
     my %partCount;
-    foreach (@optionResponses) {
-        my ($problemId, $part, undef)=split(':',$_);
+    my %sequences;
+    foreach(@optionResponses) {
+        my ($sequence, $problemId, $part, undef)=split(':',$_);
         $partCount{$problemId.':'.$part}++;
+        if(!defined($sequences{$sequence})) {
+            $sequences{$sequence} = $_;
+        } else {
+            $sequences{$sequence} .= ':::'.$_;
+        }
     }
 
-    foreach (@optionResponses) {
-        my ($problemId, $part, $response)=split(':',$_);
-        my $uri = $cache->{$problemId.':source'};
-        my $title = $cache->{$problemId.':title'};
-
-        my $Temp = '<a href="'.$uri.'" target="_blank">'.$title.'</a>';
-        $Str .= '<tr>';
-        $Str .= '<td> '.$number.' </td>';
-        $Str .= '<td bgcolor="#DDFFDD">'.$Temp.'</td>';
-        $Str .= '<td bgcolor="#EEFFCC">'.$uri.'</td>';
-        if($partCount{$problemId.':'.$part} < 2) {
-            $Str .= '<td><input type="submit" name="Analyze:::';
-            $Str .= $problemId.':'.$part.'" value="';
-            $Str .= 'Part '.$part;
-            $Str .= '" /></td></tr>'."\n";
-        } else {
-            $Str .= '<td><input type="submit" name="Analyze:::'.$_.'" value="';
-            $Str .= 'Part '.$part.' Response '.$response;
-            $Str .= '" /></td></tr>'."\n";
+    my $Str = '';
+
+    foreach my $sequence (sort(keys(%sequences))) {
+        my @optionProblems = split(':::', $sequences{$sequence});
+
+        $Str .= '<b>'.$cache->{$sequence.':title'}.'</b>'."\n";
+        $Str .= "<table border=2><tr><th> \# </th><th> Problem Title </th>";
+        $Str .= '<th> Resource </th><th> Analysis  </th></tr>'."\n";
+
+        my $count = 1;
+        foreach(@optionProblems) {
+            my (undef, $problemId, $part, $response)=
+                split(':',$sequences{$sequence});
+            my $uri = $cache->{$problemId.':source'};
+            my $title = $cache->{$problemId.':title'};
+
+            my $Temp = '<a href="'.$uri.'" target="_blank">'.$title.'</a>';
+            $Str .= '<tr>';
+            $Str .= '<td> '.$count.' </td>';
+            $Str .= '<td bgcolor="#DDFFDD">'.$Temp.'</td>';
+            $Str .= '<td bgcolor="#EEFFCC">'.$uri.'</td>';
+            if($partCount{$problemId.':'.$part} < 2) {
+                $Str .= '<td><input type="submit" name="Analyze:::';
+                $Str .= $problemId.':'.$part.'" value="';
+                $Str .= 'Part '.$part;
+                $Str .= '" /></td></tr>'."\n";
+            } else {
+                my $value = $problemId.':'.$part.':'.$response;
+                $Str .= '<td><input type="submit" name="Analyze:::'.$value;
+                $Str .= '" value="';
+                $Str .= 'Part '.$part.' Response '.$response;
+                $Str .= '" /></td></tr>'."\n";
+            }
+            $count++;
         }
-        $number++;
+        $Str .= '</table><br>'."\n";
     }
-    $Str .= '</table>'."\n";
 
     return $Str;
 }
@@ -381,12 +446,7 @@ sub InitAnalysis {
                                         'grade_domain'   => $domain,
                                         'grade_courseid' => $courseID,
                                         'grade_symb'     => $problem));
-    my ($a)=&Apache::lonnet::str2hashref($Answ);
-    my %b;
-    foreach (keys(%$a)) {
-        $b{&Apache::lonnet::unescape($_)} = $a->{$_};
-    }
-    my $Answer=\%b;
+    my ($Answer)=&Apache::lonnet::str2hashref($Answ);
 
     my $found = 0;
     my @parts=();

Select Sections'; + $Ptr .= '	'."\n"; + my @sectionsSelected = split(':',$cache{'sectionsSelected'}); + my @sections = split(':',$cache{'sectionList'}); + $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections, + \@sectionsSelected, + 'Statistics'); + $Ptr .= '
Intervals	'; + $Ptr .= &IntervalOptions($cache{'Interval'}); + $Ptr .= '