--- loncom/interface/lonnavdisplay.pm 2016/04/02 04:30:21 1.33 +++ loncom/interface/lonnavdisplay.pm 2022/06/11 04:32:23 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.33 2016/04/02 04:30:21 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.39 2022/06/11 04:32:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ use Apache::lonnet; use Apache::lonlocal; use Apache::londocs(); use Apache::lonuserstate; +use LONCAPA::ltiutils; sub handler { my $r = shift; @@ -55,16 +56,22 @@ sub real_handler { } # Check for critical messages and redirect if present. - my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); + my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents'); if ($redirect) { &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => $url); return REDIRECT; } +# ------------------------------------------------------------ Get query string + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort', + 'showOnlyHomework', + 'postsymb']); # Check if course needs to be re-initialized my $loncaparev = $r->dir_config('lonVersion'); my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); + my %prog_state=(); + my $closure; if ($result eq 'switch') { &Apache::loncommon::content_type($r,'text/html'); @@ -72,10 +79,32 @@ sub real_handler { $r->print(&Apache::loncommon::check_release_result(@reinit)); return OK; } elsif ($result eq 'update') { - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); + my $cid = $env{'request.course.id'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &startpage($r); + my $preamble = '
'. + '
'. + &mt('Your course session is being updated because of recent changes by course personnel.'). + ' '.&mt('Please be patient').'.
'. + '
'; + $closure = < +// + +ENDCLOSE + %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course')); + $r->rflush(); + my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); if ($ferr) { + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->print($closure.&Apache::loncommon::end_page()); my $requrl = $r->uri; $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; $env{'user.reinit'} = 1; @@ -86,52 +115,61 @@ sub real_handler { my $course_type = &Apache::loncommon::course_type(); if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { my $furl = &Apache::lonpageflip::first_accessible_resource(); - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $furl); - return REDIRECT; + if ($result eq 'update') { + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->print($closure.&Apache::loncommon::end_page()); + return OK; + } else { + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $furl); + return REDIRECT; + } + } + + if ($env{'request.lti.login'}) { + if ($env{'request.lti.uri'} ne '') { + my $cid = $env{'request.course.id'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum); + if (($scope eq 'map') || ($scope eq 'resource')) { + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $url); + return REDIRECT; + } + } } # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); if (!defined($navmap)) { + if ($result eq 'update') { + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->print($closure.&Apache::loncommon::end_page()); + } my $requrl = $r->uri; $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; $env{'user.reinit'} = 1; return HTTP_NOT_ACCEPTABLE; } - # Send header, don't cache this page - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - -# ------------------------------------------------------------ Get query string - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']); - -# ----------------------------------------------------- Force menu registration - # Header - my $course_type = &Apache::loncommon::course_type(); - my $title = $course_type . ' Contents'; - my ($start_page,$args); - if ($env{'form.register'}) { - $args = {'force_register' => $env{'form.register'}}; - $start_page = &Apache::loncommon::start_page($title,undef,$args); + if ($result eq 'update') { + $r->rflush(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->print($closure); + $r->rflush(); } else { - my $brcrum = [{href => '/adm/navmaps', - text => &mt($course_type . ' Contents'), - no_mt => 1}, - ]; - $args = {'bread_crumbs' => $brcrum}; - $start_page = &Apache::loncommon::start_page($title,undef,$args); + # Send header, don't cache this page + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &startpage($r); } - $r->print($start_page. - ''); + &startContentScreen($r,'navmaps'); - $r->rflush(); + unless ($result eq 'update') { + $r->rflush(); + } # Check that it's defined if (!($navmap->courseMapDefined())) { @@ -219,10 +257,7 @@ sub real_handler { .""); } } else { - my $link = 'navmaps?jumpToFirstHomework'; - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } + my $link = '/adm/navmaps?jumpToFirstHomework'; unless ($notools) { &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework', 'location.href="'.$link.'"', @@ -242,10 +277,7 @@ sub real_handler { $filterFunc = sub { my $res = shift; return $res->completable() || $res->is_map(); }; - my $link = 'navmaps?sort='.$env{'form.sort'}; - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } + my $link = '/adm/navmaps?sort='.$env{'form.sort'}; &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything', 'location.href="'.$link.'"', 'Show everything'); @@ -254,10 +286,7 @@ sub real_handler { $env{'form.condition'} = 1; $resource_no_folder_link = 1; } else { - my $link = 'navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1'; - if ($env{'form.register'}) { - $link .= '&register='.$env{'form.register'}; - } + my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&showOnlyHomework=1'; unless ($notools) { &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted', 'location.href="'.$link.'"', @@ -279,7 +308,6 @@ sub real_handler { - '); } @@ -316,6 +344,27 @@ sub real_handler { return OK; } +sub startpage { + my ($r) = @_; +# ----------------------------------------------------- Force menu registration + # Header + my $course_type = &Apache::loncommon::course_type(); + my $title = $course_type . ' Contents'; + my $brcrum = [{href => '/adm/navmaps', + text => &mt($course_type . ' Contents'), + no_mt => 1}, + ]; + my $args = {'bread_crumbs' => $brcrum}; + my $start_page = &Apache::loncommon::start_page($title,undef,$args); + $r->print($start_page. + ''); + return; +} + sub startContentScreen { my ($r,$mode)=@_;