--- loncom/interface/statistics/lonproblemanalysis.pm	2020/11/12 00:15:27	1.142.2.5
+++ loncom/interface/statistics/lonproblemanalysis.pm	2014/02/03 18:50:58	1.145
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.142.2.5 2020/11/12 00:15:27 raeburn Exp $
+# $Id: lonproblemanalysis.pm,v 1.145 2014/02/03 18:50:58 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
+use Apache::lonquickgrades();
 use Apache::lonstatistics;
 use Apache::lonlocal;
 use Apache::lonstathelpers();
@@ -74,6 +75,7 @@ sub BuildProblemAnalysisPage {
     &Apache::lonstatistics::PrepareClasslist();
     #
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
 
     $r->print(&CreateInterface());
     #
@@ -90,7 +92,7 @@ sub BuildProblemAnalysisPage {
         &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
-    my $problem_types = &analyzable_types();
+    my $problem_types = '(option|radiobutton|numerical)';
     if (exists($env{'form.problemchoice'}) && 
         ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
@@ -116,9 +118,21 @@ sub BuildProblemAnalysisPage {
         $r->rflush();
         #
         # Determine which problem we are to analyze
-        my ($navmap,$current_problem) = &get_current_problem(); # need to retrieve $navmap
-                                                                # to support $resource->* calls
-                                                                # for src and compTitle (below)
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($env{'form.problemchoice'});
+        #
+        my ($navmap,$prev,$curr,$next) = 
+            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                        $problem_types,
+                                                        'response',
+                                                        );
+        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'} = 
@@ -179,28 +193,6 @@ sub BuildProblemAnalysisPage {
     }
 }
 
-sub analyzable_types {
-    return '(option|radiobutton|numerical)';
-}
-
-sub get_current_problem {
-    my ($problem_types) = @_;
-    my $current_problem = &Apache::lonstathelpers::get_target_from_id
-        ($env{'form.problemchoice'});
-    my ($navmap,$prev,$curr,$next) =
-        &Apache::lonstathelpers::get_prev_curr_next($current_problem,
-                                                    $problem_types,
-                                                    'response');
-    if (exists($env{'form.PrevProblemAnalysis'}) && ($prev ne '')) {
-        $current_problem = $prev;
-    } elsif (exists($env{'form.NextProblemAnalysis'}) && ($next ne '')) {
-        $current_problem = $next;
-    } else {
-        $current_problem = $curr;
-    }
-    return ($navmap,$current_problem);
-}
-
 #########################################################
 #########################################################
 ##
@@ -1270,7 +1262,7 @@ sub OptionResponseAnalysis {
             $r->print($analysis_html);
             $r->rflush();
         } else {
-            $r->print('<div class="LC_warning"'
+            $r->print('<div class="LC_warning">'
                      .&mt('The analysis you have selected is not supported at this time.')
                      .'</div>'
             );
@@ -1957,12 +1949,12 @@ sub CreateInterface {
         $showprob_checkbox.' '.&mt('Show problem').
         '</label></span><br />';
     ##
-    my $analyze_selector = '<select name="AnalyzeOver">';
-    $analyze_selector .= '<option value="tries"';
+    my $analyze_selector = '<select name="AnalyzeOver" >';
+    $analyze_selector .= '<option value="tries" ';
     if (! exists($env{'form.AnalyzeOver'}) || 
         $env{'form.AnalyzeOver'} eq 'tries'){
         # Default to tries
-        $analyze_selector .= ' selected="selected"';
+        $analyze_selector .= 'selected="selected"';
     }
     $analyze_selector .= '>'.&mt('Tries').'</option>';
     $analyze_selector .= '<option value="time"';