--- loncom/interface/lonnavdisplay.pm 2007/04/20 01:54:29 1.2 +++ loncom/interface/lonnavdisplay.pm 2017/06/26 01:56:58 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Navigate Maps Handler +# Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.2 2007/04/20 01:54:29 albertel Exp $ +# $Id: lonnavdisplay.pm,v 1.34 2017/06/26 01:56:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,14 +30,15 @@ package Apache::lonnavdisplay; use strict; -use Apache::Constants qw(:common :http); +use Apache::Constants qw(:common :http REDIRECT); use Apache::lonmenu(); use Apache::loncommon(); use Apache::lonnavmaps(); use Apache::lonhtmlcommon(); use Apache::lonnet; use Apache::lonlocal; -use Time::HiRes qw( gettimeofday tv_interval ); +use Apache::londocs(); +use Apache::lonuserstate; sub handler { my $r = shift; @@ -46,85 +47,48 @@ sub handler { sub real_handler { my $r = shift; - #my $t0=[&gettimeofday()]; # Handle header-only request if ($r->header_only) { - if ($env{'browser.mathml'}) { - &Apache::loncommon::content_type($r,'text/xml'); - } else { - &Apache::loncommon::content_type($r,'text/html'); - } + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } - # Send header, don't cache this page - if ($env{'browser.mathml'}) { - &Apache::loncommon::content_type($r,'text/xml'); - } else { + # Check for critical messages and redirect if present. + 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; } - &Apache::loncommon::no_cache($r); - my %toplinkitems=(); - &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','', - "Select Action"); - if ($ENV{QUERY_STRING} eq 'collapseExternal') { - &Apache::lonnet::put('environment',{'remotenavmap' => 'off'}); - &Apache::lonnet::appenv('environment.remotenavmap' => 'off'); - my $menu=&Apache::lonmenu::reopenmenu(); - my $navstatus=&Apache::lonmenu::get_nav_status(); - if ($menu) { - $menu=(<send_http_header; - my $js =<<"ENDSUBM"; - -ENDSUBM - $r->print(&Apache::loncommon::start_page(undef,$js, - {'only_body' => 1, - 'bgcolor' => '#FFFFFF', - 'add_entries' => - {'onload' => - "submitthis()"}}). - &Apache::loncommon::end_page()); + # Check if course needs to be re-initialized + my $loncaparev = $r->dir_config('lonVersion'); + my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); + if ($result eq 'switch') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $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"); + if ($ferr) { + my $requrl = $r->uri; + $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; + $env{'user.reinit'} = 1; + return HTTP_NOT_ACCEPTABLE; + } } - if ($ENV{QUERY_STRING} =~ /^launchExternal/) { - &Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); - &Apache::lonnet::appenv('environment.remotenavmap' => 'on'); - my $menu=&Apache::lonmenu::reopenmenu(); - my $navstatus=&Apache::lonmenu::get_nav_status(); - if ($menu) { - $r->print(< - swmenu=$menu - swmenu.clearTimeout(swmenu.menucltim); - $navstatus - -MENU - } - } - if ($ENV{QUERY_STRING} eq 'turningOffExternal') { - $env{'environment.remotenavmap'}='off'; + + 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; } # Create the nav map @@ -133,35 +97,40 @@ MENU if (!defined($navmap)) { 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'},['register','sort','showOnlyHomework','postsymb']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']); # ----------------------------------------------------- Force menu registration - my $body_only=''; - my $js; - if ($env{'environment.remotenavmap'} eq 'on') { - $js=''; - $body_only=1; - } - # Header my $course_type = &Apache::loncommon::course_type(); - $r->print(&Apache::loncommon::start_page('Navigate '.$course_type. - ' Contents', - $js, - {'only_body' => $body_only, - 'force_register' => - $env{'form.register'},})); - $r->print(''); - + 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); + } 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); + } + $r->print($start_page. + ''); + &startContentScreen($r,'navmaps'); $r->rflush(); # Check that it's defined @@ -173,21 +142,32 @@ MENU return OK; } - # See if there's only one map in the top-level, if we don't - # already have a filter... if so, automatically display it - # (older code; should use retrieveResources) - if ($ENV{QUERY_STRING} !~ /filter/) { - my $iterator = $navmap->getIterator(undef, undef, undef, 0); - my $curRes; - my $sequenceCount = 0; - my $sequenceId; - while ($curRes = $iterator->next()) { - if (ref($curRes) && $curRes->is_sequence()) { + my %toplinkitems=(); + my @resources = $navmap->retrieveResources(); + my $sequenceCount = 0; + my $problemCount = 0; + my $notaprobCount = 0; + my $sequenceId; + my $notools; + foreach my $curRes (@resources) { + if (ref($curRes)) { + if ($curRes->is_sequence()) { $sequenceCount++; $sequenceId = $curRes->map_pc(); + } elsif ($curRes->is_problem()) { + $problemCount ++; + } else { + $notaprobCount ++; } } - + } + if (($sequenceCount == 1) && (!$problemCount) && ($notaprobCount <= 1)) { + $notools = 1; + } + + # If there's only one map in the top-level and we don't + # already have a filter, automatically display it + if ($ENV{QUERY_STRING} !~ /filter/) { if ($sequenceCount == 1) { # The automatic iterator creation in the render call # will pick this up. We know the condition because @@ -197,27 +177,6 @@ MENU } } - if ($ENV{QUERY_STRING} eq 'launchExternal') { - $r->print(' -
-
'); - $r->print(' - '); - } - - if ($env{'environment.remotenavmap'} ne 'on') { - $r->print(&launch_win('link','yes',\%toplinkitems)); - } - if ($env{'environment.remotenavmap'} eq 'on') { - &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'closenav', - 'collapse()', - "Close navigation window"); - } - - # Check to see if the student is jumping to next open, do-able problem if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) { # Find the next homework problem that they can do. @@ -255,12 +214,20 @@ MENU # If we found no problems, print a note to that effect. if (!$foundDoableProblem) { - $r->print("All homework assignments have been completed.

"); + $r->print("" + .&mt("All homework assignments have been completed.") + .""); } } else { - &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework', - 'location.href="navmaps?jumpToFirstHomework"', - "Show my first due problem"); + my $link = 'navmaps?jumpToFirstHomework'; + if ($env{'form.register'}) { + $link .= '&register='.$env{'form.register'}; + } + unless ($notools) { + &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework', + 'location.href="'.$link.'"', + "Show my first due problem"); + } } my $suppressEmptySequences = 0; @@ -275,33 +242,47 @@ MENU $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'}; + } &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything', - 'location.href="navmaps?sort='.$env{'form.sort'}.'"', - "Show everything"); - $r->print("

".&mt("Uncompleted Problems")."

"); + 'location.href="'.$link.'"', + 'Show everything'); + $r->print("".&mt("Uncompleted Problems").""); $env{'form.filter'} = ''; $env{'form.condition'} = 1; $resource_no_folder_link = 1; } else { - &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted', - 'location.href="navmaps?sort='.$env{'form.sort'}. - '&showOnlyHomework=1"', - "Show only uncompleted problems"); - } - - my %selected=($env{'form.sort'} => 'selected=on'); - my $sort_html=("
- - - - + '.&mt('Sort by:').' + - -
"); + + + '); + } # renderer call my $renderArgs = { 'cols' => [0,1,2,3], 'sort' => $env{'form.sort'}, @@ -314,54 +295,51 @@ MENU 'sort_html'=> $sort_html, 'r' => $r, 'caller' => 'navmapsdisplay', - 'linkitems' => \%toplinkitems}; + 'linkitems' => \%toplinkitems, + 'notools' => $notools}; + my $render = &Apache::lonnavmaps::render($renderArgs); # If no resources were printed, print a reassuring message so the # user knows there was no error. if ($renderArgs->{'counter'} == 0) { if ($showOnlyHomework) { - $r->print("

".&mt("All homework is currently completed").".

"); + $r->print("

".&mt("All homework is currently completed.")."

"); } else { # both jumpToFirstHomework and normal use the same: course must be empty - $r->print("

This course is empty.

"); + $r->print("

".&mt("This course is empty.")."

"); } } - #my $td=&tv_interval($t0); - #$r->print("
$td"); - + &endContentScreen($r); $r->print(&Apache::loncommon::end_page()); $r->rflush(); return OK; } -sub launch_win { - my ($mode,$script,$toplinkitems,$firsttime)=@_; - my $result; - if ($script ne 'no') { - $result.=''; - } - if ($mode eq 'link') { - &Apache::lonnavmaps::add_linkitem($toplinkitems,'launchnav', - 'launch_navmapwin()', - "Launch navigation window"); - } - return $result; +sub startContentScreen { + my ($r,$mode)=@_; + + $r->print("\n".''."\n"); + $r->print('
'); +} + +sub endContentScreen { + my ($r)=@_; + $r->print('
'); } 1;