--- rat/lonpageflip.pm 2018/09/10 19:17:39 1.80.8.10
+++ rat/lonpageflip.pm 2016/05/30 02:52:42 1.91
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.80.8.10 2018/09/10 19:17:39 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.91 2016/05/30 02:52:42 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,26 +256,27 @@ sub first_accessible_resource {
}
}
-sub reinited_js {
- my ($url,$cid,$timeout) = @_;
- if (!$timeout) {
- $timeout = 0;
- }
- return <<"END";
-
-END
}
# ================================================================ Main Handler
@@ -293,7 +295,6 @@ sub handler {
my %cachehash=();
my $multichoice=0;
my %multichoicehash=();
- my %prog_state=();
my ($redirecturl,$redirectsymb,$enc,$anchor);
my $next='';
my @possibilities=();
@@ -313,6 +314,17 @@ sub handler {
$last=$hash{'last_known'};
untie(%hash);
}
+ } elsif ($direction eq 'firstanswerable') {
+ my $furl = &first_answerable_ressymb();
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location =>
+ &Apache::lonnet::absolute_url().$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
@@ -334,20 +346,8 @@ sub handler {
untie(%hash);
}
}
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- $r->print(&Apache::loncommon::start_page('Content Changed'));
- my $preamble = '
'.
- '
'.
- &mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&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'));
if ($ferr) {
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
my $requrl = $r->uri;
$env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
$env{'user.reinit'} = 1;
@@ -364,17 +364,11 @@ sub handler {
}
if ($direction eq 'firstres') {
my $furl=&first_accessible_resource();
- $furl=&Apache::lonnet::absolute_url().$furl;
- if ($reinitcheck eq 'update') {
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->print(&reinited_js($furl,$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 => $furl);
- return REDIRECT;
- }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location =>
+ &Apache::lonnet::absolute_url().$furl);
+
+ return REDIRECT;
}
if ($direction eq 'return') {
# -------------------------------------------------------- Return to last known
@@ -393,16 +387,11 @@ sub handler {
} else {
$newloc='/adm/navmaps';
}
- $newloc=&Apache::lonnet::absolute_url().$newloc;
- if ($reinitcheck eq 'update') {
- $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);
- return REDIRECT;
- }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location =>
+ &Apache::lonnet::absolute_url().$newloc);
+
+ return REDIRECT;
}
#
# Is the current URL on the map? If not, start with last known URL
@@ -416,21 +405,15 @@ 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';
- 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);
- return REDIRECT;
- }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location =>
+ &Apache::lonnet::absolute_url().
+ '/adm/navmaps');
+ return REDIRECT;
}
}
# ------------------------------------------- Do we have any idea where we are?
@@ -522,16 +505,9 @@ sub handler {
$url .= $anchor;
}
}
- if ($reinitcheck eq 'update') {
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->print(&reinited_js($url,$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 => $url);
- return REDIRECT;
- }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $url);
+ return REDIRECT;
} else {
# --------------------------------------------------------- There was a problem
&Apache::loncommon::content_type($r,'text/html');
@@ -549,7 +525,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');
}
@@ -590,23 +567,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());
@@ -614,23 +605,12 @@ ENDSTART
}
} else {
# ------------------------------------------------- Problem, could not tie hash
- 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;
}
} else {
# ---------------------------------------- No, could not determine where we are
- my $newloc = '/adm/ambiguous';
- 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());
- } else {
- $r->internal_redirect($newloc);
- }
+ $r->internal_redirect('/adm/ambiguous');
return OK;
}
} else {