--- loncom/interface/statistics/lonproblemanalysis.pm	2004/03/12 20:29:48	1.78
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/06/24 18:47:36	1.87
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.78 2004/03/12 20:29:48 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.87 2004/06/24 18:47:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,10 +51,6 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'NextProblemAnalysis',
                        text => 'Next Problem' },
                      { name => 'break'},
-                     { name => 'ClearCache',
-                       text => 'Clear Caches' },
-                     { name => 'updatecaches',
-                       text => 'Update Student Data' },
                      { name => 'SelectAnother',
                        text => 'Choose a different Problem' },
                      { name => 'ExcelOutput',
@@ -81,25 +77,18 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (@Students < 1) {
+    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
         $r->print('<h2>There are no students in the sections selected</h2>');
     }
     #
-    &Apache::loncoursedata::clear_internal_caches();
-    if (exists($ENV{'form.ClearCache'}) || 
-        exists($ENV{'form.updatecaches'}) ||
-        (exists($ENV{'form.firstanalysis'}) &&
-         $ENV{'form.firstanalysis'} ne 'no')) {
-        &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    }
-    if (! exists($ENV{'form.firstanalysis'})) {
-        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
-    } else {
-        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
-    }
+    my @CacheButtonHTML = 
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
-    my $problem_types = '(option|radiobutton|numerical)';
+    # Support for numerical and radio response isn't complete enough to
+    # include in 1.2 release.
+    # my $problem_types = '(option|radiobutton|numerical)';
+    my $problem_types = '(option)';
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
@@ -111,6 +100,9 @@ sub BuildProblemAnalysisPage {
                 $r->print('&nbsp;'x5);
             }
         }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
         #
         $r->print('<hr />');
         $r->rflush();
@@ -160,13 +152,17 @@ sub BuildProblemAnalysisPage {
                                        $ProblemData,
                                        \@Students);
             } elsif ($current_problem->{'resptype'} eq 'numerical') {
-#                if (exists($ENV{'form.ExcelOutput'})) {
-#                    &Apache::lonstudentsubmissions::prepare_excel_output
-#                        ($r,$current_problem,$ProblemData,\@Students);
-#                } else {
-                    &NumericalResponseAnalysis($r,$current_problem,
-                                               $ProblemData,\@Students);
-#                }
+                ## 
+                ## analyze all responses of a problem at once
+                my $res = $current_problem->{'resource'};
+                foreach my $partid (@{$res->{'parts'}}) {
+                    $current_problem->{'part'} = $partid;
+                    foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) {
+                        $current_problem->{'respid'}=$respid;
+                        &NumericalResponseAnalysis($r,$current_problem,
+                                                   $ProblemData,\@Students);
+                    }
+                }
             } else {
                 $r->print('<h2>This analysis is not supported</h2>');
             }
@@ -192,12 +188,30 @@ sub BuildProblemAnalysisPage {
 #########################################################
 sub NumericalResponseAnalysis {
     my ($r,$problem,$ProblemData,$Students) = @_;
-    my ($resource,$respid) = ($problem->{'resource'},
-                              $problem->{'respid'});
+    my $c = $r->connection();
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    #
+    if (scalar(@{$resource->{'parts'}})>1) {
+        if (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
+            $r->print('<h3>'.
+                      &mt('Part [_1], response [_2].',$partid,$respid).
+                      '</h3>');
+        } else { 
+            $r->print('<h3>'.
+                      &mt('Part [_1]',$partid,$respid).
+                      '</h3>');
+        }
+    } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
+        $r->print('<h3>'.&mt('Response [_1]',$respid).'</h3>');
+    }
+    #
     my $analysis_html;
-    my $PerformanceData = 
-        &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$respid);
+    my $PerformanceData = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $analysis_html = '<h2>'.
@@ -208,7 +222,11 @@ sub NumericalResponseAnalysis {
     }
     #
     # This next call causes all the waiting around that people complain about
-    my ($max,$min) = &GetStudentAnswers($r,$problem,$Students);
+    my ($max,$min) = 
+        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                                   'Statistics',
+                                                   'stats_status');
+    return if ($c->aborted());
     #
     # Collate the data
     my %Data;
@@ -233,6 +251,9 @@ sub one_dimensional_plot {
     # Compute data -> image scaling factors
     my $min = $Labels->[0];
     my $max = $Labels->[-1];
+    if ($max == $min) {
+        $max =$min+1;
+    }
     my $h_scale = ($width-10)/($max-$min);
     #
     my $max_y = 0;
@@ -295,6 +316,17 @@ sub line {
     return qq{<line x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" />$/};
 }
 
+sub text {
+    my ($x,$y,$color,$text,$font,$direction) = @_;
+    if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) {
+        $font = 'medium';
+    }
+    if (! defined($direction) || $direction ne 'vertical') {
+        $direction = '';
+    }
+    return qq{<text x="$x" y="$y" color="$color" font="$font" direction="$direction" >$text</text>};
+}
+
 sub rectangle {
     my ($x1,$y1,$x2,$y2,$color,$thickness,$filled) = @_;
     return qq{<rectangle x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" filled="$filled" />};
@@ -310,34 +342,6 @@ sub circle {
     return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled);
 }
 
-sub GetStudentAnswers {
-    my ($r,$problem,$Students) = @_;
-    my %Answers;
-    my ($resource,$partid,$respid) = ($problem->{'resource'},
-                                      $problem->{'part'},
-                                      $problem->{'respid'});
-    # Open progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$Students));
-    $r->print("<table>\n");
-    $r->rflush();
-    foreach my $student (@$Students) {
-        my $sname = $student->{'username'};
-        my $sdom = $student->{'domain'};
-        my $answer = &Apache::lonstathelpers::analyze_problem_as_student
-            ($resource,$sname,$sdom,$partid,$respid);
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 &mt('last student'));
-        $student->{'answer'} = $answer;
-    }
-    $r->print("</table>\n");
-    $r->rflush();
-    # close progress window
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    return;
-}
-
 sub build_student_data_worksheet {
     my ($workbook,$format) = @_;
     my $rows_output = 3;
@@ -377,9 +381,10 @@ sub RadioResponseAnalysis {
     my ($resource,$respid) = ($problem->{'resource'},
                               $problem->{'respid'});
     my $analysis_html;
-    my $PerformanceData = 
-        &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$respid);
+    my $PerformanceData = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $analysis_html = '<h2>'.
@@ -562,9 +567,10 @@ sub OptionResponseAnalysis {
     my ($resource,$respid) = ($problem->{'resource'},
                               $problem->{'respid'});
     # Note: part data is not needed.
-    my $PerformanceData = 
-        &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$respid);
+    my $PerformanceData = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -1308,18 +1314,18 @@ sub build_foil_index {
         if (@Concepts > 1) {
             $table .= '<tr>'.
                 '<td>'.$conceptindex.'</td>'.
-                '<td>'.&HTML::Entities::encode($concept->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($concept->{'name'},'<>&"').'</td>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
                 "</tr>\n";
         } else {
             $table .= '<tr>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
                 "</tr>\n";
         }
         foreach my $foilid (@FoilsInConcept) {
@@ -1328,16 +1334,16 @@ sub build_foil_index {
                     '<td></td>'.
                     '<td></td>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'.
                     "</tr>\n";
             } else {
                 $table .= '<tr>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'.
                     "</tr>\n";
             }                
         } continue {
@@ -1362,7 +1368,7 @@ sub build_option_index {
               '<tr>'.
               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
               ('&nbsp;'x4).'</td>'.
-              '<td>'.&HTML::Entities::encode($option).'</td>'.
+              '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
               "</tr>\n");
     }
     shift(@Rows); # Throw away 'correct option chosen' color
@@ -1456,7 +1462,7 @@ sub CreateInterface {
             $Str .= '</select></nobr><br />';
         }
         {
-            $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+            $Str .= '<nobr>'.&mt('Number of Plots:');
             $Str .= &Apache::loncommon::help_open_topic
                                                   ('Analysis_num_plots');
             $Str .= '<select name="NumPlots">';
@@ -1470,7 +1476,14 @@ sub CreateInterface {
                 if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
                 $Str .= '>'.$i.'</option>';
             }
-            $Str .= '</select></nobr>';
+            $Str .= '</select></nobr><br />';
+        }
+        {
+            $Str .= '<nobr>'.&mt('Status: [_1]',
+                                 '<input type="text" '.
+                                 'name="stats_status" size="60" value="" />'
+                                 ).
+                    '</nobr><br />';
         }
     }
     $Str .= '</td>';