--- loncom/interface/statistics/lonproblemanalysis.pm	2003/11/11 22:14:28	1.49
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/01/16 15:35:04	1.55
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.49 2003/11/11 22:14:28 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.55 2004/01/16 15:35:04 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,14 +42,19 @@ my $plotcolors = ['#33ff00',
                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                   ]; 
 
-my @SubmitButtons = ({ name => 'ProblemAnalyis',
+my @SubmitButtons = ({ name => 'PrevProblemAnalysis',
+                       text => 'Previous Problem' },
+                     { name => 'ProblemAnalysis',
                        text => 'Analyze Problem Again' },
+                     { name => 'NextProblemAnalysis',
+                       text => 'Next Problem' },
+                     { name => 'break'},
                      { name => 'ClearCache',
                        text => 'Clear Caches' },
                      { name => 'updatecaches',
                        text => 'Update Student Data' },
                      { name => 'SelectAnother',
-                       text => 'Choose a different resource' },
+                       text => 'Choose a different Problem' },
                      { name => 'ExcelOutput',
                        text => 'Produce Excel Output' });
 
@@ -112,34 +117,57 @@ sub BuildProblemAnalysisPage {
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
-            $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
-                      'value="'.&mt($button->{'text'}).'" />');
-            $r->print('&nbsp;'x5);
+            if ($button->{'name'} eq 'break') {
+                $r->print("<br />\n");
+            } else {
+                $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
+                          'value="'.&mt($button->{'text'}).'" />');
+                $r->print('&nbsp;'x5);
+            }
         }
-        $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
         #
         $r->print('<hr />');
-        #
-        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) || ! defined($resptype)) {
+        # Determine which problem we are to analyze
+        my $current_problem = &get_target_from_id($ENV{'form.problemchoice'});
+        #
+        my ($prev,$curr,$next) = &get_prev_curr_next($current_problem);
+        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+            $current_problem = $prev;
+        } 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'} = &make_target_id($current_problem);
+        $r->print('<input type="hidden" name="problemchoice" value="'.
+                  $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>');
             $r->print(&render_resource($resource));
             $r->rflush();
             my %Data = &get_problem_data($resource->{'src'});
-            my $ProblemData = $Data{$part.'.'.$resid};
-            if ($resptype eq 'option') {
-                &OptionResponseAnalysis($r,$resource,$resid,$ProblemData,
+            my $ProblemData = $Data{$current_problem->{'part'}.
+                                    '.'.
+                                    $current_problem->{'respid'}};
+            if ($current_problem->{'resptype'} eq 'option') {
+                &OptionResponseAnalysis($r,$resource,
+                                        $current_problem->{'respid'},
+                                        $ProblemData,
                                         \@Students);
-            } elsif ($resptype eq 'radiobutton') {
-                &RadioResponseAnalysis($r,$resource,$part,$resid,$ProblemData,
+            } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+                &RadioResponseAnalysis($r,$resource,
+                                       $current_problem->{'part'},
+                                       $current_problem->{'respid'},
+                                       $ProblemData,
                                        \@Students);
             } else {
                 $r->print('<h2>This analysis is not supported</h2>');
@@ -355,10 +383,10 @@ sub get_Radio_problem_data {
 #########################################################
 #########################################################
 sub OptionResponseAnalysis {
-    my ($r,$resource,$resid,$ProblemData,$Students) = @_;
+    my ($r,$resource,$respid,$ProblemData,$Students) = @_;
     my $PerformanceData = 
         &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$resid);
+        ($Students,$resource->{'symb'},$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -1403,6 +1431,8 @@ sub CreateInterface {
     { # These braces are here to organize the code, not scope it.
         {
             $Str .= '<nobr>'.&mt('Analyze Over ');
+            $Str .= &Apache::loncommon::help_open_topic
+                                                  ('Analysis_Analyze_Over');
             $Str .='<select name="AnalyzeOver" >';
             $Str .= '<option value="Tries" ';
             if (! exists($ENV{'form.AnalyzeOver'}) || 
@@ -1414,10 +1444,13 @@ sub CreateInterface {
             $Str .= '<option value="Time" ';
             $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
             $Str .= '>'.&mt('Time').'</option>';
-            $Str .= '</select></nobr><br />';
+            $Str .= '</select>';
+            $Str .= '</nobr><br />';
         }
         {
             $Str .= '<nobr>'.&mt('Analyze as ');
+            $Str .= &Apache::loncommon::help_open_topic
+                                                  ('Analysis_Analyze_as');
             $Str .='<select name="AnalyzeAs" >';
             $Str .= '<option value="Concepts" ';
             if (! exists($ENV{'form.AnalyzeAs'}) || 
@@ -1433,6 +1466,8 @@ sub CreateInterface {
         }
         {
             $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+            $Str .= &Apache::loncommon::help_open_topic
+                                                  ('Analysis_num_plots');
             $Str .= '<select name="NumPlots">';
             if (! exists($ENV{'form.NumPlots'}) 
                 || $ENV{'form.NumPlots'} < 1 
@@ -1484,17 +1519,22 @@ sub ProblemSelector {
                     my $resptype = $partdata->{'ResponseTypes'}->[$i];
                     if ($resptype eq 'option' ){
 #                    if ($resptype eq 'option' || $resptype eq 'radiobutton') {
-                        my $value = 
-                            &Apache::lonnet::escape($res->{'symb'}.':'.$part.
-                                                    ':'.$respid.':'.$resptype);
+                        my $value = &make_target_id({symb=>$res->{'symb'},
+                                                     part=>$part,
+                                                     respid=>$respid,
+                                                     resptype=>$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;
@@ -1522,9 +1562,11 @@ sub ProblemSelector {
 #########################################################
 sub get_problem_symb {
     my $problemstring = shift();
-    my ($symb,$partid,$resid,$resptype) = 
-        ($problemstring=~ /^(.*):([^:]*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid,$resptype);
+    my ($symb,$partid,$respid,$resptype) = split(':',$problemstring);
+    return ({ symb   => $symb,
+              part   => $partid,
+              respid => $respid,
+              type   => $resptype } );
 }
 
 sub get_resource_from_symb {
@@ -1539,6 +1581,86 @@ sub get_resource_from_symb {
     return undef;
 }
 
+sub get_prev_curr_next {
+    my ($target) = @_;
+    #
+    # Build an array with the data we need to search through
+    my @Resource;
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        foreach my $res (@{$seq->{'contents'}}) {
+            next if ($res->{'type'} ne 'assessment');
+            foreach my $part (@{$res->{'parts'}}) {
+                my $partdata = $res->{'partdata'}->{$part};
+                for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
+                    my $respid = $partdata->{'ResponseIds'}->[$i];
+                    my $resptype = $partdata->{'ResponseTypes'}->[$i];
+                    next if ($resptype ne 'option');
+                    push (@Resource,
+                            { symb     => $res->{symb},
+                              part     => $part,
+                              respid   => $partdata->{'ResponseIds'}->[$i],
+                              resource => $res,
+                              resptype => $resptype
+                            } );
+                }
+            }
+        }
+    }
+    #
+    #
+    # Get the index of the current situation
+    my $curr_idx;
+    for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) {
+        my $curr_item = $Resource[$curr_idx];
+        last if ($curr_item->{'symb'} eq $target->{'symb'} &&
+                 $curr_item->{'part'} eq $target->{'part'} &&
+                 $curr_item->{'respid'} eq $target->{'respid'} &&
+                 $curr_item->{'resptype'} eq $target->{'resptype'});
+    }
+    my $curr_item = $Resource[$curr_idx];
+    if ($curr_item->{'symb'}     ne $target->{'symb'} ||
+        $curr_item->{'part'}     ne $target->{'part'} ||
+        $curr_item->{'respid'}   ne $target->{'respid'} ||
+        $curr_item->{'resptype'} ne $target->{'resptype'}){
+        # bogus symb - return nothing
+        return (undef,undef,undef);
+    }
+    #
+    # Now just pick up the data we need
+    my ($prev,$curr,$next);
+    if ($curr_idx == 0) {
+        $prev = undef;
+        $curr = $Resource[$curr_idx  ];
+        $next = $Resource[$curr_idx+1];
+    } elsif ($curr_idx == $#Resource) {
+        $prev = $Resource[$curr_idx-1];
+        $curr = $Resource[$curr_idx  ];
+        $next = undef;
+    } else {
+        $prev = $Resource[$curr_idx-1];
+        $curr = $Resource[$curr_idx  ];
+        $next = $Resource[$curr_idx+1];
+    }
+    return ($prev,$curr,$next);
+}
+
+sub make_target_id {
+    my ($target) = @_;
+    my $id = &Apache::lonnet::escape($target->{'symb'}).':'.
+             &Apache::lonnet::escape($target->{'part'}).':'.
+             &Apache::lonnet::escape($target->{'respid'}).':'.
+             &Apache::lonnet::escape($target->{'resptype'});
+    return $id;
+}
+
+sub get_target_from_id {
+    my ($id) = @_;
+    my ($symb,$part,$respid,$resptype) = split(':',$id);
+    return ({ symb    =>&Apache::lonnet::unescape($symb),
+             part     =>&Apache::lonnet::unescape($part),
+             respid   =>&Apache::lonnet::unescape($respid),
+             resptype =>&Apache::lonnet::unescape($resptype)});
+}
 
 #########################################################
 #########################################################