--- loncom/interface/lonnavmaps.pm 2004/09/21 20:33:49 1.296
+++ loncom/interface/lonnavmaps.pm 2008/12/12 22:27:20 1.415.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.296 2004/09/21 20:33:49 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.415.2.2 2008/12/12 22:27:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,12 +30,15 @@
package Apache::lonnavmaps;
use strict;
-use Apache::Constants qw(:common :http);
+use GDBM_File;
use Apache::loncommon();
-use Apache::lonmenu();
+use Apache::lonenc();
use Apache::lonlocal;
+use Apache::lonnet;
use POSIX qw (floor strftime);
-use Data::Dumper; # for debugging, not always used
+use Time::HiRes qw( gettimeofday tv_interval );
+use LONCAPA;
+use DateTime();
# symbolic constants
sub SYMB { return 1; }
@@ -53,6 +56,7 @@ my %statusIconMap =
$resObj->CLOSED => '',
$resObj->OPEN => 'navmap.open.gif',
$resObj->CORRECT => 'navmap.correct.gif',
+ $resObj->PARTIALLY_CORRECT => 'navmap.partial.gif',
$resObj->INCORRECT => 'navmap.wrong.gif',
$resObj->ATTEMPTED => 'navmap.ellipsis.gif',
$resObj->ERROR => ''
@@ -77,36 +81,15 @@ my %colormap =
$resObj->OPEN => '',
$resObj->NOTHING_SET => '',
$resObj->ATTEMPTED => '',
- $resObj->ANSWER_SUBMITTED => ''
+ $resObj->ANSWER_SUBMITTED => '',
+ $resObj->PARTIALLY_CORRECT => '#006600'
);
# And a special case in the nav map; what to do when the assignment
-# is not yet done and due in less then 24 hours
+# is not yet done and due in less than 24 hours
my $hurryUpColor = "#FF0000";
-sub launch_win {
- my ($mode,$script,$toplinkitems)=@_;
- my $result;
- if ($script ne 'no') {
- $result.='';
- }
- if ($mode eq 'link') {
- &add_linkitem($toplinkitems,'launchnav','launch_navmapwin()',
- "Launch navigation window");
- }
- return $result;
-}
-
sub close {
- if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
+ if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
return(<
window.status='Accessing Nav Control';
@@ -119,26 +102,9 @@ window.status='Done.';
ENDCLOSE
}
-sub nav_control_js {
- my $nav=($ENV{'environment.remotenavmap'} eq 'on');
- return (<
@@ -150,284 +116,6 @@ this.document.navform.submit();
ENDUPDATE
}
-sub handler {
- my $r = shift;
- real_handler($r);
-}
-
-sub real_handler {
- my $r = shift;
-
- # 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);
- $r->send_http_header;
-
- my %toplinkitems=();
-
- 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=(<print(<<"ENDSUBM");
-
-
-
-
-
-
-ENDSUBM
- return;
- }
- if ($ENV{QUERY_STRING} eq 'launchExternal') {
- &Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
- &Apache::lonnet::appenv('environment.remotenavmap' => 'on');
- }
-
- # 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->print("\n");
- $r->print("".&mt('Navigate Course Contents')."");
-# ------------------------------------------------------------ Get query string
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework']);
-
-# ----------------------------------------------------- Force menu registration
- my $addentries='';
- my $more_unload;
- my $body_only='';
- if ($ENV{'environment.remotenavmap'} eq 'on') {
- $r->print('');
-# 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::loncommon::bodytag('Navigate Course Contents','',
- $addentries,$body_only,'',
- $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.' .
- '