--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/24 13:38:06	1.46
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/12/10 23:09:26	1.50
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.46 2003/10/24 13:38:06 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.50 2003/12/10 23:09:26 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,7 +24,6 @@
 #
 # http://www.lon-capa.org/
 #
-
 package Apache::lonproblemanalysis;
 
 use strict;
@@ -73,6 +72,20 @@ sub render_resource {
 
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
+    #
+    my %Saveable_Parameters = ('Status' => 'scalar',
+                               'Section' => 'array',
+                               'NumPlots' => 'scalar',
+                               'AnalyzeAs' => 'scalar',
+                               'AnalyzeOver' => 'scalar',
+                               );
+    &Apache::loncommon::store_course_settings('problem_analysis',
+                                              \%Saveable_Parameters);
+    &Apache::loncommon::restore_course_settings('problem_analysis',
+                                                \%Saveable_Parameters);
+    #
+    &Apache::lonstatistics::PrepareClasslist();
+    #
     $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
     $r->print(&CreateInterface());
     #
@@ -108,21 +121,29 @@ sub BuildProblemAnalysisPage {
         #
         $r->print('<hr />');
         #
-        my ($symb,$part,$resid) = &get_problem_symb(
+        my ($symb,$part,$resid,$resptype) = &get_problem_symb(
                   &Apache::lonnet::unescape($ENV{'form.problemchoice'}));
         $r->rflush();
         #
         my $resource = &get_resource_from_symb($symb);
-        if (! defined($resource)) {
+        if (! defined($resource) || ! defined($resptype)) {
             $r->print('resource is undefined');
         } else {
             $r->print('<h1>'.$resource->{'title'}.'</h1>');
             $r->print('<h3>'.$resource->{'src'}.'</h3>');
+            $r->print(&render_resource($resource));
             $r->rflush();
             my %Data = &get_problem_data($resource->{'src'});
             my $ProblemData = $Data{$part.'.'.$resid};
-            &OptionResponseAnalysis($r,$resource,$resid,$ProblemData,
-                                    \@Students);
+            if ($resptype eq 'option') {
+                &OptionResponseAnalysis($r,$resource,$resid,$ProblemData,
+                                        \@Students);
+            } elsif ($resptype eq 'radiobutton') {
+                &RadioResponseAnalysis($r,$resource,$part,$resid,$ProblemData,
+                                       \@Students);
+            } else {
+                $r->print('<h2>This analysis is not supported</h2>');
+            }
         }
         $r->print('<hr />');
     } else {
@@ -134,6 +155,198 @@ sub BuildProblemAnalysisPage {
     }
 }
 
+=pod
+
+Removed code:
+
+#########################################################
+#########################################################
+##
+##      Radio Response Routines
+##
+#########################################################
+#########################################################
+sub RadioResponseAnalysis {
+    my ($r,$resource,$part,$respid,$ProblemData,$Students) = @_;
+    my $analysis_html;
+    my $PerformanceData = 
+        &Apache::loncoursedata::get_response_data
+        ($Students,$resource->{'symb'},$respid);
+    if (! defined($PerformanceData) || 
+        ref($PerformanceData) ne 'ARRAY' ) {
+        $analysis_html = '<h2>'.
+            &mt('There is no submission data for this resource').
+            '</h2>';
+        $r->print($analysis_html);
+        return;
+    }
+    if (exists($ENV{'form.ExcelOutput'})) {
+        $analysis_html .= &RR_Excel_output($r,$resource,$PerformanceData,
+                                          $ProblemData);
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+        $analysis_html .= &RR_Tries_Analysis($r,$resource,$PerformanceData,
+                                           $ProblemData);
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+        $analysis_html .= &RR_Time_Analysis($r,$resource,$PerformanceData,
+                                           $ProblemData);
+    } else {
+        $analysis_html .= '<h2>'.
+           &mt('The analysis you have selected is not supported at this time').
+           '</h2>';
+    }
+    $r->print($analysis_html);
+}
+
+
+sub RR_Excel_output   { 
+    my ($r,$PerformanceData,$ProblemData) = @_;
+    return '<h1>No!</h1>';
+}
+
+sub RR_Tries_Analysis { 
+    my ($r,$resource,$PerformanceData,$ProblemData) = @_;
+    my $analysis_html;
+    my $mintries = 1;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData);
+    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+        $table = '<h3>'.
+            &mt('Not enough data for concept analysis.  '.
+                'Performing Foil Analysis').
+            '</h3>'.$table;
+        $ENV{'form.AnalyzeAs'} = 'Foils';
+    }
+    $analysis_html .= $table;
+    my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
+    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $analysis_html = &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+                                                 \@TryData,$ProblemData);
+    } else {
+        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
+                                                    $Concepts,
+                                                    \@TryData,
+                                                    $ProblemData);
+    }
+    return $analysis_html;
+}
+
+sub RR_tries_data_analysis {
+    my ($r,$Attempt_data) = @_;
+    my @TryData;
+    foreach my $attempt (@$Attempt_data) {
+        my %Attempt = &hashify_attempt($attempt);
+        my ($answer,undef) = split('=',$Attempt{'submission'});
+        $TryData[$Attempt{'tries'}]->{$answer}++;
+    }
+    return @TryData;
+}
+
+sub RR_Time_Analysis  { 
+    my ($r,$PerformanceData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+sub RR_Tries_Foil_Analysis {
+    my ($min,$max,$Foils,$TryData,$ProblemData) = @_;
+    my $html;
+    #
+    # Compute the data neccessary to make the plots
+    for (my $try=$min;$try<=$max;$try++) {
+        my @PlotData_Correct; 
+        my @PlotData_Incorrect;
+        next if ($try > scalar(@{$TryData}));
+        next if (! defined($TryData->[$try-1]));
+        my %DataSet = %{$TryData->[$try-1]};
+        my $total = 0;
+        foreach my $foilid (@$Foils) {
+            $total += $DataSet{$foilid};
+        }
+        foreach my $foilid (@$Foils) {
+            if ($total == 0) {
+                push (@PlotData_Correct,0);
+                push (@PlotData_Incorrect,0);
+            } else {
+                if ($ProblemData->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
+                    push (@PlotData_Correct,
+                          int(100*$DataSet{$foilid}/$total));
+                    push (@PlotData_Incorrect,0);
+                } else {
+                    push (@PlotData_Correct,0);
+                    push (@PlotData_Incorrect,
+                          int(100*$DataSet{$foilid}/$total));
+                }
+            }
+        }
+        my $title='Attempt '.$try;
+        my $xlabel = $total.' Submissions';
+        $html.=  &Apache::loncommon::DrawBarGraph($title,
+                                                  $xlabel,
+                                                  'Percent Choosing',
+                                                  100,
+                                                  ['#33ff00','#ff3300'],
+                                                  \@PlotData_Correct,
+                                                  \@PlotData_Incorrect);
+    }
+    &Apache::lonnet::logthis('plot = '.$html);
+    return $html;
+}
+
+sub RR_Tries_Concept_Analysis {
+    my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+sub RR_Time_Foil_Analysis {
+    my ($min,$max,$Foils,$ResponseData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+sub RR_Time_Concept_Analysis {
+    my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+
+
+sub get_Radio_problem_data {
+    my ($url) = @_;
+    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
+    (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2);
+    my %Answer = &Apache::lonnet::str2hash($Answ);
+    my %Partdata;
+    &Apache::lonnet::logthis('url = '.$url);
+    foreach my $part (@{$Answer{'parts'}}) {
+        while (my($key,$value) = each(%Answer)) {
+#            if (ref($value) eq 'ARRAY') {
+#                &Apache::lonnet::logthis('is ref part:'.$part.' '.$key.'='.join(',',@$value));
+#            } else {
+#                &Apache::lonnet::logthis('notref part:'.$part.' '.$key.'='.$value);
+#            }                
+            next if ($key !~ /^$part/);
+            $key =~ s/^$part\.//;
+            if ($key eq 'foils') {
+                $Partdata{$part}->{'_Foils'}=$value;
+            } elsif ($key eq 'options') {
+                $Partdata{$part}->{'_Options'}=$value;
+            } elsif ($key eq 'shown') {
+                $Partdata{$part}->{'_Shown'}=$value;
+            } elsif ($key =~ /^foil.value.(.*)$/) {
+                $Partdata{$part}->{$1}->{'value'}=$value;
+            } elsif ($key =~ /^foil.text.(.*)$/) {
+                $Partdata{$part}->{$1}->{'text'}=$value;
+            }
+        }
+    }
+    return %Partdata;
+}
+
+=cut
+
+
 #########################################################
 #########################################################
 ##
@@ -143,9 +356,8 @@ sub BuildProblemAnalysisPage {
 #########################################################
 sub OptionResponseAnalysis {
     my ($r,$resource,$resid,$ProblemData,$Students) = @_;
-    &Apache::lonnet::logthis('resid = '.$resid);
     my $PerformanceData = 
-        &Apache::loncoursedata::get_optionresponse_data
+        &Apache::loncoursedata::get_response_data
         ($Students,$resource->{'symb'},$resid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
@@ -153,7 +365,6 @@ sub OptionResponseAnalysis {
                   &mt('There is no student data for this problem.').
                   '</h2>');
     }  else {
-        $r->print(&render_resource($resource));
         $r->rflush();
         if (exists($ENV{'form.ExcelOutput'})) {
             my $result = &prepare_optionresponse_excel_sheet($r,$resource,
@@ -229,7 +440,7 @@ sub Tries_Foil_Analysis {
                      100*$ResponseData{$foilid}->[$i]->{'_correct'}/
                      $ResponseData{$foilid}->[$i]->{'_total'});
             }
-            foreach my $option (@{$ORdata->{'Options'}}) {
+            foreach my $option (@{$ORdata->{'_Options'}}) {
                 push(@{$PlotData[$i]->{'_total'}},
                      $ResponseData{$foilid}->[$i]->{'_total'});
                 if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
@@ -263,7 +474,7 @@ sub Tries_Foil_Analysis {
         }
         my $title = 'Attempt '.$i.', '.$count;
         my @Datasets;
-        foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
+        foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
             next if (! exists($PlotData[$i]->{$option}));
             push(@Datasets,$PlotData[$i]->{$option});
         }
@@ -368,7 +579,7 @@ sub analyze_option_data_by_tries {
     $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
     foreach my $row (@$PerformanceData) {
         next if (! defined($row));
-        my $tries = &get_tries_from_OR_row($row);
+        my $tries = &get_tries_from_row($row);
         my %Row   = &Process_OR_Row($row);
         next if (! %Row);
         while (my ($foilid,$href) = each(%Row)) {
@@ -412,14 +623,14 @@ sub time_analysis {
             ('enddate_'.$i);
         if (! defined($starttime) || ! defined($endtime)) {
             my $sec_in_day = 86400;
-            my $last_sub_time = &get_time_from_OR_row($PerformanceData->[-1]);
+            my $last_sub_time = &get_time_from_row($PerformanceData->[-1]);
             my ($sday,$smon,$syear);
             (undef,undef,undef,$sday,$smon,$syear) = 
                 localtime($last_sub_time - $sec_in_day*$i);
             $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
             $endtime = $starttime + $sec_in_day;
             if ($i == ($num_plots -1 )) {
-                $starttime = &get_time_from_OR_row($PerformanceData->[0]);
+                $starttime = &get_time_from_row($PerformanceData->[0]);
             }
         }
         my $startdateform = &Apache::lonhtmlcommon::date_setter
@@ -431,12 +642,12 @@ sub time_analysis {
         my $end_index;
         my $j;
         while (++$j < scalar(@$PerformanceData)) {
-            last if (&get_time_from_OR_row($PerformanceData->[$j]) 
+            last if (&get_time_from_row($PerformanceData->[$j]) 
                                                               > $starttime);
         }
         $begin_index = $j;
         while (++$j < scalar(@$PerformanceData)) {
-            last if (&get_time_from_OR_row($PerformanceData->[$j]) > $endtime);
+            last if (&get_time_from_row($PerformanceData->[$j]) > $endtime);
         }
         $end_index = $j;
         ##
@@ -492,7 +703,7 @@ sub Foil_Time_Analysis {
         }
         my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
         my $optionidx = 1;
-        foreach my $option (@{$ORdata->{'Options'}}) {
+        foreach my $option (@{$ORdata->{'_Options'}}) {
             if ($total_incorrect == 0) {
                 push(@{$Plotdata[$optionidx]},0);
             } else {
@@ -708,7 +919,7 @@ sub build_problem_data_worksheet {
         @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
     }
     $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
-    my %Foildata = %{$ORdata->{'Foils'}};
+    my %Foildata = %{$ORdata->{'_Foils'}};
     my $conceptindex = 1;
     my $foilindex = 1;
     foreach my $concept (@$Concepts) {
@@ -756,7 +967,7 @@ sub build_problem_data_worksheet {
     ##
     ## Option data output
     $worksheet->write($rows_output++,0,'Options',$format->{'header'});
-    foreach my $string (@{$ORdata->{'Options'}}) {
+    foreach my $string (@{$ORdata->{'_Options'}}) {
         $worksheet->write($rows_output++,0,$string);
     }
     return 'okay';
@@ -1013,12 +1224,12 @@ sub _adjustment {
 
 sub build_foil_index {
     my ($ORdata) = @_;
-    return if (! exists($ORdata->{'Foils'}));
-    my %Foildata = %{$ORdata->{'Foils'}};
+    return if (! exists($ORdata->{'_Foils'}));
+    my %Foildata = %{$ORdata->{'_Foils'}};
     my @Foils = sort(keys(%Foildata));
     my %Concepts;
     foreach my $foilid (@Foils) {
-        push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
+        push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}},
              $foilid);
     }
     undef(@Foils);
@@ -1129,7 +1340,7 @@ sub build_option_index {
     my $table = "<table>\n";
     my $optionindex = 0;
     my @Rows;
-    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
+    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
         push (@Rows,
               '<tr>'.
               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
@@ -1254,23 +1465,41 @@ sub ProblemSelector {
             next if ($res->{'type'} ne 'assessment');
             foreach my $part (@{$res->{'parts'}}) {
                 my $partdata = $res->{'partdata'}->{$part};
-                if (! exists($partdata->{'option'}) || 
-                    $partdata->{'option'} == 0) {
+#                &Apache::lonnet::logthis('----------------');
+#                while (my ($k,$v)=each(%$partdata)) {
+#                    if (ref($v) eq 'ARRAY') {
+#                        &Apache::lonnet::logthis($k.' = '.join(',',@$v));
+#                    } else {
+#                        &Apache::lonnet::logthis($k.' = '.$v);
+#                    }
+#                }
+                if ((! exists($partdata->{'option'}) || 
+                     $partdata->{'option'} == 0      ) &&
+                    (! exists($partdata->{'radiobutton'}) ||
+                     $partdata->{'radiobutton'} == 0)) {
                     next;
                 }
                 for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
                     my $respid = $partdata->{'ResponseIds'}->[$i];
                     my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    if ($resptype eq 'option') {
-                        my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$part.':'.$respid);
+                    if ($resptype eq 'option' ){
+#                    if ($resptype eq 'option' || $resptype eq 'radiobutton') {
+                        my $value = 
+                            &Apache::lonnet::escape($res->{'symb'}.':'.$part.
+                                                    ':'.$respid.':'.$resptype);
                         my $checked = '';
                         if ($ENV{'form.problemchoice'} eq $value) {
                             $checked = 'checked ';
                         }
+                        my $title = $res->{'title'};
+                        if (! defined($title) || $title eq '') {
+                            ($title) = ($res->{'src'} =~ m:/([^/]*)$:);
+                        }
                         $seq_str .= '<tr><td>'.
   '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
   '</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$res->{'title'}.'</a> ';
+  '<a href="'.$res->{'src'}.'">'.$title.'</a> ';
+#  '<a href="'.$res->{'src'}.'">'.$resptype.' '.$res->{'title'}.'</a> ';
                         if ($partdata->{'option'} > 1) {
                             $seq_str .= &mt('response').' '.$respid;
                         }
@@ -1297,8 +1526,9 @@ sub ProblemSelector {
 #########################################################
 sub get_problem_symb {
     my $problemstring = shift();
-    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid);
+    my ($symb,$partid,$resid,$resptype) = 
+        ($problemstring=~ /^(.*):([^:]*):([^:]*):([^:]*)$/);
+    return ($symb,$partid,$resid,$resptype);
 }
 
 sub get_resource_from_symb {
@@ -1313,26 +1543,49 @@ sub get_resource_from_symb {
     return undef;
 }
 
-sub get_time_from_OR_row {
+
+#########################################################
+#########################################################
+##
+##              Misc Option Response functions
+##
+#########################################################
+#########################################################
+sub get_time_from_row {
     my ($row) = @_;
     if (ref($row)) {
-        return $row->[4];
+        return $row->[&Apache::loncoursedata::RD_timestamp()];
     } 
     return undef;
 }
 
-sub get_tries_from_OR_row {
+sub get_tries_from_row {
     my ($row) = @_;
     if (ref($row)) {
-        return $row->[5];
+        return $row->[&Apache::loncoursedata::RD_tries()];
     }
     return undef;
 }
 
+sub hashify_attempt {
+    my ($row) = @_;
+    my %attempt;
+    $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
+    $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+    $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
+    $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
+    return %attempt;
+}
+
 sub Process_OR_Row {
     my ($row) = @_;
     my %RowData;
-    my ($student_id,$award,$grading,$submission,$time,$tries) = @$row;
+    my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+    my $award      = $row->[&Apache::loncoursedata::RD_awarddetail()];
+    my $grading    = $row->[&Apache::loncoursedata::RD_response_eval()];
+    my $submission = $row->[&Apache::loncoursedata::RD_submission()];
+    my $time       = $row->[&Apache::loncoursedata::RD_timestamp()];
+    my $tries      = $row->[&Apache::loncoursedata::RD_tries()];
     return undef if ($award eq 'MISSING_ANSWER');
     if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
         $RowData{'_correct'} = 1;
@@ -1372,25 +1625,25 @@ sub get_problem_data {
             $key =~ s/^$part\.//;
             if (ref($value) eq 'ARRAY') {
                 if ($key eq 'options') {
-                    $Partdata{$part}->{'Options'}=$value;
+                    $Partdata{$part}->{'_Options'}=$value;
                 } elsif ($key eq 'concepts') {
-                    $Partdata{$part}->{'Concepts'}=$value;
+                    $Partdata{$part}->{'_Concepts'}=$value;
                 } elsif ($key =~ /^concept\.(.*)$/) {
                     my $concept = $1;
                     foreach my $foil (@$value) {
-                        $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
+                        $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}=
                                                                       $concept;
                     }
                 }
             } else {
                 if ($key=~ /^foil\.text\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
+                    $Partdata{$part}->{'_Foils'}->{$foil}->{'name'}=$foil;
                     $value =~ s/(\s*$|^\s*)//g;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
+                    $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value;
                 } elsif ($key =~ /^foil\.value\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
+                    $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value;
                 }
             }
         }
@@ -1401,3 +1654,11 @@ sub get_problem_data {
 1;
 
 __END__
+
+#####
+# partdata{part}->{_Foils}->{foilid}->{'name'}     = $
+#                                   ->{'text'}     = $
+#                                   ->{'value'}    = $
+#                                   ->{'_Concept'} = $
+# partdata{part}->{_Options}  = @
+# partdata{part}->{_Concepts} = @