--- loncom/interface/lonnavdisplay.pm 2014/04/06 16:30:45 1.22.4.3
+++ loncom/interface/lonnavdisplay.pm 2025/02/07 20:58:59 1.22.4.10.2.5
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
-# Navigate Maps Handler
+# Navigate Maps Display Handler
#
-# $Id: lonnavdisplay.pm,v 1.22.4.3 2014/04/06 16:30:45 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.22.4.10.2.5 2025/02/07 20:58:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,7 @@
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();
@@ -38,7 +38,7 @@ use Apache::lonhtmlcommon();
use Apache::lonnet;
use Apache::lonlocal;
use Apache::londocs();
-use Time::HiRes qw( gettimeofday tv_interval );
+use Apache::lonuserstate;
sub handler {
my $r = shift;
@@ -47,62 +47,114 @@ 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=();
+# ------------------------------------------------------------ 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');
+ $r->send_http_header;
+ $r->print(&Apache::loncommon::check_release_result(@reinit));
+ return OK;
+ }
+ my ($cid,$cnum,$cdom);
+ if ($result) {
+ $cid = $env{'request.course.id'};
+ $cnum = $env{'course.'.$cid.'.num'};
+ $cdom = $env{'course.'.$cid.'.domain'};
+ }
+ if (($result eq 'main') || ($result eq 'both')) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ &startpage($r);
+ my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
+ '<br />'.
+ &mt('Your course session is being updated because of recent changes by course personnel.').
+ ' '.&mt('Please be patient').'.<br /></div>'.
+ '<div style="padding:0;clear:both;margin:0;border:0"></div>';
+ $closure = <<ENDCLOSE;
+<script type="text/javascript">
+// <![CDATA[
+\$("#LC_update_$cid").hide('slow');
+// ]]>
+</script>
+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;
+ return HTTP_NOT_ACCEPTABLE;
+ }
+ }
+ if (($result eq 'both') || ($result eq 'supp')) {
+ my $possdel;
+ if ($result eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+ unless ($refs_updated) {
+ &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+ }
+ }
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
+ if (($result eq 'main') || ($result eq 'both')) {
+ &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;
}
- $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 'main') || ($result eq 'both')) {
+ $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.
- '<script type="text/javascript">window.focus();</script>');
+
&startContentScreen($r,'navmaps');
- $r->rflush();
+ unless (($result eq 'main') || ($result eq 'both')) {
+ $r->rflush();
+ }
# Check that it's defined
if (!($navmap->courseMapDefined())) {
@@ -113,6 +165,7 @@ sub real_handler {
return OK;
}
+ my %toplinkitems=();
my @resources = $navmap->retrieveResources();
my $sequenceCount = 0;
my $problemCount = 0;
@@ -189,10 +242,7 @@ sub real_handler {
."</span>");
}
} 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.'"',
@@ -212,10 +262,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');
@@ -224,10 +271,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.'"',
@@ -249,7 +293,6 @@ sub real_handler {
<option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>
<option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
</select>
- <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
</span>
</form>');
}
@@ -279,8 +322,6 @@ sub real_handler {
$r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");
}
}
- #my $td=&tv_interval($t0);
- #$r->print("<br />$td");
&endContentScreen($r);
$r->print(&Apache::loncommon::end_page());
$r->rflush();
@@ -288,19 +329,40 @@ 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};
+ $r->print(&Apache::loncommon::start_page($title,undef,$args).
+ '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n".
+ 'window.focus();'."\n".
+ '// ]]>'."\n".
+ '</script>');
+ return;
+}
+
sub startContentScreen {
my ($r,$mode)=@_;
$r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b> '.&mt('Main Content').' </b></a></li>'."\n");
- my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- my ($suppcount,$errors);
- unless ($allowed) {
+ my $supptab;
+ if ($env{'request.role.adv'}) {
+ $supptab = 1;
+ } else {
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- ($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
+ $supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
}
- if ($allowed || $suppcount) {
+ if ($supptab) {
$r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
}
$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b> '.&mt('Content Search').' </b></a></li>'."\n");