--- loncom/interface/lonnavmaps.pm	2004/08/29 04:09:27	1.282
+++ loncom/interface/lonnavmaps.pm	2004/09/18 16:55:33	1.292
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.282 2004/08/29 04:09:27 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.292 2004/09/18 16:55:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,7 +127,7 @@ sub nav_control_js {
 
 function gonav(url) {
    if (w_loncapanav_flag != 1) {
-      go(url);
+      gopost(url,'');
    }  else {
       navwindow=window.open(url,
                   "loncapanav","height=600,width=400,scrollbars=1"); 
@@ -262,13 +262,13 @@ ENDSUBM
               &Apache::loncommon::bodytag('Navigate Course Contents','',
 					  $addentries,$body_only,'',
 					  $ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>'.
-	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+    $r->print('<script>window.focus();</script>');
      
     $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('<font size="+2" color="red">Coursemap undefined.</font>' .
                   '</body></html>');
         return OK;
@@ -354,7 +354,7 @@ ENDSUBM
     } else {
 	&add_linkitem(\%toplinkitems,'firsthomework',
 		      'location.href="navmaps?jumpToFirstHomework"',
-		      "Go To My First Homework Problem");
+		      "Show Me My First Homework Problem");
     }
 
     my $suppressEmptySequences = 0;
@@ -396,7 +396,7 @@ ENDSUBM
                  </nobr>
                </form>");
     # renderer call
-    my $renderArgs = { 'cols' => [0,2,3],
+    my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $ENV{'form.sort'},
                        'url' => '/adm/navmaps',
                        'navmap' => $navmap,
@@ -1580,6 +1580,13 @@ END
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
+        $result .= '<table><tr><td>'.
+                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+	if ($ENV{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
+        } else {
+	    $result .= '</tr><tr>'; 
+        }
 	$result.=&show_linkitems($args->{'linkitems'});
         if ($args->{'sort_html'}) {
 	    if ($ENV{'environment.remotenavmap'} ne 'on') {
@@ -1678,7 +1685,12 @@ END
 		return &$oldFilterFunc($res);
 	    };
 	@resources=$navmap->retrieveResources(undef,$filterFunc);
-	@resources= sort {lc($a->compTitle) cmp lc($b->compTitle)} @resources;
+	@resources= sort {
+	    my ($atitle,$btitle) = (lc($a->compTitle),lc($b->compTitle));
+	    $atitle=~s/^\s*//;
+	    $btitle=~s/^\s*//;
+	    return $atitle cmp $btitle
+	    } @resources;
     } elsif ($args->{'sort'} eq 'duedate') {
 	@resources=$navmap->retrieveResources(undef,
 					       sub { shift->is_problem(); });
@@ -1916,6 +1928,7 @@ sub show_linkitems {
 		     "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;
@@ -1926,7 +1939,6 @@ ENDBLOCK
     }
     $result.='}
               </script>
-              <table><tr><td align="left">
                    <form name="linkitems" method="post">
                        <nobr><select name="toplink">'."\n";
     foreach my $link (@linkorder) {
@@ -3893,6 +3905,16 @@ Returns the number of parts of the probl
 for single part problems, returns 1. For multipart, it returns the
 number of parts in the problem, not including psuedo-part 0. 
 
+=item * B<countResponses>():
+
+Returns the total number of responses in the problem a student can answer.
+
+=item * B<responseTypes>():
+
+Returns a hash whose keys are the response types.  The values are the number 
+of times each response type is used.  This is for the I<entire> problem, not 
+just a single part.
+
 =item * B<multipart>():
 
 Returns true if the problem is multipart, false otherwise. Use this instead
@@ -3939,6 +3961,26 @@ sub countParts {
     return scalar(@{$parts}); # + $delta;
 }
 
+sub countResponses {
+    my $self = shift;
+    my $count;
+    foreach my $part ($self->parts()) {
+        $count+= $self->responseIds($part);
+    }
+    return $count;
+}
+
+sub responseTypes {
+    my $self = shift;
+    my %responses;
+    foreach my $part ($self->parts()) {
+        foreach my $responsetype ($self->responseType($part)) {
+            $responses{$responsetype}++ if (defined($responsetype));
+        }
+    }
+    return %responses;
+}
+
 sub multipart {
     my $self = shift;
     return $self->countParts() > 1;
@@ -4026,6 +4068,7 @@ sub extractParts {
         }
         
 
+        # These hashes probably do not need names that end with "Hash"....
         my %responseIdHash;
         my %responseTypeHash;
 
@@ -4061,17 +4104,27 @@ sub extractParts {
             }
         }
 	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+        #
+        # Reorder the arrays in the %responseIdHash and %responseTypeHash
 	if ($resorder) {
 	    my @resorder=split(/,/,$resorder);
 	    foreach my $part (keys(%responseIdHash)) {
-		my %resids = map { ($_,1) } @{ $responseIdHash{$part} };
+		my $i=0;
+		my %resids = map { ($_,$i++) } @{ $responseIdHash{$part} };
 		my @neworder;
 		foreach my $possibleid (@resorder) {
 		    if (exists($resids{$possibleid})) {
-			push(@neworder,$possibleid);
+			push(@neworder,$resids{$possibleid});
 		    }
 		}
-		$responseIdHash{$part}=\@neworder;	
+		my @ids;
+		my @type;
+		foreach my $element (@neworder) {
+		    push (@ids,$responseIdHash{$part}->[$element]);
+		    push (@type,$responseTypeHash{$part}->[$element]);
+		}
+		$responseIdHash{$part}=\@ids;
+		$responseTypeHash{$part}=\@type;
 	    }
 	}
         $self->{RESPONSE_IDS} = \%responseIdHash;
@@ -4267,6 +4320,7 @@ sub getCompletionStatus {
 
     # 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 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }