--- loncom/interface/statistics/lonproblemanalysis.pm	2002/08/01 20:49:06	1.3
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/14 21:58:25	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
 #
-# $Id: lonproblemanalysis.pm,v 1.3 2002/08/01 20:49:06 stredwic Exp $
+
+# $Id: lonproblemanalysis.pm,v 1.37 2003/10/14 21:58:25 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,461 +25,711 @@
 #
 # http://www.lon-capa.org/
 #
-# (Navigate problems for statistical reports
-# YEAR=2001
-# 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
-# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
-# YEAR=2002
-# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
-# 5/12,5/14,5/15,5/19,5/26,7/16  Behrouz Minaei
-#
-###
 
-package Apache::lonproblemanalysis; 
+package Apache::lonproblemanalysis;
 
 use strict;
 use Apache::lonnet();
-use GDBM_File;
-
-my $jr;
+use Apache::loncommon();
+use Apache::lonhtmlcommon();
+use Apache::loncoursedata();
+use Apache::lonstatistics;
+use Apache::lonlocal;
+use HTML::Entities();
 
 sub BuildProblemAnalysisPage {
-    my ($cacheDB)=@_;
-
-    my %cache;
-    my $Str = '';
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $Str .= '<html><body>Unable to tie database.</body></html>';
-        return $Str;
+    my ($r,$c)=@_;
+    $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
+    $r->print(&CreateInterface());
+    #
+    my @Students = @Apache::lonstatistics::Students;
+    #
+    if (exists($ENV{'form.updatecaches'}) ||
+        (exists($ENV{'form.firstanalysis'}) &&
+         $ENV{'form.firstanalysis'} ne 'no')) {
+        &Apache::lonstatistics::Gather_Full_Student_Data($r);
     }
-
-    $Str .= &IntervalOptions($cache{'Interval'});
-    $Str .= &OptionResponseTable($cache{'OptionResponses'}, \%cache);
-
-    untie(%cache);
-
-    return $Str;
-}
-
-sub BuildAnalyzePage {
-    my ($cacheDB, $students, $courseID,$r)=@_;
-
-    $jr = $r;
-    my $c = $r->connection;
-
-    my $Str = '</form>';
-    my %cache;
-    foreach (@$students) {
-        if($c->aborted) {
-            return $Str;
-        }
-        my $downloadTime='';
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-            $downloadTime = $cache{$_.':lastDownloadTime'};
-            untie(%cache);
-        }
-        if($downloadTime eq 'Not downloaded') {
-            my $courseData = 
-                &Apache::loncoursedata::DownloadCourseInformation($_, 
-                                                                  $courseID);
-            if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
-                &Apache::loncoursedata::ProcessStudentData(\%cache, 
-                                                           $courseData, $_);
-                untie(%cache);
+    if (! exists($ENV{'form.firstanalysis'})) {
+        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
+    } else {
+        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
+    }
+    if (exists($ENV{'form.problemchoice'}) && 
+        ! exists($ENV{'form.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="submit" name="updatecaches" value="'.
+                  &mt('Update Student Data').'" />');
+        $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);
+        #
+        $r->print('<hr />');
+        #
+        my ($symb,$part,$resid) = &get_problem_symb(
+                     &Apache::lonnet::unescape($ENV{'form.problemchoice'})
+                                           );
+        #
+        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>'.
+                      '<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.AnalyzeOver'} eq 'Tries') {
+                    my $analysis_html = &tries_analysis($PerformanceData,
+                                                         $ORdata);
+                    $r->print($analysis_html);
+                } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+                    my $analysis_html = &time_analysis($PerformanceData,
+                                                         $ORdata);
+                $r->print($analysis_html);
+                } else {
+                    $r->print('<h2>'.
+                              &mt('The analysis you have selected is '.
+                                         'not supported at this time').
+                              '</h2>');
+                }
             } else {
-                next;
+                $r->print('<h2>'.
+                          &mt('There is no student data for this problem.').
+                          '</h2>');
             }
+        } else {
+            $r->print('resource is undefined');
         }
+        $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());
     }
+}
 
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $Str .= '<html><body>Unable to tie database.</body></html>';
-        return $Str;
-    }
-
-    my ($problemId, $part, $responseId)=split(':',$cache{'AnalyzeInfo'});
-    my $uri      = $cache{$problemId.':source'};
-    my $problem  = $cache{$problemId.':problem'}; 
-    my $title    = $cache{$problemId.':title'};
-    my $interval = $cache{'Interval'};
-
-    my %ConceptData;
-    $ConceptData{"Interval"} = $interval;
-
-    #Initialize the option response true answers
-    my ($analyzeData) = &InitAnalysis($uri, $part, $responseId, $problem, 
-                                      $students->[0], $courseID);
-    if(defined($analyzeData->{'error'})) {
-        $Str .= 'Incorrect part requested.<br>';
-        return $Str;
-    }
-
-    if($c->aborted()) {  untie(%cache); return $Str; }
-
-    #compute the intervals
-    &Interval($part, $problem, $interval, $analyzeData->{'concepts'}, 
-              \%ConceptData);
-
-    $title =~ s/\ /"_"/eg;
-    $Str .= '<br><b>'.$uri.'</b>';
 
-    if($c->aborted()) {  untie(%cache); return $Str; }
-         
-    #Java script Progress window
-#    &Create_PrgWin();
-#    &Update_PrgWin("Starting-to-analyze-problem");
-    for(my $index=0; $index<(scalar @$students); $index++) {
-        if($c->aborted()) {  untie(%cache); return $Str; }
-#	&Update_PrgWin($index);
-#	&OpStatus($problem, $students->[$index], $courseID, \%ConceptData,
-#                  $analyzeData->{'foil_to_concept'}, $analyzeData, \%cache);
-	&OpStatus($problem, $students->[$index], \%ConceptData, 
-                  $analyzeData->{'foil_to_concept'}, $analyzeData, \%cache);
+#########################################################
+#########################################################
+##
+##      Misc interface routines use by analysis code
+##
+#########################################################
+#########################################################
+sub build_foil_index {
+    my ($ORdata) = @_;
+    my %Foildata = %{$ORdata->{'Foils'}};
+    my @Foils = sort(keys(%Foildata));
+    my %Concepts;
+    foreach my $foilid (@Foils) {
+        push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
+             $foilid);
+    }
+    undef(@Foils);
+    # Having gathered the concept information in a hash, we now translate it
+    # into an array because we need to be consistent about order.
+    # Also put the foils in order, too.
+    my $sortfunction = sub {
+        my %Numbers = (one   => 1,
+                       two   => 2,
+                       three => 3,
+                       four  => 4,
+                       five  => 5,
+                       six   => 6,
+                       seven => 7,
+                       eight => 8,
+                       nine  => 9,
+                       ten   => 10,);
+        my $a1 = $a; 
+        my $b1 = $b;
+        if (exists($Numbers{$a})) {
+            $a1 = $Numbers{$a};
+        }
+        if (exists($Numbers{$b})) {
+            $b1 = $Numbers{$b};
+        }
+        $a1 cmp $b1;
+    };
+    my @Concepts;
+    foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+        push(@Concepts,{name => $concept,
+                        foils => [@{$Concepts{$concept}}]});
+        push(@Foils,(@{$Concepts{$concept}}));
+    }
+    #
+    # Build up the table of row labels.
+    my $table = '<table border="1" >'."\n";
+    $table .= '<tr>'.
+        '<th>'.&mt('Concept Number').'</th>'.
+        '<th>'.&mt('Concept').'</th>'.
+        '<th>'.&mt('Foil Number').'</th>'.
+        '<th>'.&mt('Foil Name').'</th>'.
+        '<th>'.&mt('Foil Text').'</th>'.
+        '<th>'.&mt('Correct Value').'</th>'.
+        "</tr>\n";
+    my $conceptindex = 1;
+    my $foilindex = 1;
+    foreach my $concept (@Concepts) {
+        my @FoilsInConcept = @{$concept->{'foils'}};
+        my $firstfoil = shift(@FoilsInConcept);
+        $table .= '<tr>'.
+            '<td>'.$conceptindex.'</td>'.
+            '<td>'.$concept->{'name'}.'</td>'.
+            '<td>'.$foilindex++.'</td>'.
+            '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+            '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+            '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+            "</tr>\n";
+        foreach my $foilid (@FoilsInConcept) {
+            $table .= '<tr>'.
+                '<td></td>'.
+                '<td></td>'.
+                '<td>'.$foilindex.'</td>'.
+                '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+                '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+                '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                "</tr>\n";
+        } continue {
+            $foilindex++;
+        }
+    } continue {
+        $conceptindex++;
     }
-#    &Close_PrgWin();
+    $table .= "</table>\n";
+    return ($table,\@Foils,\@Concepts);
+}
 
-    $Str .= '<br>';
-    for (my $k=0; $k<$interval; $k++ ) {
-        if($c->aborted()) {  untie(%cache); return $Str; }
-	$Str .= &DrawGraph($k, $title, $analyzeData->{'concepts'}, 
-                           \%ConceptData);
+#########################################################
+#########################################################
+##
+##         Tries Analysis
+##
+#########################################################
+#########################################################
+sub tries_analysis {
+    my ($PerformanceData,$ORdata) = @_;
+    my $mintries = 1;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
+                                                     $mintries,$maxtries);
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    #
+    # Compute the data neccessary to make the plots
+    my @PlotData;
+    my $xlabel;
+    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $xlabel = 'Foil Number';
+        foreach my $foilid (@$Foils) {
+            for (my $i=$mintries;$i<=$maxtries;$i++) {
+                #
+                # Gather the per-attempt data
+                my $percent;
+                if ($ResponseData{$foilid}->[$i]->{'total'} == 0) {
+                    $percent = 0;
+                } else {
+                    $percent = $ResponseData{$foilid}->[$i]->{'correct'} /
+                        $ResponseData{$foilid}->[$i]->{'total'};
+                }
+                push (@{$PlotData[$i]->{'total'}},
+                                 $ResponseData{$foilid}->[$i]->{'total'});
+                push (@{$PlotData[$i]->{'good'}},100 * $percent);
+                push (@{$PlotData[$i]->{'bad'}}, 100 *(1-$percent));
+            }
+        }
+    } else {
+        # Concept analysis
+        $xlabel = 'Concept Number';
+        foreach my $concept (@$Concepts) {
+            for (my $i=$mintries;$i<=$maxtries;$i++) {
+                #
+                # Gather the per-attempt data
+                my ($correct,$incorrect,$total);
+                foreach my $foil (@{$concept->{'foils'}}) {
+                    $correct   += $ResponseData{$foil}->[$i]->{'correct'};
+                    $incorrect += $ResponseData{$foil}->[$i]->{'incorrect'};
+                    $total     += $ResponseData{$foil}->[$i]->{'total'};
+                }
+                push (@{$PlotData[$i]->{'correct'}},  $correct);
+                push (@{$PlotData[$i]->{'incorrect'}},$incorrect);
+                push (@{$PlotData[$i]->{'total'}},    $total);
+                my $percent;
+                if ($total == 0) {
+                    $percent = 0;
+                } else {
+                    $percent = $correct/$total;
+                }
+                push (@{$PlotData[$i]->{'good'}},100*$percent);
+                push (@{$PlotData[$i]->{'bad'}},100*(1-$percent));
+            }
+        }
     }
-    for (my $k=0; $k<$interval; $k++ ) {
-        if($c->aborted()) {  untie(%cache); return $Str; }
-	$Str .= &DrawTable($k, $analyzeData->{'concepts'}, \%ConceptData);
+    # 
+    # Build a table for the plots
+    $table .= "<table>\n";
+    my @Plots;
+    for (my $i=$mintries;$i<=$maxtries;$i++) {
+        my $minstu = $PlotData[$i]->{'total'}->[0];
+        my $maxstu = $PlotData[$i]->{'total'}->[0];
+        foreach my $count (@{$PlotData[$i]->{'total'}}) {
+            if ($minstu > $count) {
+                $minstu = $count;
+            }
+            if ($maxstu < $count) {
+                $maxstu = $count;
+            }
+        }
+        $maxstu = 0 if (! $maxstu);
+        $minstu = 0 if (! $minstu);
+        my $title;
+        if ($maxstu == $minstu) {
+            $title = 'Attempt '.$i.', '.$maxstu.' students';
+        } else {
+            $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students';
+        }
+        my $graphlink = &Apache::loncommon::DrawGraph($title,
+                                                      $xlabel,
+                                                      '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";
     }
-    my $Answ=&Apache::lonnet::ssi($uri);
-    $Str .= '<br><b>Here you can see the Problem:</b><br>'.$Answ;
-
-    untie(%cache);
-
-    return $Str.'<form>';
+    $table .= "</table>\n";
+    return ($table);
 }
 
-#---- Problem Analysis Web Page ----------------------------------------------
-
-sub IntervalOptions {
-    my ($selectedInterval)=@_;
-
-    my $interval = 1;
-    for(my $n=1; $n<=7; $n++) {
-        if($selectedInterval == $n) {
-            $interval = $n;
+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'}++;
+                    }                        
+                }
+            }
         }
     }
-
-    my $Ptr = '<br><b>Select number of intervals</b>'."\n".
-       	      '<select name="Interval">'."\n";
-    for(my $n=1; $n<=7;$ n++) {
-	$Ptr .= '<option';
-        if($interval == $n) {
-            $Ptr .= ' selected';
+    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'};
         }
-	$Ptr .= '>'.$n."</option>"."\n";
     }
-    $Ptr .= '</select>'."\n";
-
-    return $Ptr;
+    return %Trydata;
 }
 
-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(':',$_);
-        $partCount{$problemId.':'.$part}++;
-    }
-
-    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";
+#########################################################
+#########################################################
+##
+##                 Time Analysis
+##
+#########################################################
+#########################################################
+sub time_analysis {
+    my ($PerformanceData,$ORdata) = @_;
+    my $num_plots = $ENV{'form.NumPlots'};
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    my $num_data = scalar(@$PerformanceData)-1;
+    my $percent = sprintf('%2f',100/$num_plots);
+    $table .= "<table>\n";
+    for (my $i=0;$i<$num_plots;$i++) {
+        my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+            ('startdate_'.$i);
+        my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+            ('enddate_'.$i);
+        my ($begin_index,$end_index,$plottitle,$plothtml,$data);
+        if (! defined($starttime) || ! defined($endtime)) {
+            $begin_index = $i*int($num_data/$num_plots);
+            $end_index = ($i+1)*int($num_data/$num_plots);
+            my $lownum  = sprintf('%2.1f',$i*$percent);
+            $lownum =~ s/(\.0)$//;
+            my $highnum = sprintf('%2.1f',($i+1)*$percent);
+            $highnum =~ s/(\.0)$//;
+            $plottitle = $lownum.'% to '.$highnum.'% of submissions';
         } else {
-            $Str .= '<td><input type="submit" name="Analyze:::'.$_.'" value="';
-            $Str .= 'Part '.$part.' Response '.$response;
-            $Str .= '" /></td></tr>'."\n";
+            my $j;
+            while (++$j < scalar(@$PerformanceData)) {
+                last if ($PerformanceData->[$j]->[2] > $starttime);
+            }
+            $begin_index = $j;
+            while (++$j < scalar(@$PerformanceData)) {
+                last if ($PerformanceData->[$j]->[2] > $endtime);
+            }
+            $end_index = $j;
+            $plottitle = $ENV{'form.plottitle_'.$i};
         }
-        $number++;
+        ($plothtml,$starttime,$endtime,$data) = 
+            &analyze_option_data_by_time($PerformanceData,
+                                         $begin_index,$end_index,
+                                         $plottitle,
+                                         @$Concepts);
+        my $startdateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','startdate_'.$i,$starttime);
+        my $enddateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','enddate_'.$i,$endtime);
+        $table.="<tr><td>".$plothtml.'</td><td align="left" valign="top">'.
+            "<b>Start Time</b>: &nbsp;".$startdateform."<br />".
+            "<b>End Time</b>&nbsp;&nbsp;: "."&nbsp;".$enddateform."<br />".
+            '<b>Plot Title</b>&nbsp;&nbsp;:'.
+            '<input type="text" size="30" name="plottitle_'.$i.'" value="'.
+                  &HTML::Entities::encode($plottitle).'" /><br />'.
+            "</td></tr>\n";
     }
-    $Str .= '</table>'."\n";
-
-    return $Str;
+    $table .="</table>\n";
+    return $table;
 }
 
-#---- END Problem Analysis Web Page ------------------------------------------
-
-#---- Analyze Web Page -------------------------------------------------------
-
-#restore the student submissions and finding the result
-sub OpStatus {
-    my ($problem, $student, $ConceptData, $foil_to_concept, 
-        $analyzeData, $cache)=@_;
-
-    my $ids = $analyzeData->{'parts'};
-    my @True = ();
-    my @False = ();
-    my $flag=0;
-    my $latestVersion = $cache->{$student.':version:'.$problem};
-    if(!$latestVersion) {
-        return;
-    }
-
-    my $tries=0;
-    for(my $version=1; $version<=$latestVersion; $version++) {
-        my $time=$cache->{$student.':'.$version.':'.$problem.':timestamp'};
-
-        foreach my $id (@$ids) {
-            my ($currentPart, undef) = split(/\./, $id);
-            #check if this is a repeat submission, if so skip it
-            next if($cache->{$student.':'.$version.':'.$problem.
-                             ':resource.'.$currentPart.'.previous'});
-            #if no solved this wasn't a real submission, ignore it
-            if(!defined($cache->{"$student:$version:$problem".
-                                 ":resource.$currentPart.solved"})) {
-                &Apache::lonxml::debug("skipping ");
-                next;
-            }
-            my $Resp = $cache->{$student.':'.$version.':'.$problem.
-                                ':resource.'.$id.'.submission'};
-            my %submission=&Apache::lonnet::str2hash($Resp);
-            foreach (keys(%submission)) {
-                if($submission{$_}) {
-                    my $answer = $analyzeData->{$id.'.foil.value.'.$_};
-                    if($submission{$_} eq $answer) {
-                        &Decide("true", $foil_to_concept->{$_}, 
-                                $time, $ConceptData);
-                    } else {
-                        &Decide("false", $foil_to_concept->{$_}, 
-                                $time, $ConceptData);
-                    }
-                }
+sub analyze_option_data_by_time {
+    my ($PerformanceData,$begin_index,$end_index,$description,@Concepts) = @_;
+    my %TimeData;
+    #
+    # Get the start and end times for this segment of the plot
+    my $starttime = $PerformanceData->[$begin_index]->[2];
+    my $endtime   = $PerformanceData->[$end_index  ]->[2];
+    #
+    # Compute the number getting the foils correct or incorrects
+    for (my $i=$begin_index;$i<=$end_index;$i++) {
+        my $row = $PerformanceData->[$i];
+        next if (! defined($row));
+        my ($grading,$submission,$time,$tries) = @$row;
+        my @Foilgrades = split('&',$grading);
+        my @Foilsubs   = split('&',$submission);
+        foreach my $foilgrade (@Foilgrades) {
+            my ($foilid,$correct) = split('=',$foilgrade);
+            if ($correct) {
+                $TimeData{$foilid}->{'correct'}++;
+            } else {
+                $TimeData{$foilid}->{'incorrect'}++;
             }
         }
     }
-
-    return;
-}
-
-sub DrawGraph {
-    my ($k,$Src,$Concepts,$ConceptData)=@_;
-    my $Max=0;
-    my @data1;
-    my @data2;
-
-    # Adjust Data and find the Max 
-    for (my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	my $tmp=$Concepts->[$n];
-	$data1[$n]=$ConceptData->{$tmp.'.'.$k.'.true'};
-	$data2[$n]=$ConceptData->{$tmp.'.'.$k.'.false'};
-	my $Sum=$data1[$n]+$data2[$n];
-	if($Max < $Sum) {
-            $Max=$Sum;
-        }
-    }
-    for (my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	if ($data1[$n]+$data2[$n]<$Max) {
-	    $data2[$n]+=$Max-($data1[$n]+$data2[$n]);
-	}
-    }
-    my $P_No = (scalar @data1);
-
-    if($Max > 1) { 
-	$Max += (10 - $Max % 10);
-	$Max = int($Max);
+    #
+    # Compute the total and percent correct
+    my @Plotdata1;
+    my @Plotdata2;
+    foreach my $concept (@Concepts) {
+        my ($correct,$incorrect,$total);
+        foreach my $foilid (@{$concept->{'foils'}}) {
+            if (! exists($TimeData{$foilid}->{'correct'})) {
+                $TimeData{$foilid}->{'correct'} = 0;
+            }
+            if (! exists($TimeData{$foilid}->{'incorrect'})) {
+                $incorrect = 0;
+                $TimeData{$foilid}->{'incorrect'} = 0;
+            }
+            $correct   += $TimeData{$foilid}->{'correct'};
+            $incorrect += $TimeData{$foilid}->{'incorrect'};
+            $total     += $TimeData{$foilid}->{'correct'}+
+                $TimeData{$foilid}->{'incorrect'};
+            $TimeData{$foilid}->{'total'} = $TimeData{$foilid}->{'correct'} +
+                $TimeData{$foilid}->{'incorrect'};
+            my $percent;
+            if ($TimeData{$foilid}->{'total'} == 0) {
+                $percent = 0;
+            } else {
+                $percent = $TimeData{$foilid}->{'correct'} / 
+                    $TimeData{$foilid}->{'total'};
+            }
+            $TimeData{$foilid}->{'percent_corr'} = 100 * $percent;
+            if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+                push (@Plotdata1,    $TimeData{$foilid}->{'percent_corr'});
+                push (@Plotdata2,100-$TimeData{$foilid}->{'percent_corr'});
+            }
+        }
+        if ($ENV{'form.AnalyzeAs'} ne 'Foils') {
+            if ($total == 0) {
+                push (@Plotdata1,0);
+                push (@Plotdata2,100);
+            } else {
+                push (@Plotdata1,100 *   $correct / $total);
+                push (@Plotdata2,100 * (1-$correct / $total));
+            }
+        }
+    }
+    #
+    # Create the plot
+    my $xlabel;
+    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $xlabel = 'Foil Number';
     } else {
-        $Max = 1;
+        $xlabel = 'Concept Number';
     }
+    my $graphlink = &Apache::loncommon::DrawGraph
+        ($description,#'Time Interval Analysis',
+         $xlabel,
+         'Percent Correct / Incorrect',
+         100,
+         \@Plotdata1,\@Plotdata2);
+    #
+    return ($graphlink,$starttime,$endtime,\%TimeData);
+}
 
-    my $Titr=($ConceptData->{'Interval'}>1) ? $Src.'_interval_'.($k+1) : $Src;
-#    $GData=$Titr.'&Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2;
-    my $GData = '';
-    $GData  = $Titr.'&Concepts&Answers&'.$Max.'&'.$P_No.'&';
-    $GData .= (join(',',@data1)).'&'.(join(',',@data2));
-
-    return '<IMG src="/cgi-bin/graph.gif?'.$GData.'" border=1/>';
-}
-
-sub DrawTable {
-    my ($k,$Concepts,$ConceptData)=@_;
-    my $Max=0;
-    my @data1;
-    my @data2;
-    my $Correct=0;
-    my $Wrong=0;
-    for(my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	my $tmp=$Concepts->[$n];
-	$data1[$n]=$ConceptData->{$tmp.'.'.$k.'.true'};
-	$Correct+=$data1[$n];
-	$data2[$n]=$ConceptData->{$tmp.'.'.$k.'.false'};
-	$Wrong+=$data2[$n];
-	my $Sum=$data1[$n]+$data2[$n];
-	if($Max < $Sum) {
-            $Max=$Sum;
-        }
-    }
-    for(my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	if ($data1[$n]+$data2[$n]<$Max) {
-	    $data2[$n]+=$Max-($data1[$n]+$data2[$n]);
-	}
+#########################################################
+#########################################################
+##
+##             Interface 
+##
+#########################################################
+#########################################################
+sub CreateInterface {
+    ##
+    ## Environment variable initialization
+    if (! exists$ENV{'form.AnalyzeOver'}) {
+        $ENV{'form.AnalyzeOver'} = 'Tries';
     }
-    my $P_No = (scalar @data1);
+    ##
+    ## Build the menu
     my $Str = '';
-#    $Str .= '<br><b>From: ['.localtime($ConceptData->{'Int.'.($k-1)});
-#    $Str .= '] To: ['.localtime($ConceptData->{"Int.$k"}).']</b>'; 
-    $Str .= "\n".'<table border=2>'.
-            "\n".'<tr>'.
-            "\n".'<th> # </th>'.
-            "\n".'<th> Concept </th>'.
-            "\n".'<th> Correct </th>'.
-            "\n".'<th> Wrong </th>'.
-            "\n".'</tr>';
-
-    for(my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	$Str .= '<tr>'."\n";
-        $Str .= '<td>'.($n+1).'</td>'."\n";
-        my ($currentConcept) = split('::',$Concepts->[$n]);
-        $Str .= '<td bgcolor="EEFFCC">'.$currentConcept;
-        $Str .= '</td>'."\n";
-        $Str .= '<td bgcolor="DDFFDD">'.$data1[$n].'</td>'."\n";
-        $Str .= '<td bgcolor="FFDDDD">'.$data2[$n].'</td>'."\n";
-        $Str .= '</tr>'."\n";
-    }
-    $Str .= '<td></td><td><b>From:['.localtime($ConceptData->{'Int.'.$k});
-    $Str .= '] To: ['.localtime($ConceptData->{'Int.'.($k+1)}-1);
-    $Str .= ']</b></td><td>'.$Correct.'</td><td>'.$Wrong.'</td>';
+    $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">&nbsp;</td>';
+    $Str .= '</tr>'."\n";
+    ##
+    ## 
+    $Str .= '<tr><td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::SectionSelect('Section','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>';
+    { # These braces are here to organize the code, not scope it.
+        {
+            $Str .= '<nobr>'.&mt('Analyze Over ');
+            $Str .='<select name="AnalyzeOver" >';
+            $Str .= '<option value="Tries" ';
+            if (! exists($ENV{'form.AnalyzeOver'}) || 
+                $ENV{'form.AnalyzeOver'} eq 'Tries'){
+                # Default to Tries
+                $Str .= ' selected ';
+            }
+            $Str .= '>'.&mt('Tries').'</option>';
+            $Str .= '<option value="Time" ';
+            $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+            $Str .= '>'.&mt('Time').'</option>';
+            $Str .= '</select></nobr><br />';
+        }
+        {
+            $Str .= '<nobr>'.&mt('Analyze as ');
+            $Str .='<select name="AnalyzeAs" >';
+            $Str .= '<option value="Concepts" ';
+            if (! exists($ENV{'form.AnalyzeAs'}) || 
+                $ENV{'form.AnalyzeAs'} eq 'Concepts'){
+                # Default to Concepts
+                $Str .= ' selected ';
+            }
+            $Str .= '>'.&mt('Concepts').'</option>';
+            $Str .= '<option value="Foils" ';
+            $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils');
+            $Str .= '>'.&mt('Foils').'</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'} = 5;
+            }
+            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";
-
-    return $Str;
-#$Apache::lonxml::debug=1;
-#&Apache::lonhomework::showhash(%ConceptData);
-#$Apache::lonxml::debug=0;
+    return ($Str);
 }
 
-#---- END Analyze Web Page ----------------------------------------------
-
-sub Decide {
-    #deciding the true or false answer belongs to each interval
-    my ($type,$concept,$time,$ConceptData)=@_; 
-    my $k=0;
-    while($time > $ConceptData->{'Int.'.($k+1)} && 
-           $k < $ConceptData->{'Interval'}) {
-        $k++;
+sub OptionResponseProblemSelector {
+    my $Str;
+    $Str = "\n<table>\n";
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        next if ($seq->{'num_assess'}<1);
+        my $seq_str = '';
+        foreach my $res (@{$seq->{'contents'}}) {
+            next if ($res->{'type'} ne 'assessment');
+            foreach my $part (@{$res->{'parts'}}) {
+                my $partdata = $res->{'partdata'}->{$part};
+                if (! exists($partdata->{'option'}) || 
+                    $partdata->{'option'} == 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);
+                        my $checked = '';
+                        if ($ENV{'form.problemchoice'} eq $value) {
+                            $checked = 'checked ';
+                        }
+                        $seq_str .= '<tr><td>'.
+  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
+  '</td><td>'.
+  '<a href="'.$res->{'src'}.'">'.$res->{'title'}.'</a> ';
+                        if ($partdata->{'option'} > 1) {
+                            $seq_str .= &mt('response').' '.$respid;
+                        }
+                        $seq_str .= "</td></tr>\n";
+                    }
+                }
+            }
+        }
+        if ($seq_str ne '') {
+            $Str .= '<tr><td>&nbsp</td><td><b>'.$seq->{'title'}.'</b></td>'.
+                "</tr>\n".$seq_str;
+        }
     }
-    $ConceptData->{$concept.'.'.$k.'.'.$type}++;
-
-    return;
+    $Str .= "</table>\n";
+    return $Str;
 }
 
-sub InitAnalysis {
-    my ($uri,$part,$responseId,$problem,$student,$courseID)=@_;
-    my ($name,$domain)=split(/\:/,$student);
-
-    my %analyzeData;
-    # Render the student's view of the problem.  $Answ is the problem 
-    # Stringafied
-    my $Answ=&Apache::lonnet::ssi($uri,('grade_target'   => 'analyze',
-                                        'grade_username' => $name,
-                                        'grade_domain'   => $domain,
-                                        'grade_courseid' => $courseID,
-                                        'grade_symb'     => $problem));
-
-    my %Answer=();
-    %Answer=&Apache::lonnet::str2hash($Answ);
+#########################################################
+#########################################################
+##
+##              Misc functions
+##
+#########################################################
+#########################################################
+sub get_problem_symb {
+    my $problemstring = shift();
+    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
+    return ($symb,$partid,$resid);
+}
 
-    my $found = 0;
-    my @parts=();
-    if(defined($responseId)) {
-        foreach (@{$Answer{'parts'}}) {
-            if($_ eq $part.'.'.$responseId) {
-                push(@parts, $_);
-                $found = 1;
-                last;
-            }
-        }
-    } else {
-        foreach (@{$Answer{'parts'}}) {
-            if($_ =~ /$part/) {
-                push(@parts, $_);
-                $found = 1;
-                last;
+sub get_resource_from_symb {
+    my ($symb) = @_;
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        foreach my $res (@{$seq->{'contents'}}) {
+            if ($res->{'symb'} eq $symb) {
+                return $res;
             }
         }
     }
+    return undef;
+}
 
-    if($found == 0) {
-        $analyzeData{'error'} = 'No parts matching selected values';
-        return \%analyzeData;
-    }
-
-    my @Concepts=();
-    my %foil_to_concept;
-    foreach my $currentPart (@parts) {
-        if(defined($Answer{$currentPart.'.concepts'})) {
-            foreach my $concept (@{$Answer{$currentPart.'.concepts'}}) {
-                push(@Concepts, $concept);
-                foreach my $foil (@{$Answer{$currentPart.'.concept.'.
-                                            $concept}}) {
-                    $analyzeData{$currentPart.'.foil.value.'.$foil} =
-                        $Answer{$currentPart.'.foil.value.'.$foil};
-                    $foil_to_concept{$foil} = $concept;
+sub get_problem_data {
+    my ($url) = @_;
+    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
+    (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
+    my %Answer;
+    %Answer=&Apache::lonnet::str2hash($Answ);
+    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}->{'Foils'}->{$foil}->{'Concept'}=
+                                                                      $concept;
+                    }
                 }
-            }
-        } else {
-            foreach (keys(%Answer)) {
-                if(/$currentPart.foil\.value\.(.*)$/) {
-                    push(@Concepts, $1);
-                    $foil_to_concept{$1} = $1;
-                    $analyzeData{$currentPart.'.foil.value.'.$1} =
-                        $Answer{$currentPart.'.foil.value.'.$1};
+            } else {
+                $value =~ s/^\s*//g;
+                $value =~ s/\s*$//g;
+                if ($key=~ /^foil\.text\.(.*)$/) {
+                    my $foil = $1;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
+                } elsif ($key =~ /^foil\.value\.(.*)$/) {
+                    my $foil = $1;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
                 }
             }
         }
     }
-
-    $analyzeData{'parts'} = \@parts;
-    $analyzeData{'concepts'} = \@Concepts;
-    $analyzeData{'foil_to_concept'} = \%foil_to_concept;
-
-    return \%analyzeData;
-}
-
-sub Interval {
-    my ($part,$symb,$interval,$Concepts,$ConceptData)=@_;
-    my $Int=$interval;
-    my $due = &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);
-    my $opn = &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
-    my $add=int(($due-$opn)/$Int);
-    $ConceptData->{'Int.0'}=$opn;
-    for(my $i=1; $i<$Int; $i++) {
-	$ConceptData->{'Int.'.$i}=$opn+$i*$add;
-    }
-    $ConceptData->{'Int.'.$Int}=$due;     
-    for(my $i=0; $i<$Int; $i++) {
-	for(my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	    my $tmp=$Concepts->[$n];
-	    $ConceptData->{$tmp.'.'.$i.'.true'}=0;
-	    $ConceptData->{$tmp.'.'.$i.'.false'}=0;
-	}
-    }
+    return %Partdata;
 }
+
 1;
+
 __END__