[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom loncapa_apache.conf loncom/auth lonroles.pm loncom/interface lonnavdisplay.pm lonnavmaps.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 10 Oct 2006 20:16:45 -0000
This is a MIME encoded message
--albertel1160511405
Content-Type: text/plain
albertel Tue Oct 10 16:16:45 2006 EDT
Added files:
/loncom/interface lonnavdisplay.pm
Modified files:
/loncom/auth lonroles.pm
/loncom/interface lonnavmaps.pm
/loncom loncapa_apache.conf
/doc/loncapafiles loncapafiles.lpml
Log:
- splitting the handlery bits of lonnavmaps from the functional components
--albertel1160511405
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20061010161645.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.165 loncom/auth/lonroles.pm:1.166
--- loncom/auth/lonroles.pm:1.165 Mon Oct 9 21:54:33 2006
+++ loncom/auth/lonroles.pm Tue Oct 10 16:16:19 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.165 2006/10/10 01:54:33 albertel Exp $
+# $Id: lonroles.pm,v 1.166 2006/10/10 20:16:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,8 +53,8 @@
my $swinfo=&Apache::lonmenu::rawconfig();
my $navwindow;
if ($launch_nav eq 'on') {
- $navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
- ($url =~ m-^/adm/whatsnew-));
+ $navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
+ ($url =~ m-^/adm/whatsnew-));
} else {
$navwindow.=&Apache::lonnavmaps::close();
}
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.390 loncom/interface/lonnavmaps.pm:1.391
--- loncom/interface/lonnavmaps.pm:1.390 Mon Jul 24 20:57:51 2006
+++ loncom/interface/lonnavmaps.pm Tue Oct 10 16:16:26 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.390 2006/07/25 00:57:51 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.391 2006/10/10 20:16:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,9 +31,7 @@
use strict;
use GDBM_File;
-use Apache::Constants qw(:common :http);
use Apache::loncommon();
-use Apache::lonmenu();
use Apache::lonenc();
use Apache::lonlocal;
use Apache::lonnet;
@@ -91,34 +89,6 @@
# is not yet done and due in less then 24 hours
my $hurryUpColor = "#FF0000";
-sub launch_win {
- my ($mode,$script,$toplinkitems,$firsttime)=@_;
- my $result;
- if ($script ne 'no') {
- $result.='<script type="text/javascript">';
- }
- if ($firsttime) {
- $result.='function launch_navmapwin() {
- newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
- }';
- } else {
- $result.='function launch_navmapwin() {
- newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
- }';
- }
- if ($mode eq 'now') {
- $result.="\nlaunch_navmapwin();\n";
- }
- if ($script ne 'no') {
- $result.='</script>';
- }
- if ($mode eq 'link') {
- &add_linkitem($toplinkitems,'launchnav','launch_navmapwin()',
- "Launch navigation window");
- }
- return $result;
-}
-
sub close {
if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
return(<<ENDCLOSE);
@@ -147,300 +117,6 @@
ENDUPDATE
}
-sub handler {
- my $r = shift;
- real_handler($r);
-}
-
-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');
- }
- $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 {
- &Apache::loncommon::content_type($r,'text/html');
- }
- &Apache::loncommon::no_cache($r);
-
- my %toplinkitems=();
- &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=(<<MENU)
- swmenu=$menu
- swmenu.clearTimeout(swmenu.menucltim);
- $navstatus
-MENU
- } else {
- my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
- my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
- $menu=(<<MENU)
- swmenu=$mainwindow
- $navstatus
-MENU
- }
- $r->send_http_header;
- my $js =<<"ENDSUBM";
- <script type="text/javascript">
- function submitthis() {
- $menu
- self.close();
- }
-
- </script>
-ENDSUBM
- $r->print(&Apache::loncommon::start_page(undef,$js,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'add_entries' =>
- {'onload' =>
- "submitthis()"}}).
- &Apache::loncommon::end_page());
-
- return OK;
- }
- 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(<<MENU);
- <script type="text/javascript">
- swmenu=$menu
- swmenu.clearTimeout(swmenu.menucltim);
- $navstatus
- </script>
-MENU
- }
- }
- if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
- $env{'environment.remotenavmap'}='off';
- }
-
- # Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new();
-
- if (!defined($navmap)) {
- my $requrl = $r->uri;
- $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
- return HTTP_NOT_ACCEPTABLE;
- }
- $r->send_http_header;
-
-# ------------------------------------------------------------ Get query string
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
-
-# ----------------------------------------------------- Force menu registration
- my $body_only='';
- my $js;
- if ($env{'environment.remotenavmap'} eq 'on') {
- $js='<script type="text/javascript">
- function collapse() {
- this.document.location="/adm/navmaps?collapseExternal";
- }
- </script>';
- $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('<script type="text/javascript">window.focus();</script>');
-
- $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('<span class="LC_error">'.&mt('Coursemap undefined.').
- '</span>' .
- &Apache::loncommon::end_page());
- 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()) {
- $sequenceCount++;
- $sequenceId = $curRes->map_pc();
- }
- }
-
- if ($sequenceCount == 1) {
- # The automatic iterator creation in the render call
- # will pick this up. We know the condition because
- # the defined($env{'form.filter'}) also ensures this
- # is a fresh call.
- $env{'form.filter'} = "$sequenceId";
- }
- }
-
- if ($ENV{QUERY_STRING} eq 'launchExternal') {
- $r->print('
- <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a"
- method="post" target="loncapaclient">
- </form>');
- $r->print('
- <script type="text/javascript">
- this.document.returnwin.submit();
- </script>');
- }
-
- if ($env{'environment.remotenavmap'} ne 'on') {
- $r->print(&launch_win('link','yes',\%toplinkitems));
- }
- if ($env{'environment.remotenavmap'} eq 'on') {
- &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.
- my $iterator = $navmap->getIterator(undef, undef, undef, 1);
- my $curRes;
- my $foundDoableProblem = 0;
- my $minimumduedate;
-
- while ($curRes = $iterator->next()) {
- if (ref($curRes) && $curRes->is_problem()) {
- my $status = $curRes->status();
- if ($curRes->completable()) {
- my $thisduedate=$curRes->duedate();
- unless ($foundDoableProblem) {
- $minimumduedate=$thisduedate;
- }
-
- $foundDoableProblem = 1;
-
- 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;
- }
- }
- }
- }
-
- # If we found no problems, print a note to that effect.
- if (!$foundDoableProblem) {
- $r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
- }
- } else {
- &add_linkitem(\%toplinkitems,'firsthomework',
- 'location.href="navmaps?jumpToFirstHomework"',
- "Show my first due problem");
- }
-
- my $suppressEmptySequences = 0;
- my $filterFunc = undef;
- my $resource_no_folder_link = 0;
-
- # Display only due homework.
- my $showOnlyHomework = 0;
- if ($env{'form.showOnlyHomework'} eq "1") {
- $showOnlyHomework = 1;
- $suppressEmptySequences = 1;
- $filterFunc = sub { my $res = shift;
- return $res->completable() || $res->is_map();
- };
- &add_linkitem(\%toplinkitems,'everything',
- 'location.href="navmaps?sort='.$env{'form.sort'}.'"',
- "Show everything");
- $r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");
- $env{'form.filter'} = '';
- $env{'form.condition'} = 1;
- $resource_no_folder_link = 1;
- } else {
- &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=("<form>
- <nobr>
- <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
- <input type=\"submit\" value=\"".&mt('Sort by:')."\" />
- <select name=\"sort\">
- <option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
- <option value=\"title\" $selected{'title'} >".&mt('Title')."</option>
- <option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
- <option value=\"discussion\" $selected{'discussion'}>".&mt('Has New Discussion')."</option>
- </select>
- </nobr>
- </form>");
- # renderer call
- my $renderArgs = { 'cols' => [0,1,2,3],
- 'sort' => $env{'form.sort'},
- 'url' => '/adm/navmaps',
- 'navmap' => $navmap,
- 'suppressNavmap' => 1,
- 'suppressEmptySequences' => $suppressEmptySequences,
- 'filterFunc' => $filterFunc,
- 'resource_no_folder_link' => $resource_no_folder_link,
- 'sort_html'=> $sort_html,
- 'r' => $r,
- 'caller' => 'navmapsdisplay',
- 'linkitems' => \%toplinkitems};
- my $render = 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("<p><font size='+1'>".&mt("All homework is currently completed").".</font></p>");
- } else { # both jumpToFirstHomework and normal use the same: course must be empty
- $r->print("<p><font size='+1'>This course is empty.</font></p>");
- }
- }
- #my $td=&tv_interval($t0);
- #$r->print("<br />$td");
-
- $r->print(&Apache::loncommon::end_page());
- $r->rflush();
-
- return OK;
-}
-
# Convenience functions: Returns a string that adds or subtracts
# the second argument from the first hash, appropriate for the
# query string that determines which folders to recurse on
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.159 loncom/loncapa_apache.conf:1.160
--- loncom/loncapa_apache.conf:1.159 Fri Sep 15 16:45:38 2006
+++ loncom/loncapa_apache.conf Tue Oct 10 16:16:33 2006
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.159 2006/09/15 20:45:38 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.160 2006/10/10 20:16:33 albertel Exp $
##
#
@@ -1083,7 +1083,7 @@
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
-PerlHandler Apache::lonnavmaps
+PerlHandler Apache::lonnavdisplay
ErrorDocument 403 /adm/login
ErrorDocument 406 /adm/roles
ErrorDocument 500 /adm/errorhandler
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.509 doc/loncapafiles/loncapafiles.lpml:1.510
--- doc/loncapafiles/loncapafiles.lpml:1.509 Thu Oct 5 14:35:38 2006
+++ doc/loncapafiles/loncapafiles.lpml Tue Oct 10 16:16:42 2006
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.509 2006/10/05 18:35:38 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.510 2006/10/10 20:16:42 albertel Exp $ -->
<!--
@@ -3773,6 +3773,15 @@
<status>works/unverified</status>
</file>
<file>
+ <source>loncom/interface/lonnavdisplay.pm</source>
+ <target dist='default'>home/httpd/lib/perl/Apache/lonnavdisplay.pm</target>
+ <categoryname>handler</categoryname>
+ <description>
+Displays the nav map to the user
+ </description>
+<status>works/unverified</status>
+</file>
+<file>
<source>doc/man/Apache__lonnavmaps.3</source>
<target dist='default'>usr/man/man3/Apache::lonnavmaps.3</target>
<categoryname>doc</categoryname>
Index: loncom/interface/lonnavdisplay.pm
+++ loncom/interface/lonnavdisplay.pm
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
# $Id: lonnavdisplay.pm,v 1.1 2006/10/10 20:16:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
# LON-CAPA is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# LON-CAPA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/
#
###
package Apache::lonnavdisplay;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonmenu();
use Apache::loncommon();
use Apache::lonnavmaps();
use Apache::lonhtmlcommon();
use Apache::lonnet;
use Apache::lonlocal;
sub handler {
my $r = shift;
real_handler($r);
}
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');
}
$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 {
&Apache::loncommon::content_type($r,'text/html');
}
&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=(<<MENU)
swmenu=$menu
swmenu.clearTimeout(swmenu.menucltim);
$navstatus
MENU
} else {
my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
$menu=(<<MENU)
swmenu=$mainwindow
$navstatus
MENU
}
$r->send_http_header;
my $js =<<"ENDSUBM";
<script type="text/javascript">
function submitthis() {
$menu
self.close();
}
</script>
ENDSUBM
$r->print(&Apache::loncommon::start_page(undef,$js,
{'only_body' => 1,
'bgcolor' => '#FFFFFF',
'add_entries' =>
{'onload' =>
"submitthis()"}}).
&Apache::loncommon::end_page());
return OK;
}
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(<<MENU);
<script type="text/javascript">
swmenu=$menu
swmenu.clearTimeout(swmenu.menucltim);
$navstatus
</script>
MENU
}
}
if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
$env{'environment.remotenavmap'}='off';
}
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
my $requrl = $r->uri;
$env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
return HTTP_NOT_ACCEPTABLE;
}
$r->send_http_header;
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
# ----------------------------------------------------- Force menu registration
my $body_only='';
my $js;
if ($env{'environment.remotenavmap'} eq 'on') {
$js='<script type="text/javascript">
function collapse() {
this.document.location="/adm/navmaps?collapseExternal";
}
</script>';
$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('<script type="text/javascript">window.focus();</script>');
$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('<span class="LC_error">'.&mt('Coursemap undefined.').
'</span>' .
&Apache::loncommon::end_page());
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()) {
$sequenceCount++;
$sequenceId = $curRes->map_pc();
}
}
if ($sequenceCount == 1) {
# The automatic iterator creation in the render call
# will pick this up. We know the condition because
# the defined($env{'form.filter'}) also ensures this
# is a fresh call.
$env{'form.filter'} = "$sequenceId";
}
}
if ($ENV{QUERY_STRING} eq 'launchExternal') {
$r->print('
<form name="returnwin" action="/adm/flip?postdata=navlaunch%3a"
method="post" target="loncapaclient">
</form>');
$r->print('
<script type="text/javascript">
this.document.returnwin.submit();
</script>');
}
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.
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $curRes;
my $foundDoableProblem = 0;
my $minimumduedate;
while ($curRes = $iterator->next()) {
if (ref($curRes) && $curRes->is_problem()) {
my $status = $curRes->status();
if ($curRes->completable()) {
my $thisduedate=$curRes->duedate();
unless ($foundDoableProblem) {
$minimumduedate=$thisduedate;
}
$foundDoableProblem = 1;
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;
}
}
}
}
# If we found no problems, print a note to that effect.
if (!$foundDoableProblem) {
$r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
}
} else {
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
'location.href="navmaps?jumpToFirstHomework"',
"Show my first due problem");
}
my $suppressEmptySequences = 0;
my $filterFunc = undef;
my $resource_no_folder_link = 0;
# Display only due homework.
my $showOnlyHomework = 0;
if ($env{'form.showOnlyHomework'} eq "1") {
$showOnlyHomework = 1;
$suppressEmptySequences = 1;
$filterFunc = sub { my $res = shift;
return $res->completable() || $res->is_map();
};
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
'location.href="navmaps?sort='.$env{'form.sort'}.'"',
"Show everything");
$r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");
$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=("<form>
<nobr>
<input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
<input type=\"submit\" value=\"".&mt('Sort by:')."\" />
<select name=\"sort\">
<option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
<option value=\"title\" $selected{'title'} >".&mt('Title')."</option>
<option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
<option value=\"discussion\" $selected{'discussion'}>".&mt('Has New Discussion')."</option>
</select>
</nobr>
</form>");
# renderer call
my $renderArgs = { 'cols' => [0,1,2,3],
'sort' => $env{'form.sort'},
'url' => '/adm/navmaps',
'navmap' => $navmap,
'suppressNavmap' => 1,
'suppressEmptySequences' => $suppressEmptySequences,
'filterFunc' => $filterFunc,
'resource_no_folder_link' => $resource_no_folder_link,
'sort_html'=> $sort_html,
'r' => $r,
'caller' => 'navmapsdisplay',
'linkitems' => \%toplinkitems};
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("<p><font size='+1'>".&mt("All homework is currently completed").".</font></p>");
} else { # both jumpToFirstHomework and normal use the same: course must be empty
$r->print("<p><font size='+1'>This course is empty.</font></p>");
}
}
#my $td=&tv_interval($t0);
#$r->print("<br />$td");
$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.='<script type="text/javascript">';
}
if ($firsttime) {
$result.='function launch_navmapwin() {
newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
}';
} else {
$result.='function launch_navmapwin() {
newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
}';
}
if ($mode eq 'now') {
$result.="\nlaunch_navmapwin();\n";
}
if ($script ne 'no') {
$result.='</script>';
}
if ($mode eq 'link') {
&Apache::lonnavmaps::add_linkitem($toplinkitems,'launchnav',
'launch_navmapwin()',
"Launch navigation window");
}
return $result;
}
1;
__END__
--albertel1160511405--