--- rat/lonwrapper.pm	2023/01/21 23:25:16	1.49.2.11.2.3
+++ rat/lonwrapper.pm	2023/09/27 14:52:28	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.49.2.11.2.3 2023/01/21 23:25:16 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.83 2023/09/27 14:52:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonextresedit();
 use Apache::lonexttool();
+use Apache::lonhomework();
 use Apache::lonnavmaps();
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities();
@@ -52,7 +53,6 @@ sub wrapper {
     unless ($env{'form.folderpath'}) {
         $forcereg = 1;
     }
-
     my %lt = &Apache::lonlocal::texthash(
                                           'noif' => 'No iframe support.',
                                           'show' => 'Show content in pop-up window',
@@ -95,9 +95,55 @@ sub wrapper {
     }
     if ($env{'form.only_body'}) {
         $args->{'only_body'} = $env{'form.only_body'};
+    } elsif (($is_supp) && ($env{'form.folderpath'} ne '')) {
+        $args->{'bread_crumbs_nomenu'} = 1;
     }
 
-    my $headjs;
+    my ($countdown,$donemsg,$headjs);
+    if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
+        $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
+        if ($env{'form.markaccess'}) {
+            my $symb=&Apache::lonnet::symbread($url);
+            my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
+            my ($timelimit) = split(/_/,$interval[0]);
+            my $setres = &Apache::lonnet::set_first_access($interval[1],$timelimit);
+            if ($setres eq 'ok') {
+                delete($env{'form.markaccess'});
+            }
+        } elsif ($env{'form.LC_interval_done'} eq 'true') {
+            my $symb=&Apache::lonnet::symbread($url);
+            if ($symb) {
+                (my $donebuttonresult,$donemsg) = &Apache::lonhomework::zero_timer($symb);
+                undef($env{'form.LC_interval_done'});
+                undef($env{'form.LC_interval_done_proctorpass'});
+            }
+        }
+        my ($status,$result,$resource_due) =
+            &Apache::lonexttool::gradabletool_access_check();
+        undef($Apache::lonhomework::browse);
+        if ($status eq 'CAN_ANSWER') {
+            if ($resource_due) {
+                my $time_left = $resource_due - time();
+                if ($resource_due && ($time_left > 0)) {
+                    $countdown ='
+<script type="text/javascript">
+// <![CDATA['."\n".
+                             &Apache::lonhtmlcommon::countdown().'
+// ]]>
+</script>'."\n".
+                    &Apache::lonhtmlcommon::set_due_date($resource_due);
+                }
+            }
+        } else {
+            if ($status eq 'SHOW_ANSWER') {
+                $result = &Apache::lonexttool::display_score().
+                          &Apache::lonfeedback::list_discussion('tool','OPEN');
+            }
+            return &Apache::loncommon::start_page('Menu',undef,$args).
+                   $result.
+                   &Apache::loncommon::end_page();
+        }
+    }
 
 #
 # Where iframe is in use, if window.onload() executes before the custom resize function
@@ -116,7 +162,7 @@ var LCresizedef = 0;
 </script>'."\n";
     }
 
-    my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
+    my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args).$countdown.$donemsg;
     my $endpage = &Apache::loncommon::end_page();
 
     if (($uselink) && ($title eq '')) {
@@ -233,6 +279,9 @@ ENDLINK
                 if ($explanation ne '') {
                     $output .= '<div>'.$explanation.'</div>';
                 }
+                if (&Apache::lonnet::EXT('resource.0.gradable')) {
+                    $output .= &Apache::lonfeedback::list_discussion('tool','OPEN');
+                }
             }
         } else {
             if ($uselink) {
@@ -255,7 +304,7 @@ ENDLINK
     } else {
         my $offset = 5;
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
-        if ($env{'form.inhibitmenu'} eq 'yes') {
+        if (($env{'form.inhibitmenu'} eq 'yes') || ($env{'form.only_body'})) {
             $offset = 0;
         }
         my $script = &Apache::lonhtmlcommon::scripttag(<<SCRIPT);
@@ -287,12 +336,12 @@ ENDLINK
             }
         });
         window.onload = function(){
-            if (LCresizedef) {
-                LCnotready = 0;
-                \$(window).trigger('resize');
-            } else {
-                LCnotready = 1;
-            }
+             if (LCresizedef) {
+                 LCnotready = 0;
+                 \$(window).trigger('resize');
+             } else {
+                 LCnotready = 1;
+             }
         };
 SCRIPT
         # javascript will position the iframe if window was resized (or zoomed)
@@ -378,9 +427,16 @@ sub handler {
         my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'],
                                             $cdom,$cnum);
         if ($toolhash{'id'}) {
-            my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
-            if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {
-                $exttoolremote = $ltitools{$toolhash{'id'}}{'url'};
+            my ($idx,%ltitools);
+            if ($toolhash{'id'} =~ /^c(\d+)$/) {
+                $idx = $1;
+                %ltitools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+            } else {
+                $idx = $toolhash{'id'};
+                %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+            }
+            if (ref($ltitools{$idx}) eq 'HASH') {
+                $exttoolremote = $ltitools{$idx}{'url'};
             }
         }
         if ($toolhash{'target'} eq 'window') {
@@ -399,7 +455,7 @@ sub handler {
     }
     if (($is_ext) || ($exttool)) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-            ['forceedit','register','folderpath','symb','idx','title','anchor']);
+            ['forceedit','register','folderpath','symb','idx','title','anchor','only_body']);
         if (($env{'form.forceedit'}) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             (($env{'form.folderpath'} =~ /^supplemental/) ||
@@ -444,8 +500,10 @@ sub handler {
                 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
                 &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
             }
-            $brcrum =
-                &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            unless ($env{'form.only_body'}) {
+                $brcrum =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            }
         }
     } elsif ($env{'request.course.id'}) {
         my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
@@ -453,7 +511,7 @@ sub handler {
         if ($url =~ m{^\Q/uploaded/$courseurl/supplemental/\E}) {
             $is_supp = 1;
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                                    ['folderpath','title']);
+                                                    ['folderpath','title','only_body']);
             if ($env{'form.folderpath'}) {
                 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
                 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -462,9 +520,10 @@ sub handler {
             my $title = $env{'form.title'};
             $title = &HTML::Entities::encode($title,'\'"<>&');
             my $crstype = &Apache::loncommon::course_type();
-            $brcrum =
-                &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
-
+            unless ($env{'form.only_body'}) {
+                $brcrum =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+            }
         }
     }