--- loncom/interface/lonnavmaps.pm	2010/03/29 14:50:46	1.446
+++ loncom/interface/lonnavmaps.pm	2010/11/17 22:46:27	1.451
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.446 2010/03/29 14:50:46 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.451 2010/11/17 22:46:27 raeburn 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);
@@ -1401,11 +1407,11 @@ sub render {
 	my ($link,$text);
         if ($condition) {
 	    $link='navmaps?condition=0&filter=&'.$queryString.
-		'&here='.&escape($here);
+		'&here='.&escape($here);
 	    $text='Close all folders';
         } else {
 	    $link='navmaps?condition=1&filter=&'.$queryString.
-		'&here='.&escape($here);
+		'&here='.&escape($here);
 	    $text='Open all folders';
         }
         if ($env{'form.register'}) {
@@ -1715,7 +1721,7 @@ END
 	    if (defined($anchor)) { $anchor='#'.$anchor; }
 	    my $srcHasQuestion = $src =~ /\?/;
 	    $args->{"resourceLink"} = $src.
-		($srcHasQuestion?'&':'?') .
+		($srcHasQuestion?'&':'?') .
 		'symb=' . &escape($symb).$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
@@ -1777,12 +1783,11 @@ END
     # it's quite likely this might fix other browsers, too, and 
     # certainly won't hurt anything.
     if ($displayedJumpMarker) {
-        $result .= "
-<script>
+        $result .= &Apache::lonhtmlcommon::scripttag("
 if (location.href.indexOf('#curloc')==-1) {
     setTimeout(\"location += '#curloc';\", 0)
 }
-</script>";
+");
     }
 
     $result.=&Apache::loncommon::end_data_table();
@@ -1802,40 +1807,6 @@ sub add_linkitem {
     $$linkitems{$name}{'text'}=&mt($text);
 }
 
-sub show_linkitems {
-    my ($linkitems)=@_;
-    my @linkorder = ("blank","launchnav","closenav","firsthomework",
-		     "everything","uncompleted","changefolder","clearbubbles");
-    
-    my $result .= (<<ENDBLOCK);
-              <td align="left">
-<script type="text/javascript">
-    function changeNavDisplay () {
-	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
-ENDBLOCK
-    foreach my $link (@linkorder) {
-	$result.= "if (navchoice == '$link') {".
-	    $linkitems->{$link}{'cmd'}."}\n";
-    }
-    $result.='}
-              </script>
-                   <form name="linkitems" method="post">
-                       <span class="LC_nobreak"><select name="toplink">'."\n";
-    foreach my $link (@linkorder) {
-	if (defined($linkitems->{$link})) {
-	    if ($linkitems->{$link}{'text'} ne '') {
-		$result .= ' <option value="'.$link.'">'.
-		    $linkitems->{$link}{'text'}."</option>\n";
-	    }
-	}
-    }
-    $result .= '</select>&nbsp;<input type="button" name="chgnav"
-                   value="Go" onclick="javascript:changeNavDisplay()" />
-                </span></form></td>'."\n";
-	
-    return $result;
-}
-
 sub show_linkitems_toolbar {
     my ($linkitems,$condition)=@_;
     my @linkorder = ('firsthomework','everything','uncompleted',
@@ -2338,7 +2309,7 @@ resource object.
 Based on the symb of the resource, get a resource object for that
 resource. This is one of the proper ways to get a resource object.
 
-=item * B<getMapByMapPc>(map_pc):
+=item * B<getByMapPc>(map_pc):
 
 Based on the map_pc of the resource, get a resource object for
 the given map. This is one of the proper ways to get a resource object.
@@ -2608,7 +2579,7 @@ in the filter function.
 Retrieves version infomation for a url. Returns the version (a number, or 
 the string "mostrecent") for resources which have version information in  
 the big hash.
-    
+
 =cut
 
 
@@ -3494,7 +3465,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;
@@ -3874,6 +3845,12 @@ resource of the map.
 
 Returns a string with the type of the map in it.
 
+=item *B<map_hierarchy>:
+
+Returns a string with a comma-separated ordered list of map_pc IDs
+for the hierarchy of maps containing a map, with the top level
+map first, then descending to deeper levels, with the enclosing map last.
+
 =back
 
 =cut
@@ -3904,6 +3881,11 @@ sub map_type {
     my $pc = $self->map_pc();
     return $self->navHash("map_type_$pc", 0);
 }
+sub map_hierarchy {
+    my $self = shift;
+    my $pc = $self->map_pc();
+    return $self->navHash("map_hierarchy_$pc", 0);
+}
 
 #####
 # Property queries
@@ -4659,6 +4641,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
@@ -4670,6 +4656,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;
@@ -4688,6 +4675,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;
 }
 
@@ -4777,6 +4771,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.
@@ -4850,6 +4848,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; 
@@ -5042,6 +5044,7 @@ my %compositeToSimple =
       INCORRECT()             => INCORRECT,
       OPEN()                  => OPEN,
       ATTEMPTED()             => ATTEMPTED,
+      CREDIT_ATTEMPTED()      => CORRECT,
       ANSWER_SUBMITTED()      => ATTEMPTED
      );
 
@@ -5116,6 +5119,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;