--- loncom/interface/lonnavmaps.pm	2004/08/31 15:28:03	1.285
+++ loncom/interface/lonnavmaps.pm	2004/09/29 19:13:20	1.298
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.285 2004/08/31 15:28:03 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.298 2004/09/29 19:13:20 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"); 
@@ -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;
@@ -370,7 +370,7 @@ ENDSUBM
                             return $res->completable() || $res->is_map();
                         };
 	&add_linkitem(\%toplinkitems,'everything',
-		     'location.href="locatnavmaps?sort='.$ENV{'form.sort'}.'"',
+		     'location.href="navmaps?sort='.$ENV{'form.sort'}.'"',
 		      "Show Everything");
         $r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>");
         $ENV{'form.filter'} = '';
@@ -392,6 +392,7 @@ ENDSUBM
                        <option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
                        <option value=\"title\"   $selected{'title'}  >".&mt('Title')."</option>
                        <option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
+                       <option value=\"discussion\" $selected{'discussion'}>".&mt('Has Discussion')."</option>
                     </select>
                  </nobr>
                </form>");
@@ -1034,10 +1035,10 @@ sub render_resource {
 
     my $partLabel = "";
     my $newBranchText = "";
-    
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";
+        $newBranchText = "<img src='$location/branch.gif' border='0' />";
     }
 
     # links to open and close the folder
@@ -1045,17 +1046,16 @@ sub render_resource {
     my $linkclose = "</a>";
 
     # Default icon: unknown page
-    my $icon = "<img src='/adm/lonIcons/unknown.gif' alt='' border='0' />";
+    my $icon = "<img src='$location/unknown.gif' alt='' border='0' />";
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';
+            $icon ='<img src="'.$location.'/problem.gif" alt="" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
     } else {
-	$icon = "<img src='".&Apache::loncommon::icon($resource->src).
-	    "' alt='' border='0' />";
+	$icon = "<img src='".&Apache::loncommon::lonhttpdurl(&Apache::loncommon::icon($resource->src))."' alt='' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -1070,7 +1070,7 @@ sub render_resource {
 
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='' border='0' />";
 
             $linkopen = "<a href='" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
@@ -1087,7 +1087,7 @@ sub render_resource {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='' border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -1155,10 +1155,10 @@ sub render_communication_status {
     my $link = $params->{"resourceLink"};
     my $linkopen = "<a href='$link'>";
     my $linkclose = "</a>";
-
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img border="0" src="/adm/lonMisc/chat.gif" />' .
+            '<img border="0" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -1168,7 +1168,7 @@ sub render_communication_status {
             if ($_) {
                 $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/feedback.gif" '
+                    . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1183,7 +1183,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/bomb.gif" '
+                    . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1212,7 +1212,9 @@ sub render_quick_status {
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
         if ($icon) {
-            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='/adm/lonIcons/$icon' border='0' alt='$alt' />$linkclose</td>\n";
+	    my $location=
+		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
+            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
         } else {
             $result .= "<td width='30'>&nbsp;</td>\n";
         }
@@ -1343,11 +1345,17 @@ sub setDefault {
     return $val;
 }
 
+sub cmp_title {
+    my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle));
+    $atitle=~s/^\s*//;
+    $btitle=~s/^\s*//;
+    return $atitle cmp $btitle;
+}
+
 sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     my $result = '';
-
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
@@ -1428,7 +1436,7 @@ sub render {
         # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count
         # for the jump marker with this loop.
-        while (($curRes = $mapIterator->next()) && !$found) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found) {
             if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
@@ -1504,23 +1512,24 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-    
+
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
         my $date=localtime;
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
+	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('New discussion since').' '.
+                '<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
+                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').
+                '<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
                 '</td>'; 
         }
 
@@ -1549,34 +1558,41 @@ sub render {
 
     # Check for any unread discussions in all resources.
     if ($args->{'caller'} eq 'navmapsdisplay') {
-	my $totdisc = 0;
-	my $haveDisc = '';
-	my @allres=$navmap->retrieveResources();
-	foreach my $resource (@allres) {
-	    if ($resource->hasDiscussion()) {
-		my $ressymb;
-		if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
-		    $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-		} else {
-		    $ressymb = $resource->symb();
+	&add_linkitem($args->{'linkitems'},'clearbubbles',
+		      'document.clearbubbles.submit()',
+		      'Mark all posts read');
+	my $time=time;
+	$result .= (<<END);
+    <form name="clearbubbles" method="post" action="/adm/feedback">
+	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navtime" value="$time" />
+END
+        if ($args->{'sort'} eq 'discussion') { 
+	    my $totdisc = 0;
+	    my $haveDisc = '';
+	    my @allres=$navmap->retrieveResources();
+	    foreach my $resource (@allres) {
+		if ($resource->hasDiscussion()) {
+		    my $ressymb;
+		    if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
+			$ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+		    } else {
+			$ressymb = $resource->symb();
+		    }
+		    $haveDisc .= $ressymb.':';
+		    $totdisc ++;
 		}
-		$haveDisc .= $ressymb.':';
-		$totdisc ++;
 	    }
-	}
-	if ($totdisc > 0) {
-	    $haveDisc =~ s/:$//;
-            my $navurl = $ENV{'QUERY_STRING'};
-	    &add_linkitem($args->{'linkitems'},'clearbubbles',
-			  'document.clearbubbles.submit()',
-			  'Mark all posts read');
-            $result .= (<<END);
-		<form name="clearbubbles" method="post" action="/adm/feedback">
-		<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
-		<input type="hidden" name="navmaps" value="$haveDisc" />
-		</form>
+	    if ($totdisc > 0) {
+		$haveDisc =~ s/:$//;
+		my $navurl = $ENV{'QUERY_STRING'};
+		$result .= (<<END);
+	<input type="hidden" name="navmaps" value="$haveDisc" />
+    </form>
 END
+            }
 	}
+	$result.='</form>';
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
@@ -1624,7 +1640,9 @@ END
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
     $args->{'condensed'} = 0;    
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='/adm/lonIcons/whitespace1.gif' width='25' height='1' alt='' border='0' />");
+    my $location=
+	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
+    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='' border='0' />");
     $args->{'displayedHereMarker'} = 0;
 
     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
@@ -1685,18 +1703,35 @@ END
 		return &$oldFilterFunc($res);
 	    };
 	@resources=$navmap->retrieveResources(undef,$filterFunc);
-	@resources= sort {lc($a->compTitle) cmp lc($b->compTitle)} @resources;
+	@resources= sort { &cmp_title($a,$b) } @resources;
     } elsif ($args->{'sort'} eq 'duedate') {
-	@resources=$navmap->retrieveResources(undef,
-					       sub { shift->is_problem(); });
-	@resources= sort
-	{
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->is_problem()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort {
 	    if ($a->duedate ne $b->duedate) {
 	        return $a->duedate cmp $b->duedate;
-	    } else {
-		lc($a->compTitle) cmp lc($b->compTitle)
 	    }
+	    my $value=&cmp_title($a,$b);
+	    return $value;
 	} @resources;
+    } elsif ($args->{'sort'} eq 'discussion') {
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->hasDiscussion() &&
+		    !$res->getFeedback() &&
+		    !$res->getErrors()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort { &cmp_title($a,$b) } @resources;
     } else {
 	#unknow sort mechanism or default
 	undef($args->{'sort'});
@@ -1947,6 +1982,7 @@ ENDBLOCK
     $result .= '</select>&nbsp;<input type="button" name="chgnav"
                    value="Go" onClick="javascript:changeNavDisplay()" />
                 </nobr></form></td>'."\n";
+	
     return $result;
 }
 
@@ -2156,17 +2192,11 @@ sub generate_email_discuss_status {
     
     foreach my $msgid (split(/\&/, $keys)) {
 	$msgid=&Apache::lonnet::unescape($msgid);
-	my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-	    my ($what,$url)=($1,$2);
-	    my %status=
-		&Apache::lonnet::get('email_status',[$msgid]);
-	    if ($status{$msgid}=~/^error\:/) { 
-		$status{$msgid}=''; 
-	    }
-	    
-	    if (($status{$msgid} eq 'new') || 
-		(!$status{$msgid})) { 
+	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+	    my $plain=
+		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
+	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
+		my ($what,$url)=($1,$2);
 		if ($what eq 'Error') {
 		    $error{$url}.=','.$msgid; 
 		} else {
@@ -2176,8 +2206,10 @@ sub generate_email_discuss_status {
 	}
     }
     
+    #url's of resources that have feedbacks
     $self->{FEEDBACK} = \%feedback;
-    $self->{ERROR_MSG} = \%error; # what is this? JB
+    #or errors
+    $self->{ERROR_MSG} = \%error;
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
     $self->{LAST_READ} = \%lastreadtime;
@@ -3900,6 +3932,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
@@ -3946,6 +3988,26 @@ sub countParts {
     return scalar(@{$parts}); # + $delta;
 }
 
+sub countResponses {
+    my $self = shift;
+    my $count;
+    foreach my $part (@{$self->parts()}) {
+        $count+= scalar($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;
@@ -4049,8 +4111,6 @@ sub extractParts {
         # So we have to use our knowlege of part names to figure out 
         # where the part names begin and end, and even then, it is possible
         # to construct ambiguous situations.
-        #
-        my %response_type_by_id;
         foreach (split /,/, $metadata) {
             if ($_ =~ /^([a-zA-Z]+)response_(.*)/) {
                 my $responseType = $1;
@@ -4066,7 +4126,6 @@ sub extractParts {
                         my $responseId = join('_', @otherChunks);
                         push @{$responseIdHash{$partIdSoFar}}, $responseId;
                         push @{$responseTypeHash{$partIdSoFar}}, $responseType;
-                        $response_type_by_id{$responseId} = $responseType;
                     }
                 }
             }
@@ -4077,25 +4136,24 @@ sub extractParts {
 	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;
 	    }
 	}
-        #
-        # Reorder the response types
-        foreach my $partid (keys(%responseIdHash)) {
-            delete($responseTypeHash{$partid});
-            foreach my $respid (@{$responseIdHash{$partid}}) {
-                push(@{$responseTypeHash{$partid}},
-                     $response_type_by_id{$respid});
-            }
-        }
         $self->{RESPONSE_IDS} = \%responseIdHash;
         $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }
@@ -4289,6 +4347,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; }