--- loncom/interface/lonnavmaps.pm 2006/03/19 19:50:40 1.373
+++ loncom/interface/lonnavmaps.pm 2006/04/10 21:55:48 1.377
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.373 2006/03/19 19:50:40 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.377 2006/04/10 21:55:48 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -203,10 +203,13 @@ MENU
ENDSUBM
- $r->print(&Apache::lonxml::xmlbegin().
- &Apache::loncommon::head(undef,$js).
- ''.
- &Apache::loncommon::end_page(undef,$js));
+ $r->print(&Apache::loncommon::start_page(undef,$js,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'add_entries' =>
+ {'onload' =>
+ "submitthis()"}}).
+ &Apache::loncommon::end_page());
return OK;
}
@@ -243,8 +246,6 @@ MENU
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
# ----------------------------------------------------- Force menu registration
- my $addentries='';
- my $more_unload;
my $body_only='';
my $js;
if ($env{'environment.remotenavmap'} eq 'on') {
@@ -253,33 +254,23 @@ MENU
this.document.location="/adm/navmaps?collapseExternal";
}
';
-# FIXME need to be smarter to only catch window close events
-# $more_unload="collapse()"
$body_only=1;
}
- if ($env{'form.register'}) {
- $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
- '" onUnload="'.&Apache::lonmenu::unloadevents().';'.
- $more_unload.'"';
- $r->print(&Apache::lonmenu::registerurl(1));
- } else {
- $addentries=' onUnload="'.$more_unload.'"';
- }
# Header
- $r->print(&Apache::lonxml::xmlbegin().
- &Apache::loncommon::head('Navigate Course Contents',$js).
- &Apache::loncommon::bodytag('Navigate Course Contents','',
- $addentries,$body_only,'',
- $env{'form.register'}));
- $r->print('');
+ $r->print(&Apache::loncommon::start_page('Navigate Course Contents',$js,
+ {'only_body' => $body_only,
+ 'force_register' =>
+ $env{'form.register'},}));
+ $r->print('');
$r->rflush();
# Check that it's defined
if (!($navmap->courseMapDefined())) {
$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
- $r->print('Coursemap undefined.' .
+ $r->print(''.&mt('Coursemap undefined.').
+ '' .
&Apache::loncommon::end_page());
return OK;
}
@@ -327,32 +318,38 @@ MENU
"Close navigation window");
}
- my $jumpToFirstHomework = 0;
+
# Check to see if the student is jumping to next open, do-able problem
if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
- $jumpToFirstHomework = 1;
# Find the next homework problem that they can do.
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $curRes;
my $foundDoableProblem = 0;
- my $problemRes;
+ my $minimumduedate;
- while (($curRes = $iterator->next()) && !$foundDoableProblem) {
+ while ($curRes = $iterator->next()) {
if (ref($curRes) && $curRes->is_problem()) {
my $status = $curRes->status();
if ($curRes->completable()) {
- $problemRes = $curRes;
+ my $thisduedate=$curRes->duedate();
+ unless ($foundDoableProblem) {
+ $minimumduedate=$thisduedate;
+ }
+
$foundDoableProblem = 1;
- # Pop open all previous maps
- my $stack = $iterator->getStack();
- pop @$stack; # last resource in the stack is the problem
- # itself, which we don't need in the map stack
- my @mapPcs = map {$_->map_pc()} @$stack;
- $env{'form.filter'} = join(',', @mapPcs);
-
- # Mark as both "here" and "jump"
- $env{'form.postsymb'} = $curRes->symb();
+ if ($thisduedate<=$minimumduedate) {
+ # Pop open all previous maps
+ my $stack = $iterator->getStack();
+ pop @$stack; # last resource in the stack is the problem
+ # itself, which we don't need in the map stack
+ my @mapPcs = map {$_->map_pc()} @$stack;
+ $env{'form.filter'} = join(',', @mapPcs);
+
+ # Mark as both "here" and "jump"
+ $env{'form.postsymb'} = $curRes->symb();
+ $minimumduedate=$thisduedate;
+ }
}
}
}
@@ -364,7 +361,7 @@ MENU
} else {
&add_linkitem(\%toplinkitems,'firsthomework',
'location.href="navmaps?jumpToFirstHomework"',
- "Show Me My First Homework Problem");
+ "Show my first due problem");
}
my $suppressEmptySequences = 0;
@@ -381,8 +378,8 @@ MENU
};
&add_linkitem(\%toplinkitems,'everything',
'location.href="navmaps?sort='.$env{'form.sort'}.'"',
- "Show Everything");
- $r->print("".&mt("Uncompleted Homework")."
");
+ "Show everything");
+ $r->print("".&mt("Uncompleted Problems")."
");
$env{'form.filter'} = '';
$env{'form.condition'} = 1;
$resource_no_folder_link = 1;
@@ -390,7 +387,7 @@ MENU
&add_linkitem(\%toplinkitems,'uncompleted',
'location.href="navmaps?sort='.$env{'form.sort'}.
'&showOnlyHomework=1"',
- "Show Only Uncompleted Homework");
+ "Show only uncompleted problems");
}
my %selected=($env{'form.sort'} => 'selected=on');
@@ -1612,11 +1609,11 @@ sub render {
if ($condition) {
$link='"navmaps?condition=0&filter=&'.$queryString.
'&here='.&Apache::lonnet::escape($here).'"';
- $text='Close All Folders';
+ $text='Close all folders';
} else {
$link='"navmaps?condition=1&filter=&'.$queryString.
'&here='.&Apache::lonnet::escape($here).'"';
- $text='Open All Folders';
+ $text='Open all folders';
}
if ($args->{'caller'} eq 'navmapsdisplay') {
&add_linkitem($args->{'linkitems'},'changefolder',