--- loncom/interface/statistics/lonproblemanalysis.pm	2003/09/29 21:13:23	1.24
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/10 21:49:20	1.32
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.24 2003/09/29 21:13:23 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.32 2003/10/10 21:49:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,16 +24,12 @@
 #
 # http://www.lon-capa.org/
 #
-# (Navigate problems for statistical reports
-# YEAR=2002
-# 5/12,7/26,9/7,11/22 Behrouz Minaei
-#
-###
 
 package Apache::lonproblemanalysis;
 
 use strict;
 use Apache::lonnet();
+use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
@@ -42,64 +38,264 @@ use Apache::lonlocal;
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
     $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
-    if (exists($ENV{'form.problemchoice'})) {
-        # This is me getting around my own cleverness:
-        &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                          undef);
+    $r->print(&CreateInterface());
+    #
+    my @Students = @Apache::lonstatistics::Students;
+    #
+    if (exists($ENV{'form.problemchoice'}) && !exists($ENV{'SelectAnother'})) {
+        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
+                  &mt('Analyze Problem Again').'" />');
+        $r->print('&nbsp;'x5);
+        $r->print('<input type="submit" name="ClearCache" value="'.
+                  &mt('Clear Caches').'" />');
+        $r->print('&nbsp;'x5);
+        $r->print('<input type="hidden" name="problemchoice" value="'.
+                  $ENV{'form.problemchoice'}.'" />');
+        $r->print('<input type="submit" name="SelectAnother" value="'.
+                  &mt('Choose a different resource').'" />');
+        $r->print('&nbsp;'x5);
         #
-        my ($symb,$id) = &get_problem_symb(
+        $r->print('<hr />');
+        &Apache::lonstatistics::Gather_Full_Student_Data($r);
+        #
+        my ($symb,$part,$resid) = &get_problem_symb(
                      &Apache::lonnet::unescape($ENV{'form.problemchoice'})
                                            );
-        $r->print('<hr />');
+        #
         my $resource = &get_resource_from_symb($symb);
         if (defined($resource)) {
+            my %Data = &get_problem_data($resource->{'src'});
+            my $ORdata = $Data{$part.'.'.$resid};
+            ##
+            ## Render the problem
+            my $base;
+            ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
+            $base = "http://".$ENV{'SERVER_NAME'}.$base;
+            my $rendered_problem = 
+                &Apache::lonnet::ssi_body($resource->{'src'});
+            $rendered_problem =~ s/<\s*form\s*/<nop /g;
+            $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
             $r->print('<table bgcolor="ffffff"><tr><td>'.
-                      # Oh this is dumb!  Need to rewrite relative links
-                      # otherwise images (for example) will not show.
-                      &Apache::lonnet::ssi_body($resource->{'src'}).
+                      '<base href="'.$base.'" />'.
+                      $rendered_problem.
                       '</td></tr></table>');
+            ##
+            ## Analyze the problem
+            my $PerformanceData = 
+                &Apache::loncoursedata::get_optionresponse_data
+                                           (\@Students,$symb,$resid);
+            if (defined($PerformanceData) && 
+                ref($PerformanceData) eq 'ARRAY') {
+                if ($ENV{'form.AnalyzeBy'} eq 'Tries') {
+                    my $analysis_html = &DoTriesAnalysis($PerformanceData,
+                                                         $ORdata);
+                $r->print($analysis_html);
+#                } elsif ($ENV{'form.AnalyzeBy'} eq 'Time') {
+#                    my $analysis_html = &DoTimeAnalysis($PerformanceData,
+#                                                         $ORdata);
+#                $r->print($analysis_html);
+                } else {
+                    $r->print('<h2>'.
+                              &mt('The analysis you have selected is '.
+                                         'not supported at this time').
+                              '</h2>');
+                }
+            } else {
+                $r->print('<h2>'.
+                          &mt('There is no student data for this problem.').
+                          '</h2>');
+            }
         } else {
             $r->print('resource is undefined');
         }
-        $r->print('<ol>');
-        $r->print("<li />render problem\n");
-        $r->print("<li />image tag for plot\n");
-        $r->print("<li />plot key\n");
-        $r->print('</ol>');
-        $r->print("<pre>\nProblem choice = $symb $id\n</pre>\n");
         $r->print('<hr />');
+    } else {
+        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
+                  &mt('Analyze Problem').'" />');
+        $r->print('&nbsp;'x5);
+        $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
+        $r->print(&OptionResponseProblemSelector());
     }
-    $r->print('<input type="hidden" name="analysisfirstcall" value="no" />');
-    $r->print(&CreateInterface());
-    if (! exists($ENV{'form.analysisfirstcall'})) {
-        return;
+}
+
+
+sub DoTriesAnalysis {
+    my ($PerformanceData,$ORdata) = @_;
+    my $mintries = 1;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
+                                                 $mintries,$maxtries);
+    my @Foils = sort(keys(%ResponseData));
+    my %Row_Label;
+    foreach my $foilid (@Foils) {
+        my $value = $ORdata->{'Foiltext'}->{$foilid};
+        $Row_Label{$foilid} = $ORdata->{'Foiltext'}->{$foilid};
+    }
+    #
+    # Build up the table of row labels.
+    my $table = '<table border="1" >'."\n";
+    $table .= '<tr><th>'.&mt('Foil Number').'</th>'.
+        '<th>'.&mt('Foil Text')."</th></tr>\n";
+    my $index = 1;
+    foreach my $foilid (@Foils) {
+        $table .= '<tr><td>'.$index.'</td>'.
+            '<td>'.$Row_Label{$foilid}."</td></tr>\n";
+    } continue {
+        $index++;
     }
-    # Okay, they asked for data, so make sure we get the latest data.
-    &Apache::lonnet::logthis('got here for some reason');
-#    &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    $r->print(&OptionResponseProblemSelector());
+    $table .= "</table>\n";
+    #
+    # Compute the data neccessary to make the plots
+    my @PlotData;
+    my @CumulativePlotData;
+    foreach my $foilid (@Foils) {
+        for (my $i=$mintries;$i<=$maxtries;$i++) {
+            #
+            # Gather the per-attempt data
+            push (@{$PlotData[$i]->{'good'}},
+                  $ResponseData{$foilid}->[$i]->{'percent_corr'});
+            push (@{$PlotData[$i]->{'bad'}},
+                  100-$ResponseData{$foilid}->[$i]->{'percent_corr'});
+            #
+            # Someday we may need the cumulative data and I think
+            # this is a neat way of computing it as we go along.
+            push (@{$CumulativePlotData[$i]->{'good'}},
+                  $CumulativePlotData[-1]->{'good'}+
+                  $ResponseData{$foilid}->[$i]->{'correct'});
+            push (@{$CumulativePlotData[$i]->{'bad'}},
+                  $CumulativePlotData[-1]->{'bad'}+
+                  $ResponseData{$foilid}->[$i]->{'incorrect'});
+        }
+    }
+    # 
+    # Build a table for the plots
+    $table .= "<table>\n";
+    my @Plots;
+    for (my $i=$mintries;$i<=$maxtries;$i++) {
+        my $minstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
+        my $maxstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
+        foreach my $foilid (@Foils) {
+            if ($minstu > $ResponseData{$foilid}->[$i]->{'total'}) {
+                $minstu = $ResponseData{$foilid}->[$i]->{'total'};
+            }
+            if ($maxstu < $ResponseData{$foilid}->[$i]->{'total'}) {
+                $maxstu = $ResponseData{$foilid}->[$i]->{'total'};
+            }
+        }
+        $maxstu = 0 if (! $maxstu);
+        $minstu = 0 if (! $minstu);
+        my $graphlink;
+        if ($maxstu == $minstu) {
+            $graphlink = &Apache::loncommon::DrawGraph
+                ('Attempt '.$i.', '.$maxstu.' students',
+                 'Foil Number',
+                 'Percent Correct',
+                 100,
+                 $PlotData[$i]->{'good'},
+                 $PlotData[$i]->{'bad'});
+        } else {
+            $graphlink = &Apache::loncommon::DrawGraph
+                ('Attempt '.$i.', '.$minstu.'-'.$maxstu.
+                 ' students',
+                 'Foil Number',
+                 'Percent Correct',
+                 100,
+                 $PlotData[$i]->{'good'},
+                 $PlotData[$i]->{'bad'});
+        }
+        push(@Plots,$graphlink);
+    }
+    #
+    # Should this be something the user can set?  Too many dialogs!
+    my $plots_per_row = 2;
+    while (my $plotlink = shift(@Plots)) {
+        $table .= '<tr><td>'.$plotlink.'</td>';
+        for (my $i=1;$i<$plots_per_row;$i++) {
+            if ($plotlink = shift(@Plots)) {
+                $table .= '<td>'.$plotlink.'</td>';
+            } else {
+                $table .= '<td></td>';
+            }
+        }
+        $table .= "</tr>\n";
+    }
+    $table .= "</table>\n";
+    return ($table);
+}
+
+sub analyze_option_data_by_tries {
+    my ($PerformanceData,$mintries,$maxtries) = @_;
+    my %Trydata;
+    $mintries = 1         if (! defined($mintries) || $mintries < 1);
+    $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
+    foreach my $row (@$PerformanceData) {
+        next if (! defined($row));
+        my ($grading,$submission,$time,$tries) = @$row;
+        my @Foilgrades = split('&',$grading);
+        my @Foilsubs   = split('&',$submission);
+        for (my $numtries = 1; $numtries <= $maxtries; $numtries++) {
+            if ($tries == $numtries) {
+                foreach my $foilgrade (@Foilgrades) {
+                    my ($foilid,$correct) = split('=',$foilgrade);
+                    if ($correct) {
+                        $Trydata{$foilid}->[$numtries]->{'correct'}++;
+                    } else {
+                        $Trydata{$foilid}->[$numtries]->{'incorrect'}++;
+                    }                        
+                }
+            }
+        }
+    }
+    foreach my $foilid (keys(%Trydata)) {
+        foreach my $tryhash (@{$Trydata{$foilid}}) {
+            next if ((! exists($tryhash->{'correct'}) && 
+                      ! exists($tryhash->{'incorrect'})) ||
+                     ($tryhash->{'correct'} < 1 &&
+                      $tryhash->{'incorrect'} < 1));
+            $tryhash->{'total'} = $tryhash->{'correct'} + 
+                                        $tryhash->{'incorrect'};
+            $tryhash->{'percent_corr'} = 100 *
+                ($tryhash->{'correct'} /
+                         ($tryhash->{'correct'} + $tryhash->{'incorrect'})
+                 );
+        }
+    }
+    return %Trydata;
 }
 
 sub get_problem_symb {
     my $problemstring = shift();
-    my ($symb,$id) = ($problemstring=~ /^(.*):([^:]*)$/);
-    return ($symb,$id);
+    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
+    return ($symb,$partid,$resid);
 }
 
 sub CreateInterface {
+    ##
+    ## Environment variable initialization
+    if (! exists$ENV{'form.AnalyzeBy'}) {
+        $ENV{'form.AnalyzeBy'} = 'Tries';
+    }
+    ##
+    ## Build the menu
     my $Str = '';
     $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('Sequences and Folders').'</b></td>';
+    $Str .= '<td align="center">&nbsp;</td>';
     $Str .= '</tr>'."\n";
-    #
+    ##
+    ## 
     $Str .= '<tr><td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
-    $Str .= '</td><td align="center">';
+    $Str .= '</td>';
+    #
+    $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
-    $Str .= '</td><td align="center">';
+    $Str .= '</td>';
+    #
+#    $Str .= '<td align="center">';
     my $only_seq_with_assessments = sub { 
         my $s=shift;
         if ($s->{'num_assess'} < 1) { 
@@ -108,16 +304,43 @@ sub CreateInterface {
             return 1;
         }
     };
-    $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
+    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
                                               $only_seq_with_assessments);
-    $Str .= '</td></tr>'."\n";
+#    $Str .= '</td>';
+    #
+    $Str .= '<td>';
+    $Str .= '<nobr>'.&mt('Analyze By ');
+    $Str .='<select name="AnalyzeBy" >';
+    #
+    $Str .= '<option value="Tries" ';
+    if (! exists($ENV{'form.AnalyzeBy'}) || $ENV{'form.AnalyzeBy'} eq 'Tries'){
+        # Default to Tries
+        $Str .= ' selected ';
+    }
+    $Str .= '>'.&mt('Tries').'</option>';
+    #
+    $Str .= '<option value="Time" ';
+    $Str .= ' selected ' if ($ENV{'form.AnalyzeBy'} eq 'Time');
+    $Str .= '>'.&mt('Time').'</option>';
+    $Str .= '</select></nobr><br />';
+    #
+    $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+    $Str .= '<select name="NumPlots">';
+    if (! exists($ENV{'form.NumPlots'}) 
+        || $ENV{'form.NumPlots'} < 1 
+        || $ENV{'form.NumPlots'} > 20) {
+        $ENV{'form.NumPlots'} = 7;
+    }
+    foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
+        $Str .= '<option value="'.$i.'" ';
+        if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
+        $Str .= '>'.$i.'</option>';
+    }
+    $Str .= '</select></nobr>';
+    $Str .= '</td>';
+    #
+    $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
-    $Str .= '<input type="submit" name="ProblemAnalysis" value="'.
-        &mt('Analyze Problem').'" />';
-    $Str .= '&nbsp;'x5;
-    $Str .= '<input type="submit" name="ClearCache" value="'.
-        &mt('Clear Caches').'" />';
-    $Str .= '&nbsp;'x5;
     return ($Str);
 }
 
@@ -129,7 +352,7 @@ sub OptionResponseProblemSelector {
         my $seq_str = '';
         foreach my $res (@{$seq->{'contents'}}) {
 #            &Apache::lonnet::logthis('checking '.$res->{'title'});
-#            next if ($res->{'type'} ne 'assessment');
+            next if ($res->{'type'} ne 'assessment');
             foreach my $part (@{$res->{'parts'}}) {
                 my $partdata = $res->{'partdata'}->{$part};
                 if (! exists($partdata->{'option'}) || 
@@ -140,7 +363,7 @@ sub OptionResponseProblemSelector {
                     my $respid = $partdata->{'ResponseIds'}->[$i];
                     my $resptype = $partdata->{'ResponseTypes'}->[$i];
                     if ($resptype eq 'option') {
-                        my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$respid);
+                        my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$part.':'.$respid);
                         my $checked = '';
                         if ($ENV{'form.problemchoice'} eq $value) {
                             $checked = 'checked ';
@@ -168,10 +391,8 @@ sub OptionResponseProblemSelector {
 
 sub get_resource_from_symb {
     my ($symb) = @_;
-    &Apache::lonnet::logthis('target symb = :'.$symb.':');
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
         foreach my $res (@{$seq->{'contents'}}) {
-            &Apache::lonnet::logthis('symb = :'.$res->{'symb'}.':');
             if ($res->{'symb'} eq $symb) {
                 return $res;
             }
@@ -180,46 +401,74 @@ sub get_resource_from_symb {
     return undef;
 }
 
-=pod
-
-sub InitAnalysis {
-    my ($resource,$sname,$sdom)=@_;
-    my $symb = $resource->
-    my $URI = $hash{'src_'.$rid};
-
-    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze',
-                                  'grade_username' => $sname,
-                                  'grade_domain' => $sdom,
-                                  'grade_courseid' => $cid,
-                                  'grade_symb' => $symb));
-#    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze'));
-
+sub get_problem_data {
+    my ($url) = @_;
+#    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze',
+#                                  'grade_username' => $sname,
+#                                  'grade_domain' => $sdom,
+#                                  'grade_courseid' => $cid,
+#                                  'grade_symb' => $symb));
+    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
     (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
-    %Answer=();
+    my %Answer;
     %Answer=&Apache::lonnet::str2hash($Answ);
-
-    my $parts='';
-    foreach my $elm (@{$Answer{"parts"}}) {
-        $parts.="$elm,";
-    }
-    chop($parts);
-    my $conc='';
-    foreach my $elm (@{$Answer{"$parts.concepts"}}) {
-        $conc.="$elm@";
-    }
-    chop($conc);
-
-    @Concepts=split(/\@/,$conc);
-    foreach my $concept (@{$Answer{"$parts.concepts"}}) {
-        foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
-            $foil_to_concept{$foil} = $concept;
-            #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"};
+#    &Apache::lonnet::logthis('keys of %Answer = '.join(', ',(keys(%Answer))));
+#    &Apache::lonnet::logthis('$Answer{parts} = '.
+#                             join(', ',@{$Answer{'parts'}}));
+    my %Partdata;
+    foreach my $part (@{$Answer{'parts'}}) {
+        while (my($key,$value) = each(%Answer)) {
+            next if ($key !~ /^$part/);
+            $key =~ s/^$part\.//;
+            if (ref($value) eq 'ARRAY') {
+                if ($key eq 'options') {
+                    $Partdata{$part}->{'Options'}=$value;
+                } elsif ($key eq 'concepts') {
+                    $Partdata{$part}->{'Concepts'}=$value;
+                } elsif ($key =~ /^concept\.(.*)$/) {
+                    my $concept = $1;
+                    foreach my $foil (@$value) {
+                        $Partdata{$part}->{$foil}->{'Concept'}=$concept;
+                    }
+                }
+ #               &Apache::lonnet::logthis($part.' '.$key.' (array) = '.
+ #                                        join(', ',@$value));
+            } else {
+                $value =~ s/^\s*//g;
+                $value =~ s/\s*$//g;
+                if ($key=~ /^foil\.text\.(.*)$/) {
+                    my $foil = $1;
+                    $Partdata{$part}->{'Foiltext'}->{$foil}=$value;
+                } elsif ($key =~ /^foil\.value\.(.*)$/) {
+                    my $foil = $1;
+                    $Partdata{$part}->{'FoilValues'}->{$foil}=$value;
+                }
+#                &Apache::lonnet::logthis($part.' '.$key.' = '.$value);
+            }
         }
     }
-    return $symb;
-}
 
-=cut
+#    my $parts='';
+#    foreach my $elm (@{$Answer{"parts"}}) {
+#        $parts.="$elm,";
+#    }
+#    chop($parts);
+#    my $conc='';
+#    foreach my $elm (@{$Answer{"$parts.concepts"}}) {
+#        $conc.="$elm@";
+#    }
+#    chop($conc);
+#
+#    @Concepts=split(/\@/,$conc);
+#    foreach my $concept (@{$Answer{"$parts.concepts"}}) {
+#        foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
+#            $foil_to_concept{$foil} = $concept;
+#            #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"};
+#        }
+#    }
+#    return $symb;
+    return %Partdata;
+}
 
 1;