--- rat/lonwrapper.pm 2017/05/07 13:58:04 1.61
+++ 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.61 2017/05/07 13:58:04 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.67 2017/12/22 02:01:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,11 +38,13 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);;
+use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title) = @_;
+ my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ $title,$width,$height) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -80,10 +82,46 @@ sub wrapper {
$args->{'only_body'} = $env{'form.only_body'};
}
- my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
+ 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 ='
+'."\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();
+ }
+ }
+
+ my $startpage = &Apache::loncommon::start_page('Menu',undef,$args).$countdown;
my $endpage = &Apache::loncommon::end_page();
-
- if (($env{'browser.mobile'}) || ($exttool eq 'window')) {
+
+ if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
my $output = $startpage;
if ($is_pdf) {
if ($title eq '') {
@@ -99,20 +137,54 @@ sub wrapper {
$output .= $title.'
';
}
$output .= ''.&mt('Link to PDF (for mobile devices)').'';
- } elsif ($exttool eq 'window') {
+ } elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
if ($linktext eq '') {
$linktext = &mt('Launch External Tool');
}
- $output .= '