--- loncom/interface/lonnavmaps.pm	2010/06/24 14:21:39	1.449
+++ loncom/interface/lonnavmaps.pm	2010/12/03 15:19:09	1.453
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.449 2010/06/24 14:21:39 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.453 2010/12/03 15:19:09 www Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -528,6 +528,7 @@ my %colormap =
       $resObj->OPEN                   => '',
       $resObj->NOTHING_SET            => '',
       $resObj->ATTEMPTED              => '',
+      $resObj->CREDIT_ATTEMPTED       => '',
       $resObj->ANSWER_SUBMITTED       => '',
       $resObj->PARTIALLY_CORRECT      => '#006600'
       );
@@ -677,6 +678,11 @@ sub getDescription {
             return &mt("Answer submitted, not yet graded");
         }
     }
+    if ($status == $res->CREDIT_ATTEMPTED) {
+        if ($res->is_anonsurvey($part) || $res->is_survey($part)) {
+            return &mt("Credit for survey submission");
+        }
+    }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
         my $maxtries = $res->maxtries($part);
@@ -1084,9 +1090,10 @@ sub render_long_status {
         }
     }
     
-    if ($resource->kind() eq "res" &&
+    if (($resource->kind() eq "res" &&
         ($resource->is_problem() || $resource->is_practice()) &&
-        !$firstDisplayed) {
+        !$firstDisplayed) &&
+        $resource->is_raw_problem()) {
         if ($color) {$result .= "<font color=\"$color\"><b>"; }
         $result .= getDescription($resource, $part);
         if ($color) {$result .= "</b></font>"; }
@@ -1924,6 +1931,9 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
+    $self->{USERNAME} = shift || $env{'user.name'};
+    $self->{DOMAIN}   = shift || $env{'user.domain'};
+
     # Resource cache stores navmap resources as we reference them. We generate
     # them on-demand so we don't pay for creating resources unless we use them.
     $self->{RESOURCE_CACHE} = {};
@@ -1962,8 +1972,9 @@ sub generate_course_user_opt {
     my $self = shift;
     if ($self->{COURSE_USER_OPT_GENERATED}) { return; }
 
-    my $uname=$env{'user.name'};
-    my $udom=$env{'user.domain'};
+    my $uname=$self->{USERNAME};
+    my $udom=$self->{DOMAIN};
+
     my $cid=$env{'request.course.id'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $cnum=$env{'course.'.$cid.'.num'};
@@ -2014,7 +2025,7 @@ sub generate_email_discuss_status {
     my %discussiontime = &Apache::lonnet::dump('discussiontimes', 
 					       $cdom, $cnum);
     my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
-                                        $env{'user.domain'},$env{'user.name'},'lastread');
+                                        $self->{DOMAIN},$self->{USERNAME},'lastread');
     my %lastreadtime = ();
     foreach my $key (keys %lastread) {
         my $shortkey = $key;
@@ -2024,8 +2035,8 @@ sub generate_email_discuss_status {
 
     my %feedback=();
     my %error=();
-    my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},
-					$env{'user.name'});
+    my @keys = &Apache::lonnet::getkeys('nohist_email',$self->{DOMAIN},
+					$self->{USERNAME});
     
     foreach my $msgid (@keys) {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
@@ -2073,8 +2084,8 @@ sub get_user_data {
 
     # Retrieve performance data on problems
     my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},
-						   $env{'user.domain'},
-						   $env{'user.name'});
+						   $self->{DOMAIN},
+						   $self->{USERNAME});
     $self->{STUDENT_DATA} = \%student_data;
 
     $self->{RETRIEVED_USER_DATA} = 1;
@@ -2425,8 +2436,8 @@ sub parmval_real {
         @cgrps = sort(@cgrps);
         $cgroup = $cgrps[0];
     } 
-    my $uname=$env{'user.name'};
-    my $udom=$env{'user.domain'};
+    my $uname=$self->{USERNAME};
+    my $udom=$self->{DOMAIN};
 
     unless ($symb) { return ['']; }
     my $result='';
@@ -3459,7 +3470,7 @@ sub navHash {
     my $param = shift;
     my $id = shift;
     my $arg = $param . ($id?$self->{ID}:"");
-    if (defined($arg)) {
+    if (ref($self) && ref($self->{NAV_MAP}) && defined($arg)) {
         return $self->{NAV_MAP}->navhash($arg);
     }
     return;
@@ -4094,8 +4105,8 @@ sub weight {
     my $self = shift; my $part = shift;
     if (!defined($part)) { $part = '0'; }
     my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
-                                $self->symb(), $env{'user.domain'},
-                                $env{'user.name'},
+                                $self->symb(), $self->{DOMAIN},
+                                $self->{USERNAME},
                                 $env{'request.course.sec'});
     return $weight;
 }
@@ -4635,6 +4646,10 @@ Information not available due to network
 
 Attempted, and not yet graded.
 
+=item * B<CREDIT_ATTEMPTED>:
+
+Attempted, and credit received for attempt (survey and anonymous survey only).
+
 =back
 
 =cut
@@ -4646,6 +4661,7 @@ sub CORRECT               { return 13; }
 sub CORRECT_BY_OVERRIDE   { return 14; }
 sub EXCUSED               { return 15; }
 sub ATTEMPTED             { return 16; }
+sub CREDIT_ATTEMPTED      { return 17; }
 
 sub getCompletionStatus {
     my $self = shift;
@@ -4664,6 +4680,13 @@ sub getCompletionStatus {
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
     if ($status eq 'excused') {return $self->EXCUSED; }
     if ($status eq 'ungraded_attempted') {return $self->ATTEMPTED; }
+    if ($status eq 'credit_attempted') {
+        if ($self->is_anonsurvey($part) || $self->is_survey($part)) {
+            return $self->CREDIT_ATTEMPTED;
+        } else {
+            return $self->ATTEMPTED;
+        }
+    }
     return $self->NOT_ATTEMPTED;
 }
 
@@ -4753,6 +4776,10 @@ The item is open and not yet tried.
 
 The problem has been attempted.
 
+=item * B<CREDIT_ATTEMPTED>:
+
+The problem has been attempted, and credit given for the attempt (survey and anonymous survey only).
+
 =item * B<ANSWER_SUBMITTED>:
 
 An answer has been submitted, but the student should not see it.
@@ -4826,6 +4853,10 @@ sub status {
         return ATTEMPTED;
     }
 
+    if ($completionStatus == CREDIT_ATTEMPTED) {
+        return CREDIT_ATTEMPTED;
+    }
+
     # If it's EXCUSED, then return that no matter what
     if ($completionStatus == EXCUSED) {
         return EXCUSED; 
@@ -5018,6 +5049,7 @@ my %compositeToSimple =
       INCORRECT()             => INCORRECT,
       OPEN()                  => OPEN,
       ATTEMPTED()             => ATTEMPTED,
+      CREDIT_ATTEMPTED()      => CORRECT,
       ANSWER_SUBMITTED()      => ATTEMPTED
      );
 
@@ -5092,6 +5124,7 @@ sub completable {
         # and it is not "attempted" (manually graded problem), it is
         # not "complete"
 	if ($self->getCompletionStatus($part) == ATTEMPTED() ||
+            $self->getCompletionStatus($part) == CREDIT_ATTEMPTED() ||
 	    $status == ANSWER_SUBMITTED() ) {
 	    # did this part already, as well as we can
 	    next;