[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface/statistics lonsubmissiontimeanalysis.pm

[raeburn]

raeburn		Thu Nov 12 00:31:19 2020 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface/statistics	lonsubmissiontimeanalysis.pm 
  Log:
  - For 2.11
    Backport 1.37
  
  
Index: loncom/interface/statistics/lonsubmissiontimeanalysis.pm
diff -u loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.35.2.2 loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.35.2.3
--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.35.2.2	Mon Dec 17 02:22:12 2012
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	Thu Nov 12 00:31:19 2020
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.35.2.2 2012/12/17 02:22:12 raeburn Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.35.2.3 2020/11/12 00:31:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,20 +103,9 @@
         $r->rflush();
         #
         # Determine which problem we are to analyze
-        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,
-                                                        '.',
-                                                        'part');
-        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
-            $current_problem = $prev;
-        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
-            $current_problem = $next;
-        } else {
-            $current_problem = $curr;
-        }
+        my ($navmap,$current_problem) = &get_current_problem(); # need to retrieve $navmap
+                                                                # to support $resource->* calls
+                                                                # for src and compTitle (below)
         #
         # Store the current problem choice and send it out in the form
         $env{'form.problemchoice'} = 
@@ -152,6 +141,23 @@
     }
 }
 
+sub get_current_problem {
+    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,
+                                                    '.',
+                                                    'part');
+    if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        $current_problem = $prev;
+    } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
+        $current_problem = $next;
+    } else {
+        $current_problem = $curr;
+    }
+    return ($navmap,$current_problem);
+}
+
 #########################################################
 #########################################################
 ##