--- rat/lonpageflip.pm 2021/03/04 13:56:51 1.80.8.11.2.2
+++ rat/lonpageflip.pm 2017/11/16 13:42:01 1.97
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.80.8.11.2.2 2021/03/04 13:56:51 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.97 2017/11/16 13:42:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use LONCAPA;
use Apache::Constants qw(:common :http REDIRECT);
use Apache::lonnet;
use Apache::loncommon();
+use Apache::lonnavmaps();
use Apache::lonuserstate;
use Apache::lonlocal;
use HTML::TokeParser;
@@ -255,6 +256,29 @@ sub first_accessible_resource {
}
}
+sub first_answerable_ressymb {
+ my $navmap = Apache::lonnavmaps::navmap->new;
+ return unless (ref($navmap));
+ my $iterator = $navmap->getIterator(undef,undef,undef,1);
+ return unless (ref($iterator));
+ my ($curRes,$result);
+ while ($curRes = $iterator->next()) {
+ if (ref($curRes) && $curRes->is_problem()) {
+ foreach my $part (@{$curRes->parts()}) {
+ if ($curRes->tries($part) < $curRes->maxtries($part)) {
+ $result = $curRes->link().'?symb='.$curRes->shown_symb();
+ last;
+ }
+ }
+ }
+ }
+ if ($result) {
+ return $result;
+ } else {
+ return &first_accessible_resource();
+ }
+}
+
sub check_http_req {
my ($srcref) = @_;
return unless (ref($srcref) eq 'SCALAR');
@@ -265,17 +289,11 @@ sub check_http_req {
if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
($ENV{'SERVER_PORT'} == 443) &&
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
- unless (&Apache::lonnet::uses_sts()) {
- $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
- $usehttp = 1;
- }
+ $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
+ $usehttp = 1;
} elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) &&
($ENV{'SERVER_PORT'} == 443)) {
- unless (&Apache::lonnet::uses_sts()) {
- my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
- $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor;
- $usehttp = 1;
- }
+ $usehttp = 1;
}
}
return $usehttp;
@@ -319,7 +337,7 @@ sub handler {
my %cachehash=();
my $multichoice=0;
my %multichoicehash=();
- my %prog_state=();
+ my %prog_state=();
my ($redirecturl,$redirectsymb,$enc,$anchor);
my $next='';
my $hostname = $r->hostname();
@@ -340,6 +358,22 @@ sub handler {
$last=$hash{'last_known'};
untie(%hash);
}
+ } elsif ($direction eq 'firstanswerable') {
+ my $furl = &first_answerable_ressymb();
+ my $usehttp = &check_http_req(\$furl);
+ if (($usehttp) && ($hostname ne '')) {
+ $furl='http://'.$hostname.$furl;
+ } else {
+ $furl=&Apache::lonnet::absolute_url().$furl;
+ }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $furl);
+ return REDIRECT;
+ } elsif ($direction eq 'endplacement') {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ $r->print(&Apache::lonplacementtest::showresult());
+ return OK;
}
if ($env{'request.course.id'}) {
# Check if course needs to be re-initialized
@@ -367,12 +401,12 @@ sub handler {
my $preamble = ''.
'
'.
&mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&mt('Please be patient').'.
'.
+ ' '.&mt('Please be patient.').'
'.
'';
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
- &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
if ($ferr) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
my $requrl = $r->uri;
@@ -408,7 +442,7 @@ sub handler {
return REDIRECT;
}
}
- if ($direction eq 'return') {
+ if ($direction eq 'return') {
# -------------------------------------------------------- Return to last known
my ($newloc,$usehttp);
if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
@@ -418,14 +452,10 @@ sub handler {
$newloc=$hash{'src_'.$id};
if ($newloc) {
$usehttp = &check_http_req(\$newloc);
- if ($hash{'encrypted_'.$id}) {
+ if ($hash{'encrypted_'.$id}) {
$newloc=&Apache::lonenc::encrypted($newloc);
- }
- if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) {
- my ($url,$anchor) = ($1,$2);
- if ($anchor) {
- $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor;
- }
+ } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) {
+ $newloc = $1.&escape('#').$2;
}
} else {
$newloc='/adm/navmaps';
@@ -444,9 +474,9 @@ sub handler {
$r->print(&Apache::loncommon::end_page());
return OK;
} else {
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location => $newloc);
- return REDIRECT;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $newloc);
+ return REDIRECT;
}
}
#
@@ -461,19 +491,20 @@ sub handler {
$last=$hash{'last_known'};
untie(%hash);
}
+ my $newloc;
if ($last) {
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
} else {
my $newloc = &Apache::lonnet::absolute_url().
- '/adm/navmaps';
+ '/adm/navmaps';
if ($reinitcheck eq 'update') {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print(&reinited_js($newloc,$env{'request.course.id'},100));
$r->print(&Apache::loncommon::end_page());
return OK;
} else {
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location => $newloc);
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $newloc);
return REDIRECT;
}
}
@@ -574,7 +605,7 @@ sub handler {
}
if ($reinitcheck eq 'update') {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->print(&reinited_js($url,$env{'request.course.id'},100));
+ $r->print(&reinited_js($url,$env{'request.course.id'},100));
$r->print(&Apache::loncommon::end_page());
return OK;
} else {
@@ -599,7 +630,8 @@ sub handler {
'type' => 'Type',
'update' => 'Content updated',
'expupdate' => 'As a result of a recent update to the sequence of materials, it is not possible to complete the page flip.',
- 'gonav' => 'Go to the Contents page to select a resource to display.');
+ 'gonav' => 'Go to the Contents page to select a resource to display.',
+ );
if (&Apache::loncommon::course_type() eq 'Community') {
$lt{'nav'} = &mt('Community Contents');
}
@@ -645,23 +677,37 @@ ENDSTART
.''.$lt{'expupdate'}.'
'
.$lt{'gonav'}.'
');
} else {
- $r->print(
- &Apache::loncommon::start_page('No Resource')
- .''.$lt{'title'}.'
'
- .''.$lt{'explain'}.'
');
+ if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+ (!$env{'request.role.adv'})) {
+ my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
+ if ($incomplete) {
+ $r->print(&Apache::lonplacementtest::showincomplete($incomplete));
+ } else {
+ $r->print(&Apache::lonplacementtest::showresult(1));
+ }
+ } else {
+ $r->print(
+ &Apache::loncommon::start_page('No Resource')
+ .''.$lt{'title'}.'
'
+ .''.$lt{'explain'}.'
');
+ }
}
}
- if ((!@possibilities) && ($reinitcheck)) {
- $r->print(
- &Apache::lonhtmlcommon::actionbox(
- [''.$lt{'nav'}.''
- ]));
- } else {
- $r->print(
- &Apache::lonhtmlcommon::actionbox(
- [''.$lt{'back'}.'',
- ''.$lt{'nav'}.''
- ]));
+ unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') ||
+ ($env{'request.role.adv'})) {
+ if ((!@possibilities) && ($reinitcheck)) {
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ [''.$lt{'nav'}.''
+ ]));
+ } else {
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ [''.$lt{'back'}.'',
+ ''.$lt{'nav'}.''
+ ]));
+ }
+
}
$r->print(&Apache::loncommon::end_page());
@@ -672,7 +718,7 @@ ENDSTART
if ($reinitcheck eq 'update') {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print(&Apache::loncommon::end_page());
- }
+ }
$env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing";
return HTTP_NOT_ACCEPTABLE;
}