--- loncom/interface/lonnavmaps.pm	2010/01/07 12:42:43	1.442
+++ loncom/interface/lonnavmaps.pm	2010/02/28 22:36:38	1.444
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.442 2010/01/07 12:42:43 wenzelju Exp $
+# $Id: lonnavmaps.pm,v 1.444 2010/02/28 22:36:38 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -478,6 +478,7 @@ use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
 use Apache::lonnet;
+
 use POSIX qw (floor strftime);
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
@@ -492,7 +493,7 @@ sub NOTHING { return 3; }
 
 my $resObj = "Apache::lonnavmaps::resource";
 
-# Keep these mappings in sync with lonquickgrades, which uses the colors
+# Keep these mappings in sync with lonquickgrades, which usesthe colors
 # instead of the icons.
 my %statusIconMap = 
     (
@@ -699,7 +700,11 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        return &mt("Answer submitted, not yet graded");
+        if ($res->is_anonsurvey($part) || $res->is_survey($part)) {
+            return &mt("Survey submission recorded");
+        } else {
+            return &mt("Answer submitted, not yet graded");
+        }
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -3779,6 +3784,35 @@ sub is_problem {
     }
     return 0;
 }
+#
+#  The has below is the set of status that are considered 'incomplete'
+#
+my %incomplete_hash = 
+(
+ TRIES_LEFT()     => 1,
+ OPEN()           => 1,
+ ATTEMPTED()      => 1
+
+ );
+#
+#  Return tru if a problem is incomplete... for now incomplete means that
+#  any part of the problem is incomplete. 
+#  Note that if the resources is not a problem, 0 is returned.
+#
+sub is_incomplete {
+    my $self = shift;
+    if ($self->is_problem()) {
+	&Apache::lonnet::logthis('is problem');
+	foreach my $part (@{$self->parts()}) {
+	    &Apache::lonnet::logthis("$part status ".$self->status($part));
+	    if (exists($incomplete_hash{$self->status($part)})) {
+		return 1;
+	    }
+	}
+    }
+    return 0;
+       
+}
 sub is_raw_problem {
     my $self=shift;
     my $src = $self->src();
@@ -3814,13 +3848,22 @@ sub is_survey {
     my $self = shift();
     my $part = shift();
     my $type = $self->parmval('type',$part);
-    if ($type eq 'survey') {
+    if (($type eq 'survey') || ($type eq 'surveycred')) {
         return 1;
     }
     if ($self->src() =~ /\.(survey)$/) {
         return 1;
     }
     return 0;
+}
+sub is_anonsurvey {
+    my $self = shift();
+    my $part = shift();
+    my $type = $self->parmval('type',$part);
+    if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
+        return 1;
+    }
+    return 0;
 }
 sub is_task {
     my $self=shift;