--- rat/lonwrapper.pm	2017/12/18 23:23:14	1.66
+++ rat/lonwrapper.pm	2017/12/22 02:01:01	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.66 2017/12/18 23:23:14 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.67 2017/12/22 02:01:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,25 +82,45 @@ sub wrapper {
         $args->{'only_body'} = $env{'form.only_body'};
     }
 
-    my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
-    my $endpage = &Apache::loncommon::end_page();
-
-    if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable'))) {
-        my $resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});
-        if ($resource_due) {
-            my $time_left = $resource_due - time();
-            if ($resource_due && ($time_left > 0)) {
-                $startpage .='
+    my $countdown;
+    if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
+        $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
+        if ($env{'form.markaccess'}) {
+            my @interval=&Apache::lonnet::EXT("resource.0.interval");
+            my ($timelimit) = split(/_/,$interval[0]);
+            &Apache::lonnet::set_first_access($interval[1],$timelimit);
+            delete($env{'form.markaccess'});
+        }
+        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);
+                    &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();
         }
     }
 
+    my $startpage = &Apache::loncommon::start_page('Menu',undef,$args).$countdown;
+    my $endpage = &Apache::loncommon::end_page();
+
     if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
         my $output = $startpage;
         if ($is_pdf) {