--- loncom/homework/lonhomework.pm 2016/05/30 02:45:32 1.362
+++ loncom/homework/lonhomework.pm 2018/08/14 18:24:04 1.372
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.362 2016/05/30 02:45:32 raeburn Exp $
+# $Id: lonhomework.pm,v 1.372 2018/08/14 18:24:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,13 +53,17 @@ use Apache::loncapamath();
use Apache::Constants qw(:common);
use Apache::loncommon();
use Apache::lonparmset();
+use Apache::lonnavmaps();
use Apache::lonlocal;
+use LONCAPA qw(:DEFAULT :match);
+use LONCAPA::ltiutils();
use Time::HiRes qw( gettimeofday tv_interval );
use HTML::Entities();
use File::Copy();
# FIXME - improve commenting
+my $registered_cleanup;
BEGIN {
&Apache::lonxml::register_insert();
@@ -190,7 +194,7 @@ sub proctor_checked_in {
if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.0.version'};
$key ="resource.$version.0.checkedin";
- } elsif ($type eq 'problem') {
+ } elsif (($type eq 'problem') || ($type eq 'tool')) {
$key ='resource.0.checkedin';
}
# backward compatability, used to be username@domain,
@@ -205,16 +209,15 @@ sub proctor_checked_in {
return 1;
}
}
-
return 0;
}
sub check_slot_access {
- my ($id,$type,$symb)=@_;
+ my ($id,$type,$symb,$partlist)=@_;
# does it pass normal muster
my ($status,$datemsg)=&check_access($id,$symb);
-
+
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
if ($useslots ne 'resource' && $useslots ne 'map'
&& $useslots ne 'map_map') {
@@ -228,13 +231,15 @@ sub check_slot_access {
$checkin = "resource.$version.0.checkedin";
}
my $checkedin = $Apache::lonhomework::history{$checkin};
- my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip);
+ my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip,
+ $consumed_uniq);
$now = time;
- $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+ $ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'};
if ($checkedin) {
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
my %slot=&Apache::lonnet::get_slot($checkinslot);
+ $consumed_uniq = $slot{'uniqueperiod'};
if ($slot{'iptied'}) {
$ipused = $Apache::lonhomework::history{"$checkin.ip"};
unless (($ip ne '') && ($ipused eq $ip)) {
@@ -251,7 +256,7 @@ sub check_slot_access {
} else {
return ($status,$datemsg);
}
- }
+ }
if ($status eq 'CLOSED' ||
$status eq 'INVALID_ACCESS' ||
@@ -261,7 +266,7 @@ sub check_slot_access {
if ($env{'request.state'} eq "construct") {
return ($status,$datemsg);
}
-
+
if ($type eq 'Task') {
if ($checkedin &&
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
@@ -348,10 +353,49 @@ sub check_slot_access {
$is_correct =
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
- } elsif ($type eq 'problem') {
- $got_grade = 1;
- $is_correct =
- ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+ } elsif (($type eq 'problem') || ($type eq 'tool')) {
+ if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
+ my ($numcorrect,$numgraded) = (0,0);
+ foreach my $part (@{$partlist}) {
+ my $currtries = $Apache::lonhomework::history{"resource.$part.tries"};
+ my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb);
+ my $probstatus = &Apache::structuretags::get_problem_status($part);
+ my $earlyout;
+ unless (($probstatus eq 'no') ||
+ ($probstatus eq 'no_feedback_ever')) {
+ if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) {
+ $numcorrect ++;
+ } else {
+ $earlyout = 1;
+ }
+ }
+ if (($currtries == $maxtries) || ($is_correct)) {
+ $earlyout = 1;
+ } else {
+ $numgraded ++;
+ }
+ last if ($earlyout);
+ }
+ my $numparts = scalar(@{$partlist});
+ if ($numparts == $numcorrect) {
+ $is_correct = 1;
+ }
+ if ($numparts == $numgraded) {
+ $got_grade = 1;
+ }
+ } else {
+ my $currtries = $Apache::lonhomework::history{"resource.0.tries"};
+ my $maxtries = &Apache::lonnet::EXT("resource.0.maxtries",$symb);
+ my $probstatus = &Apache::structuretags::get_problem_status('0');
+ unless (($probstatus eq 'no') ||
+ ($probstatus eq 'no_feedback_ever')) {
+ $is_correct =
+ ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+ }
+ unless (($currtries == $maxtries) || ($is_correct)) {
+ $got_grade = 1;
+ }
+ }
}
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
@@ -369,34 +413,12 @@ sub check_slot_access {
# used to gain access to it to work on it, until the due date is reached, and the
# problem then becomes CLOSED. Therefore return the slotstatus -
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE).
- if (!defined($slot_name) && $type eq 'problem') {
+
+ if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) {
if ($slotstatus eq 'NOT_IN_A_SLOT') {
if (!$num_usable_slots) {
- if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- unless ($symb) {
- ($symb)=&Apache::lonnet::whichuser();
- }
- $slotstatus = 'NOTRESERVABLE';
- my ($reservable_now_order,$reservable_now,$reservable_future_order,
- $reservable_future) =
- &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
- if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
- if (@{$reservable_now_order} > 0) {
- $slotstatus = 'RESERVABLE';
- $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
- }
- }
- unless ($slotstatus eq 'RESERVABLE') {
- if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
- if (@{$reservable_future_order} > 0) {
- $slotstatus = 'RESERVABLE_LATER';
- $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
- }
- }
- }
- }
+ ($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin,
+ $consumed_uniq);
}
}
return ($slotstatus,$datemsg);
@@ -418,7 +440,7 @@ sub check_slot_access {
}
if (($is_correct) && ($blockip ne 'answer')) {
- if ($type eq 'problem') {
+ if (($type eq 'problem') || ($type eq 'tool')) {
return ($status);
}
return ('SHOW_ANSWER');
@@ -432,6 +454,81 @@ sub check_slot_access {
return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
}
+sub check_reservable_slot {
+ my ($slotstatus,$symb,$now,$checkedin,$consumed_uniq) = @_;
+ my $datemsg;
+ if ($slotstatus eq 'NOT_IN_A_SLOT') {
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ unless ($symb) {
+ ($symb)=&Apache::lonnet::whichuser();
+ }
+ $slotstatus = 'NOTRESERVABLE';
+ my ($reservable_now_order,$reservable_now,$reservable_future_order,
+ $reservable_future) =
+ &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
+ if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
+ if (@{$reservable_now_order} > 0) {
+ if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+ $slotstatus = 'RESERVABLE';
+ $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
+ } else {
+ my ($uniqstart,$uniqend,$useslot);
+ if (ref($consumed_uniq) eq 'ARRAY') {
+ ($uniqstart,$uniqend)=@{$consumed_uniq};
+ }
+ foreach my $slot (reverse(@{$reservable_now_order})) {
+ if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
+ my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+ next if (!
+ ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+ ($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
+ }
+ $useslot = $slot;
+ last;
+ }
+ if ($useslot) {
+ $slotstatus = 'RESERVABLE';
+ $datemsg = $reservable_now->{$useslot}{'endreserve'};
+ }
+ }
+ }
+ }
+ unless ($slotstatus eq 'RESERVABLE') {
+ if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
+ if (@{$reservable_future_order} > 0) {
+ if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+ $slotstatus = 'RESERVABLE_LATER';
+ $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
+ } else {
+ my ($uniqstart,$uniqend,$useslot);
+ if (ref($consumed_uniq) eq 'ARRAY') {
+ ($uniqstart,$uniqend)=@{$consumed_uniq};
+ }
+ foreach my $slot (@{$reservable_future_order}) {
+ if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+ my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+ next if (!
+ ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+ ($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
+ }
+ $useslot = $slot;
+ last;
+ }
+ if ($useslot) {
+ $slotstatus = 'RESERVABLE_LATER';
+ $datemsg = $reservable_future->{$useslot}{'startreserve'};
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return ($slotstatus,$datemsg);
+}
+
# JB, 9/24/2002: Any changes in this function may require a change
# in lonnavmaps::resource::getDateStatus.
sub check_access {
@@ -1348,18 +1445,39 @@ sub get_template_html {
sub newproblem {
my ($request) = @_;
- if ($env{'form.mode'} eq 'blank'){
+ if ($env{'form.mode'} eq 'blank'){
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- &File::Copy::copy('/home/httpd/html/res/adm/includes/templates/blank.problem',$dest);
+ my $templatefilename =
+ $request->dir_config('lonIncludes').'/templates/blank.problem';
+ &File::Copy::copy($templatefilename,$dest);
&renderpage($request,$dest);
return;
}
+ my $errormsg;
if ($env{'form.template'}) {
- my $file = $env{'form.template'};
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- &File::Copy::copy($file,$dest);
- &renderpage($request,$dest);
- return;
+ my $file;
+ my ($extension) = ($env{'form.template'} =~ /\.(\w+)$/);
+ if ($extension) {
+ my @files = &get_template_list($extension);
+ foreach my $poss (@files) {
+ if (ref($poss) eq 'ARRAY') {
+ if ($env{'form.template'} eq $poss->[0]) {
+ $file = $env{'form.template'};
+ last;
+ }
+ }
+ }
+ if ($file) {
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ &File::Copy::copy($file,$dest);
+ &renderpage($request,$dest);
+ return;
+ } else {
+ $errormsg = ''.&mt('Invalid template file.').'
';
+ }
+ } else {
+ $errormsg = ''.&mt('Invalid template file; template needs to be a .problem, .library, or .task file.').'
';
+ }
}
my ($extension) = ($request->uri =~ m/\.(\w+)$/);
@@ -1376,7 +1494,6 @@ sub newproblem {
} else {
my $url=&HTML::Entities::encode($request->uri,'<>&"');
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- my $errormsg;
my $instructions;
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
'text' => 'Authoring Space'},
@@ -1558,7 +1675,15 @@ sub handler {
}
# just render the page normally outside of construction space
&Apache::lonxml::debug("not construct");
+ undef(@Apache::lonhomework::ltipassback);
&renderpage($request,$file,undef,undef,$donemsg);
+ if (@Apache::lonhomework::ltipassback) {
+ unless ($registered_cleanup) {
+ my $handlers = $request->get_handlers('PerlCleanupHandler');
+ $request->set_handlers('PerlCleanupHandler' =>
+ [\&do_ltipassback,@{$handlers}]);
+ }
+ }
}
#my $td=&tv_interval($t0);
#&Apache::lonxml::debug("Spent $td seconds processing");
@@ -1704,16 +1829,15 @@ sub default_xml_tag {
sub helpmenu_datastructure {
- my $width = 500;
- my $height = 600;
-
+ # filename, title, width, height
my $helpers = [
- ['Problem_LON-CAPA_Functions', &mt('Script Functions')],
- ['Greek_Symbols', &mt('Greek Symbols')],
- ['Other_Symbols', &mt('Other Symbols')],
- ['Authoring_Output_Tags', &mt('Output Tags')],
- ['Authoring_Multilingual_Problems',
- &mt('How to create problems in different languages')]
+ ['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
+ ['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],
+ ['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],
+ ['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],
+ ['Authoring_Multilingual_Problems.hlp',
+ &mt('How to create problems in different languages'), 800, 600],
+ ['loncapa.html', &mt('Language reference'), 800, 600],
];
my $help_structure = [];
@@ -1721,7 +1845,15 @@ sub helpmenu_datastructure {
foreach my $count (0..(scalar(@{$helpers})-1)) {
my $filename = $helpers->[$count]->[0];
my $title = $helpers->[$count]->[1];
- my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
+ my $width = $helpers->[$count]->[2];
+ my $height = $helpers->[$count]->[3];
+ if ($width eq '') {
+ $width = 500;
+ }
+ if ($height eq '') {
+ $height = 600;
+ }
+ my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
push @{$help_structure}, [$href, $title, undef];
}
@@ -1739,5 +1871,81 @@ sub convert_for_js {
return $return;
}
+sub do_ltipassback {
+ if (@Apache::lonhomework::ltipassback) {
+ foreach my $item (@Apache::lonhomework::ltipassback) {
+ if (ref($item) eq 'HASH') {
+ if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) {
+ my ($cdom,$cnum) = ($1,$2);
+ my $ckey = $item->{'lti'}->{'key'};
+ my $secret = $item->{'lti'}->{'secret'};
+ my $id = $item->{'pbid'};
+ my $url = $item->{'pburl'};
+ my $scope = $item->{'scope'};
+ my $map = $item->{'ltimap'};
+ my $symb = $item->{'ltisymb'};
+ my $uname = $item->{'uname'};
+ my $udom = $item->{'udom'};
+ my $scoretype = $item->{'format'};
+ my ($total,$possible);
+ if ($scope eq 'resource') {
+ $total = $item->{'total'};
+ $possible = $item->{'possible'};
+ } elsif ($scope eq 'map') {
+ ($total,$possible) = &get_lti_score($uname,$udom,$map);
+ } elsif ($scope eq 'course') {
+ ($total,$possible) = &get_lti_score($uname,$udom);
+ }
+ if (($ckey ne '') && ($secret ne '') && ($id ne '') && ($url ne '') && ($possible)) {
+ &LONCAPA::ltiutils::send_grade($id,$url,$ckey,$secret,$scoretype,$total,$possible);
+ }
+ }
+ }
+ }
+ undef(@Apache::lonhomework::ltipassback);
+ }
+}
+
+sub get_lti_score {
+ my ($uname,$udom,$mapurl) = @_;
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+ if (ref($navmap)) {
+ my $iterator;
+ if ($mapurl ne '') {
+ my $map = $navmap->getResourceByUrl($mapurl);
+ my $firstres = $map->map_start();
+ my $finishres = $map->map_finish();
+ $iterator = $navmap->getIterator($firstres,$finishres,undef,1);
+ } else {
+ $iterator = $navmap->getIterator(undef,undef,undef,1);
+ }
+ if (ref($iterator)) {
+ my $depth = 1;
+ my $total = 0;
+ my $possible = 0;
+ $iterator->next(); # ignore first BEGIN_MAP
+ my $curRes = $iterator->next();
+ while ( $depth > 0 ) {
+ if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
+ if ($curRes == $iterator->END_MAP()) { $depth--; }
+ if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout) {
+ my $parts = $curRes->parts();
+ foreach my $part (@{$parts}) {
+ next if ($curRes->solved($part) eq 'excused');
+ $total += $curRes->weight($part) * $curRes->awarded($part);
+ $possible += $curRes->weight($part);
+ }
+ }
+ $curRes = $iterator->next();
+ }
+ if ($total > $possible) {
+ $total = $possible;
+ }
+ return ($total,$possible);
+ }
+ }
+ return;
+}
+
1;
__END__