--- loncom/interface/statistics/lonproblemanalysis.pm	2005/02/23 02:03:42	1.115
+++ loncom/interface/statistics/lonproblemanalysis.pm	2006/08/18 15:15:38	1.128
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.115 2005/02/23 02:03:42 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.128 2006/08/18 15:15:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 package Apache::lonproblemanalysis;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -38,6 +38,9 @@ use Apache::lonstudentsubmissions();
 use HTML::Entities();
 use Time::Local();
 use capa;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+  
 
 my $plotcolors = ['#33ff00', 
                   '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
@@ -59,6 +62,7 @@ sub BuildProblemAnalysisPage {
     #
     my %Saveable_Parameters = ('Status' => 'scalar',
                                'Section' => 'array',
+                               'Groups' => 'array',
                                'NumPlots' => 'scalar',
                                'AnalyzeOver' => 'scalar',
                                );
@@ -73,8 +77,8 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
-        $r->print('<h2>There are no students in the sections selected</h2>');
+    if (@Students < 1 && exists($env{'form.firstrun'})) {
+        $r->print('<h2>There are no students in the sections/groups selected</h2>');
     }
     #
     my @CacheButtonHTML = 
@@ -82,8 +86,8 @@ sub BuildProblemAnalysisPage {
     $r->rflush();
     #
     my $problem_types = '(option|radiobutton|numerical)';
-    if (exists($ENV{'form.problemchoice'}) && 
-        ! exists($ENV{'form.SelectAnother'})) {
+    if (exists($env{'form.problemchoice'}) && 
+        ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
             if ($button->{'name'} eq 'break') {
                 $r->print("<br />\n");
@@ -97,47 +101,51 @@ sub BuildProblemAnalysisPage {
             $r->print($html.('&nbsp;'x5));
         }
         #
-        $r->print(&Apache::lonstathelpers::submission_report_form
-                                                      ('problem_analysis'));
+
+        # This is commented out pending actual implementation of 
+        # CSV and Excel output.
+        #$r->print(&Apache::lonstathelpers::submission_report_form
+        #                                              ('problem_analysis'));
         #
         $r->print('<hr />');
         $r->rflush();
         #
         # Determine which problem we are to analyze
         my $current_problem = &Apache::lonstathelpers::get_target_from_id
-            ($ENV{'form.problemchoice'});
+            ($env{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = 
+        my ($navmap,$prev,$curr,$next) = 
             &Apache::lonstathelpers::get_prev_curr_next($current_problem,
                                                         $problem_types,
                                                         'response',
                                                         );
-        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
-        } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
+        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
             $current_problem = $next;
         } else {
             $current_problem = $curr;
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = 
+        $env{'form.problemchoice'} = 
             &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
+                  $env{'form.problemchoice'}.'" />');
         #
         if (! defined($current_problem->{'resource'})) {
             $r->print('resource is undefined');
         } else {
             my $resource = $current_problem->{'resource'};
-            $r->print('<h1>'.$resource->{'title'}.'</h1>');
-            $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            if ($ENV{'form.show_prob'} eq 'true') {
+            $r->print('<h1>'.$resource->compTitle.'</h1>');
+            $r->print('<h3>'.$resource->src.'</h3>');
+            $r->print('<h4>'.&Apache::lonstatistics::section_and_enrollment_description().'</h4>');
+            if ($env{'form.show_prob'} eq 'true') {
                 $r->print(&Apache::lonstathelpers::render_resource($resource));
             }
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
-                ($resource->{'src'});
+                ($resource->src);
             my $problem_data = $Data{$current_problem->{'part'}.
                                     '.'.
                                     $current_problem->{'respid'}};
@@ -158,12 +166,14 @@ sub BuildProblemAnalysisPage {
         }
         $r->print('<hr />');
     } else {
-        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
-                  &mt('Analyze Problem').'" />');
+        my $submit_button = '<input type="submit" '.
+            'name="ProblemAnalysis" value="'.
+            &mt('Analyze Problem').'" />';
+        $r->print($submit_button);
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&Apache::lonstathelpers::ProblemSelector
-                  ($problem_types));
+        $r->print(&Apache::lonstathelpers::problem_selector($problem_types,
+                                                            $submit_button));
     }
 }
 
@@ -178,7 +188,7 @@ sub numerical_response_analysis {
     my ($r,$problem,$problem_analysis,$students) = @_;
     my $c = $r->connection();
     #
-    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+    if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
         $r->print('Bad request');
     }
     #
@@ -187,9 +197,10 @@ sub numerical_response_analysis {
                                       $problem->{'respid'});
     # Gather student data
     my $response_data = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     #
     $problem_analysis->{'answercomputed'} = 1;
     if ($problem_analysis->{'answercomputed'}) {
@@ -207,14 +218,14 @@ sub numerical_response_analysis {
         return;
     }
     my $analysis_html = '<table>';
-    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+    for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) {
         my $restriction_function;
         my $header_message;
         my $stats_message;
         my $post_message; # passed through &mt sooner rather than later
         my $no_data_message;
         my @extra_data;
-        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        if ($env{'form.AnalyzeOver'} eq 'tries') {
             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
             $header_message = 'Attempt [_1]';
             $stats_message = 
@@ -338,7 +349,9 @@ sub numerical_plot_percent {
     while (my ($ans,$submissions) = each(%$responses)) {
         while (my ($submission,$counts) = each(%$submissions)) {
             my ($correct_count,$incorrect_count) = @$counts;
-            my $scaled_value = 100*($submission-$ans)/abs($ans);
+	    my $scaled_value = 
+		($ans) ? 100*($submission-$ans)/abs($ans)
+		       : 0;
             if ($scaled_value < $bins[0]) {
                 $bins[0]=$scaled_value -1;
             }
@@ -393,7 +406,8 @@ sub numerical_plot_differences {
     } elsif ($low_bin < 0 && $high_bin < -$low_bin) {
         $high_bin = -$low_bin;
     }
-    if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
+    if (!$min_bin_size ||
+        ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
         $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2;
     }
     my @bins;
@@ -482,8 +496,12 @@ sub numerical_classify_responses {
         if ($stats{'max_abs'} < $abs_high) {
             $stats{'max_abs'} = $abs_high;
         }
-        my $low_percent  = 100 * abs($abs_low  / $subm{'correct'});
-        my $high_percent = 100 * abs($abs_high / $subm{'correct'});
+        my $low_percent;
+        my $high_percent;
+        if (defined($subm{'correct'}) && $subm{'correct'} != 0) {
+            $low_percent  = 100 * abs($abs_low  / $subm{'correct'});
+            $high_percent = 100 * abs($abs_high / $subm{'correct'});
+        }
         if (! defined($stats{'min_percent'}) ||
             $stats{'min_percent'} > $low_percent) {
             $stats{'min_percent'} = $low_percent;
@@ -531,6 +549,8 @@ sub numerical_classify_responses {
             }
         }
     }
+    $stats{'correct_count'} |= 0;
+    $stats{'incorrect_count'} |= 0;
     $stats{'students'}=scalar(keys(%students));
     return (\%submission_data,\%stats);
 }
@@ -737,7 +757,7 @@ sub circle {
 sub radio_response_analysis {
     my ($r,$problem,$problem_analysis,$students) = @_;
     #
-    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+    if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
         $r->print('Bad request');
     }
     #
@@ -766,9 +786,10 @@ sub radio_response_analysis {
     $analysis_html .= $table;
     # Gather student data
     my $response_data = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     my $correct;   # either a hash reference or a scalar
     if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
         # This takes a while for large classes...
@@ -779,7 +800,7 @@ sub radio_response_analysis {
             my ($idx,@remainder) = split('&',$student->{'answer'});
             my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
             $correct->{$student->{'username'}.':'.$student->{'domain'}}=
-                &Apache::lonnet::unescape($answer);
+                &unescape($answer);
         }
     } else {
         foreach my $foil (keys(%$foildata)) {
@@ -798,13 +819,13 @@ sub radio_response_analysis {
     }
     #
     $analysis_html.='<table>';
-    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+    for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) {
         # classify data ->correct foil -> selected foil
         my ($restriction_function,
             $correct_foil_title,$incorrect_foil_title,
             $pre_graph_text,$post_graph_text,
             $no_data_text,@extra_data);
-        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        if ($env{'form.AnalyzeOver'} eq 'tries') {
             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
             $correct_foil_title = 'Attempt '.$plot_num;
             $incorrect_foil_title = 'Attempt '.$plot_num;
@@ -812,7 +833,7 @@ sub radio_response_analysis {
                 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
             $post_graph_text = '';
             $no_data_text = 'No data exists for attempt [_1]';
-        } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        } elsif ($env{'form.AnalyzeOver'} eq 'time') {
             my $starttime = &Apache::lonhtmlcommon::get_date_from_form
                 ('startdate_'.$plot_num);
             my $endtime = &Apache::lonhtmlcommon::get_date_from_form
@@ -882,16 +903,14 @@ sub radio_response_analysis {
             $choice_plot  ne '' ||
             $stacked_plot ne '') {
             my $correct = $foil_choice_data->{'_correct'};
-            if (! defined($correct) || $correct eq '') {
-                $correct = 0;
-            }
-            my $incorrect = 
+            $correct |= 0;
+            my $incorrect = $foil_choice_data->{'_count'}-$correct;
             $analysis_html.= '<tr><td colspan="4" align="center">'.
                 '<font size="+1">'.
                 &mt($pre_graph_text,
                     $plot_num,$foil_choice_data->{'_count'},
                     $correct,
-                    $foil_choice_data->{'_count'}-$correct,
+                    $incorrect,
                     $foil_choice_data->{'_students'},
                     @extra_data).
                     '</td></tr>'.$/;
@@ -936,7 +955,7 @@ sub ensure_start_end_times {
             (localtime($last - $sec_in_day*($plot_num-1)))[3..5];
         $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
         $end   = $start + $sec_in_day;
-        if ($plot_num == $ENV{'form.NumPlots'}) {
+        if ($plot_num == $env{'form.NumPlots'}) {
             $start = $first;
         }
     }
@@ -1173,9 +1192,10 @@ sub OptionResponseAnalysis {
                               $problem->{'respid'});
     # Note: part data is not needed.
     my $PerformanceData = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -1183,13 +1203,13 @@ sub OptionResponseAnalysis {
                   '</h2>');
     }  else {
         $r->rflush();
-        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        if ($env{'form.AnalyzeOver'} eq 'tries') {
             my $analysis_html = &OR_tries_analysis($r,
                                                    $PerformanceData,
                                                    $problem_data);
             $r->print($analysis_html);
             $r->rflush();
-        } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        } elsif ($env{'form.AnalyzeOver'} eq 'time') {
             my $analysis_html = &OR_time_analysis($PerformanceData,
                                                   $problem_data);
             $r->print($analysis_html);
@@ -1211,7 +1231,7 @@ sub OptionResponseAnalysis {
 sub OR_tries_analysis {
     my ($r,$PerformanceData,$ORdata) = @_;
     my $mintries = 1;
-    my $maxtries = $ENV{'form.NumPlots'};
+    my $maxtries = $env{'form.NumPlots'};
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
     if (! defined($Concepts)) {
         $Concepts = [];
@@ -1309,6 +1329,7 @@ sub OR_tries_analysis {
         # Create Foil Plots
         my $data_count = $response_data{'_total'}->[$try];
         my $correct = $response_data{'_correct'}->[$try];
+        $correct |= 0;
         my @Datasets;
         foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
             next if (! exists($foil_plot[$try]->{$option}));
@@ -1420,7 +1441,7 @@ sub OR_time_analysis {
                 '</h3>'.$table;
     }
     #
-    my $num_plots = $ENV{'form.NumPlots'};
+    my $num_plots = $env{'form.NumPlots'};
     my $num_data = scalar(@$performance_data)-1;
     #
     my $current_index;
@@ -1471,6 +1492,7 @@ sub OR_time_analysis {
         ##
         my ($processed_time_data,$correct,$data_count,$student_count) =
             &OR_time_process_data($performance_data,$begin_index,$end_index);
+        $correct |= 0;
         ##
         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
             &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
@@ -1802,19 +1824,18 @@ sub build_foil_key {
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'tries';
+    if (! exists($env{'form.AnalyzeOver'})) {
+        $env{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Detailed Problem Analysis');
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-#    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
     $Str .= '<td align="center">&nbsp;</td>';
     $Str .= '</tr>'."\n";
     ##
@@ -1823,28 +1844,21 @@ sub CreateInterface {
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
     #
+    $Str .= '<td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td>';
+    #
     $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
     #
-#    $Str .= '<td align="center">';
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
     ##
     ##
     $Str .= '<td>';
     ##
     my $showprob_checkbox = 
         '<input type="checkbox" name="show_prob" value="true" ';
-    if ($ENV{'form.show_prob'} eq 'true') {
+    if ($env{'form.show_prob'} eq 'true') {
         $showprob_checkbox .= 'checked ';
     }
     $showprob_checkbox.= ' />';
@@ -1854,14 +1868,14 @@ sub CreateInterface {
     ##
     my $analyze_selector = '<select name="AnalyzeOver" >';
     $analyze_selector .= '<option value="tries" ';
-    if (! exists($ENV{'form.AnalyzeOver'}) || 
-        $ENV{'form.AnalyzeOver'} eq 'tries'){
+    if (! exists($env{'form.AnalyzeOver'}) || 
+        $env{'form.AnalyzeOver'} eq 'tries'){
         # Default to tries
         $analyze_selector .= ' selected ';
     }
     $analyze_selector .= '>'.&mt('Tries').'</option>';
     $analyze_selector .= '<option value="time" ';
-    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time');
+    $analyze_selector .= ' selected ' if ($env{'form.AnalyzeOver'} eq 'time');
     $analyze_selector .= '>'.&mt('Time').'</option>';
     $analyze_selector .= '</select>';
     $Str .= '<nobr><label>'.
@@ -1871,14 +1885,14 @@ sub CreateInterface {
             '</label></nobr><br />'.$/;
     ##
     my $numplots_selector = '<select name="NumPlots">';
-    if (! exists($ENV{'form.NumPlots'}) 
-        || $ENV{'form.NumPlots'} < 1 
-        || $ENV{'form.NumPlots'} > 20) {
-        $ENV{'form.NumPlots'} = 5;
+    if (! exists($env{'form.NumPlots'}) 
+        || $env{'form.NumPlots'} < 1 
+        || $env{'form.NumPlots'} > 20) {
+        $env{'form.NumPlots'} = 5;
     }
     foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
         $numplots_selector .= '<option value="'.$i.'" ';
-        if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
+        if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
         $numplots_selector .= '>'.$i.'</option>';
     }
     $numplots_selector .= '</select></nobr><br />';
@@ -1926,7 +1940,7 @@ sub hashify_attempt {
     my %attempt;
     $attempt{'student'}    = $row->[&Apache::loncoursedata::RD_sname()];
     $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
-    $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]);
+    $attempt{'submission'} = &unescape($row->[&Apache::loncoursedata::RD_submission()]);
     $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
     $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
     return %attempt;
@@ -1950,12 +1964,12 @@ sub Process_OR_Row {
     my @Foilsubs   = split('&',$submission);
     for (my $j=0;$j<=$#Foilgrades;$j++) {
         my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
-        $foilid = &Apache::lonnet::unescape($foilid);
+        $foilid = &unescape($foilid);
         my (undef,$submission) = split('=',$Foilsubs[$j]);
         if ($correct) {
             $RowData{$foilid}->{'_correct'}++;
         } else {
-            $submission = &Apache::lonnet::unescape($submission);
+            $submission = &unescape($submission);
             $RowData{$foilid}->{$submission}++;
         }
         $RowData{$foilid}->{'_total'}++;