--- loncom/interface/lonnavmaps.pm	2005/06/17 21:17:09	1.329
+++ loncom/interface/lonnavmaps.pm	2005/06/28 21:41:43	1.332
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.329 2005/06/17 21:17:09 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.332 2005/06/28 21:41:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,6 +57,7 @@ my %statusIconMap =
      $resObj->CLOSED       => '',
      $resObj->OPEN         => 'navmap.open.gif',
      $resObj->CORRECT      => 'navmap.correct.gif',
+     $resObj->PARTIALLY_CORRECT      => 'navmap.ellipsis.gif',
      $resObj->INCORRECT    => 'navmap.wrong.gif',
      $resObj->ATTEMPTED    => 'navmap.ellipsis.gif',
      $resObj->ERROR        => ''
@@ -81,7 +82,8 @@ 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
@@ -507,7 +509,7 @@ sub getDescription {
     if ($status == $res->PAST_DUE_NO_ANSWER) {
         return &mt("Was due")." " . timeToHumanString($res->duedate($part));
     }
-    if ($status == $res->ANSWER_OPEN) {
+    if ($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) {
         return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
@@ -1426,16 +1428,17 @@ sub render {
         # Step two: Locate what kind of here marker is necessary
         # Determine where the "here" marker is and where the screen jumps to.
 
-        if ($env{'form.postsymb'}) {
+        if ($env{'form.postsymb'} ne '') {
             $here = $jump = &Apache::lonnet::symbclean($env{'form.postsymb'});
-        } elsif ($env{'form.postdata'}) {
+        } elsif ($env{'form.postdata'} ne '') {
             # couldn't find a symb, is there a URL?
             my $currenturl = $env{'form.postdata'};
             #$currenturl=~s/^http\:\/\///;
             #$currenturl=~s/^[^\/]+//;
             
             $here = $jump = &Apache::lonnet::symbread($currenturl);
-        } else {
+	}
+	if ($here eq '') {
 	    my $last;
 	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                     &GDBM_READER(),0640)) {
@@ -4373,14 +4376,17 @@ sub ATTEMPTED             { return 16; }
 
 sub getCompletionStatus {
     my $self = shift;
+    my $part = shift;
     return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
 
-    my $status = $self->queryRestoreHash('solved', shift);
+    my $status = $self->queryRestoreHash('solved', $part);
 
     # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
     if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
-    if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
+    if ($status eq 'correct_by_override') {
+	return $self->CORRECT_BY_OVERRIDE;
+    }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
     if ($status eq 'excused') {return $self->EXCUSED; }
@@ -4484,6 +4490,7 @@ An answer has been submitted, but the st
 
 sub TRIES_LEFT       { return 20; }
 sub ANSWER_SUBMITTED { return 21; }
+sub PARTIALLY_CORRECT{ return 22; }
 
 sub status {
     my $self = shift;
@@ -4502,14 +4509,22 @@ sub status {
     my $suppressFeedback = $self->problemstatus($part) eq 'no';
     # If there's an answer date and we're past it, don't
     # suppress the feedback; student should know
-    if ($self->answerdate($part) && $self->answerdate($part) < time()) {
+    if ($self->duedate($part) && $self->duedate($part) < time() &&
+	$self->answerdate($part) && $self->answerdate($part) < time()) {
 	$suppressFeedback = 0;
     }
 
     # There are a few whole rows we can dispose of:
     if ($completionStatus == CORRECT ||
         $completionStatus == CORRECT_BY_OVERRIDE ) {
-        return $suppressFeedback? ANSWER_SUBMITTED : CORRECT; 
+	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
+	my $awarded=$self->awarded($part);
+	if ($awarded < 1 && $awarded > 0) {
+            return PARTIALLY_CORRECT;
+	} elsif ($awarded<1) {
+	    return INCORRECT;
+	}
+	return CORRECT; 
     }
 
     if ($completionStatus == ATTEMPTED) {
@@ -4596,6 +4611,7 @@ my %compositeToSimple =
       NETWORK_FAILURE()       => ERROR,
       NOTHING_SET()           => CLOSED,
       CORRECT()               => CORRECT,
+      PARTIALLY_CORRECT()     => PARTIALLY_CORRECT,
       EXCUSED()               => CORRECT,
       PAST_DUE_NO_ANSWER()    => INCORRECT,
       PAST_DUE_ANSWER_LATER() => INCORRECT,