[LON-CAPA-cvs] cvs: rat(version_2_11_X) / lonpage.pm

[raeburn]

raeburn		Mon Sep 11 13:28:55 2023 EDT

  Modified files:              (Branch: version_2_11_X)
    /rat	lonpage.pm 
  Log:
  - For 2.11
    Backport 1.143, 1.144
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.111.2.13 rat/lonpage.pm:1.111.2.14
--- rat/lonpage.pm:1.111.2.13	Wed Nov 11 21:52:05 2020
+++ rat/lonpage.pm	Mon Sep 11 13:28:55 2023
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.13 2020/11/11 21:52:05 raeburn Exp $
+# $Id: lonpage.pm,v 1.111.2.14 2023/09/11 13:28:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,6 +236,7 @@
                   my $nforms=0;
                   my $nuploads=0;
                   my $ntimers=0;
+                  my $hasnumresp;
                   my %turninpaths;
                   my %multiresps;
                   my $turninparent;
@@ -473,6 +474,11 @@
                                       $ntimers++;
                                       $hastimer = 1;
                                   }
+                                  unless ($hasnumresp) {
+                                      if ($output=~/\<input[^\>]+class\s*=\s*['"]*[^'">]*LC_numresponse_text\W/) {
+                                          $hasnumresp = 1;
+                                      }
+                                  }
                                   $output=~
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
                                   $output=~
@@ -854,8 +860,11 @@
                           &mt('Processing your submission ...').'</div></form>');
                       }
 		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
-			  $r->print(&Apache::loncommon::end_page({'discussion'
-								      => 1,}));
+                          my $args = {'discussion' => 1};
+                          if ($hasnumresp) {
+                              $args->{'dashjs'} = 1;
+                          }
+			  $r->print(&Apache::loncommon::end_page($args));
 		      } else {
 			  $r->print('\end{document}'.$number_of_columns);
 		      }