--- loncom/interface/lonexttool.pm 2017/12/30 14:03:53 1.14
+++ loncom/interface/lonexttool.pm 2018/01/01 01:29:38 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Launch External Tool Provider (LTI)
#
-# $Id: lonexttool.pm,v 1.14 2017/12/30 14:03:53 raeburn Exp $
+# $Id: lonexttool.pm,v 1.16 2018/01/01 01:29:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -110,10 +110,9 @@ sub handler {
width => $toolsettings{'width'},
height => $toolsettings{'height'},
};
- $toolhash{'crslabel'} = $toolsettings{'crslabel'};
- $toolhash{'crstitle'} = $toolsettings{'crstitle'};
- $toolhash{'crsappend'} = $toolsettings{'crsappend'};
- $toolhash{'gradable'} = $toolsettings{'gradable'};
+ foreach my $item (qw(crslabel crstitle crsappend gradable incdom)) {
+ $toolhash{$item} = $toolsettings{$item};
+ }
$is_tool = 1;
}
}
@@ -127,10 +126,16 @@ sub handler {
return OK;
}
- my ($status,$open,$close,$msg,$donebuttonresult,$donemsg);
+ my ($symb,$status,$open,$close,$msg,$donebuttonresult,$donemsg);
+ if (($target eq 'tex') || ($toolhash{'gradable'})) {
+ ($symb) = &Apache::lonnet::whichuser();
+ }
+ if ($target eq 'tex') {
+ my $title = &Apache::lonnet::gettitle($symb);
+ $r->print(&mt('External Tool: [_1]','\textit{'.$title.'}').'\\\\');
+ }
if ($toolhash{'gradable'}) {
$Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$r->uri);
- my ($symb) = &Apache::lonnet::whichuser();
if ($env{'form.markaccess'}) {
my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
my ($timelimit) = split(/_/,$interval[0]);
@@ -142,20 +147,27 @@ sub handler {
undef($env{'form.LC_interval_done'});
undef($env{'form.LC_interval_done_proctorpass'});
}
- ($status,$msg) = &gradabletool_access_check();
+ ($status,$msg) = &gradabletool_access_check($target);
undef($Apache::lonhomework::browse);
if ($status eq 'SHOW_ANSWER') {
- $r->print(&display_score());
+ $r->print(&display_score($target));
+ if ($target eq 'tex') {
+ $r->print('\end{document}');
+ }
return OK;
} elsif ($status ne 'CAN_ANSWER') {
- $r->print($msg);
+ if ($target eq 'tex') {
+ $r->print('\end{document}');
+ } else {
+ $r->print($msg);
+ }
return OK;
}
} else {
my ($status,$open,$close,$msg)=&Apache::londatecheck::content_date_check();
if ($status ne 'OPEN') {
if ($target eq 'tex') {
- $r->print(&mt('Not open to be viewed'));
+ $r->print(&mt('Not open to be viewed').'\end{document}');
} else {
$r->print($msg);
}
@@ -164,7 +176,7 @@ sub handler {
($status,$msg)=&Apache::lonipcheck::ip_access_check();
if ($status ne 'OPEN') {
if ($target eq 'tex') {
- $r->print(&mt('Not open to be viewed'));
+ $r->print(&mt('Not open to be viewed').'\end{document}');
} else {
$r->print($msg);
}
@@ -174,7 +186,7 @@ sub handler {
}
my $launchok = 1;
if ($target eq 'tex') {
- $r->print(&mt('External Tool'));
+ $r->print('\end{document}');
} else {
my $now = time;
if ($toolhash{'passback'}) {
@@ -212,7 +224,7 @@ sub lti_params {
my ($r,$cnum,$cdom,$idx,$submittext,$toolsref) = @_;
my ($version,$context_type,$msgtype,$toolname,$passback,$roster,$locale,
$crslabel,$crstitle,$gradesecret,$rostersecret,%fields,%rolesmap,
- %display,%custom,@userlangs);
+ %display,%custom,@userlangs,$incdom);
if (ref($toolsref) eq 'HASH') {
$version = $toolsref->{'version'};
$toolname = $toolsref->{'title'};
@@ -221,6 +233,7 @@ sub lti_params {
$roster = $toolsref->{'roster'};
$rostersecret = $toolsref->{'rostersecret'};
$msgtype = $toolsref->{'messagetype'};
+ $incdom = $toolsref->{'incdom'};
if (ref($toolsref->{'fields'}) eq 'HASH') {
%fields = %{$toolsref->{'fields'}};
}
@@ -390,7 +403,11 @@ sub lti_params {
$ltiparams{'lis_person_contact_email_primary'} = $contact_email;
}
if ($fields{'user'}) {
- $ltiparams{'lis_person_sourcedid'} = $uname.':'.$udom;
+ if ($incdom) {
+ $ltiparams{'lis_person_sourcedid'} = $uname.':'.$udom;
+ } else {
+ $ltiparams{'lis_person_sourcedid'} = $uname;
+ }
}
if (keys(%custom)) {
foreach my $key (keys(%custom)) {
@@ -448,11 +465,14 @@ ENDJS
}
sub gradabletool_access_check {
+ my ($target) = @_;
my ($result,$resource_due);
my $status;
my ($symb,$courseid,$udom,$uname) = &Apache::lonnet::whichuser();
my @targets;
- if (defined($env{'form.submitted'}) && defined($env{'form.validate'})) {
+ if ($target) {
+ @targets = ($target);
+ } elsif (defined($env{'form.submitted'}) && defined($env{'form.validate'})) {
@targets = ('grade','web');
} else {
@targets = ('web');
@@ -497,30 +517,42 @@ sub gradabletool_access_check {
}
sub display_score {
+ my ($target) = @_;
my $weight = &Apache::lonnet::EXT('resource.0.weight');
if ((!defined($weight)) || ($weight eq '')) { $weight=1; }
my $awarded = $Apache::lonhomework::history{'resource.0.awarded'};
if (!defined($awarded)) { $awarded=0; }
my $display='';
+ if ($target eq 'tex') {
+ $display = '\\\\';
+ }
if (!defined($awarded)) {
- $display = &mt('[_1] possible points.',$weight);
+ $display .= &mt('[_1] possible points.',$weight);
} else {
my $points = $awarded*$weight;
my $result = sprintf('%.2f',$points);
- $display = &mt('You have [_1] out of [quant,_2,possible point]',
+ $display .= &mt('You have [_1] out of [quant,_2,possible point]',
$result,$weight);
}
my $comment = $Apache::lonhomework::history{'resource.0.comment'};
if (!defined($comment) || $comment!~/\w/) {
$comment='';
} else {
- $comment='
';
+ if ($target eq 'tex') {
+ $comment = '\\\\'.$comment;
+ } else {
+ $comment='
';
+ }
}
my $gradeinfo = $Apache::lonhomework::history{'resource.0.gradeinfo'};
if (!defined($gradeinfo) || $gradeinfo!~/\w/) {
$gradeinfo='';
} else {
- $gradeinfo='
';
+ if ($target eq 'tex') {
+ $gradeinfo = '\\\\'.$gradeinfo;
+ } else {
+ $gradeinfo='
';
+ }
}
return $display.$comment.$gradeinfo;
}