--- loncom/interface/lonnavdisplay.pm 2025/05/28 04:40:55 1.22.4.10.2.6 +++ loncom/interface/lonnavdisplay.pm 2025/02/07 20:46:01 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.22.4.10.2.6 2025/05/28 04:40:55 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.45 2025/02/07 20:46:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,7 +39,7 @@ use Apache::lonnet; use Apache::lonlocal; use Apache::londocs(); use Apache::lonuserstate; -use LONCAPA; +use LONCAPA::ltiutils; sub handler { my $r = shift; @@ -55,7 +55,7 @@ sub real_handler { return OK; } - # Check for critical messages and redirect if present. + # 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'); @@ -85,7 +85,7 @@ sub real_handler { $cnum = $env{'course.'.$cid.'.num'}; $cdom = $env{'course.'.$cid.'.domain'}; } - if (($result eq 'main') || ($result eq 'both')) { + if (($result eq 'main') || ($result eq 'both')) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; &startpage($r); @@ -126,6 +126,36 @@ ENDCLOSE } } + my $course_type = &Apache::loncommon::course_type(); + if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { + my $furl = &Apache::lonpageflip::first_accessible_resource(); + if (($result eq 'main') || ($result eq 'both')) { + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->print($closure.&Apache::loncommon::end_page()); + return OK; + } else { + unless ($furl eq '/adm/navmaps') { + &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(); @@ -152,7 +182,7 @@ ENDCLOSE &startpage($r); } - &startContentScreen($r,'navmaps'); + &startContentScreen($r,'navmaps',$course_type); unless (($result eq 'main') || ($result eq 'both')) { $r->rflush(); } @@ -287,13 +317,14 @@ ENDCLOSE '
- '.&mt('Sort by:').' - +
'); } @@ -317,88 +348,11 @@ ENDCLOSE # If no resources were printed, print a reassuring message so the # user knows there was no error. if ($renderArgs->{'counter'} == 0) { - my $noresmsg; if ($showOnlyHomework) { - $noresmsg = &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 - $noresmsg = &mt('This course is empty.'); - if (($renderArgs->{'deeplinknolist'}) && - ($env{'request.course.deeponlyprot'})) { - my ($linkprot,$currmatch,$othermatches,@names); - if ($env{'request.linkprot'}) { - ($linkprot) = split(/:/,$env{'request.linkprot'}); - } - foreach my $launcher (split(/&/,$env{'request.course.deeponlyprot'})) { - my ($name,$itemnums) = split(/:/,$launcher); - my @nums = split(/,/,$itemnums); - if (($linkprot) && - (grep(/^\Q$linkprot\E$/,@nums))) { - $currmatch = &LONCAPA::unescape($name); - if (@nums > 1) { - $othermatches = 1; - } - } else { - push(@names,&LONCAPA::unescape($name)); - } - } - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $has_supp = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom); - if ($linkprot) { - if ($currmatch) { - if ($has_supp) { - $noresmsg = &mt('No main content available when accessed using the link you followed from [_1].', - $currmatch); - } else { - $noresmsg = &mt('No content available when accessed using the link you followed from [_1].', - $currmatch); - } - if ($othermatches) { - $noresmsg = '
'; - if ($has_supp) { - $noresmsg .= &mt('Main content may be available by following a different link from [_1].', - $currmatch); - } else { - $noresmsg .= &mt('Content may be available by following a different link from [_1].', - $currmatch); - } - } - } else { - if ($has_supp) { - $noresmsg = &mt('No main content available using the link you followed.'); - } else { - $noresmsg = &mt('No content available using the link you followed.'); - } - } - } elsif (@names > 0) { - if ($has_supp) { - $noresmsg = &mt('No main content available from direct login to this course.'); - } else { - $noresmsg = &mt('No content available from direct login to this course.'); - } - } - if (@names == 1) { - $noresmsg .= '
'; - if ($has_supp) { - $noresmsg .= &mt('Main content is likely available by following links from [_1]', - $names[0]); - } else { - $noresmsg .= &mt('Content is likely available by following links from [_1]', - $names[0]); - } - } elsif (@names > 1) { - $noresmsg .= '
'; - if ($has_supp) { - $noresmsg .= &mt('Main content is likely available by following links from the following: [_1]', - join(', ',@names)); - } else { - $noresmsg .= &mt('Content is likely available by following links from the following: [_1]', - join(', ',@names)); - } - } - } + $r->print("

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

"); } - $r->print('

'.$noresmsg.'

'); } &endContentScreen($r); $r->print(&Apache::loncommon::end_page()); @@ -428,7 +382,7 @@ sub startpage { } sub startContentScreen { - my ($r,$mode)=@_; + my ($r,$mode,$course_type)=@_; $r->print("\n".''."\n"); $r->print('
'); }