--- loncom/interface/lonnavmaps.pm	2010/11/15 22:46:47	1.440.2.3
+++ loncom/interface/lonnavmaps.pm	2010/05/18 20:30:08	1.444.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.440.2.3 2010/11/15 22:46:47 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.444.2.1 2010/05/18 20:30:08 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,8 +700,8 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
+        if ($res->is_anonsurvey($part) || $res->is_survey($part)) {
+            return &mt("Survey submission recorded");
         } else {
             return &mt("Answer submitted, not yet graded");
         }
@@ -723,11 +724,7 @@ sub getDescription {
         }
     }
     if ($status == $res->ANSWER_SUBMITTED) {
-        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
-            return &mt('Question(s) submitted for review');
-        } else {
-            return &mt('Answer submitted');
-        }
+        return &mt('Answer submitted');
     }
 }
 
@@ -1045,7 +1042,7 @@ sub render_communication_status {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" />' .
+            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
             $linkclose;
     }
     
@@ -1055,7 +1052,7 @@ sub render_communication_status {
             if ($msgid) {
                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" /></a>';
+                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
             }
         }
     }
@@ -1069,7 +1066,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" /></a>';
+                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
             }
         }
     }
@@ -1444,19 +1441,22 @@ sub render {
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
 	my ($link,$text);
         if ($condition) {
-	    $link='"navmaps?condition=0&amp;filter=&amp;'.$queryString.
-		'&here='.&escape($here).'"';
+	    $link='navmaps?condition=0&amp;filter=&amp;'.$queryString.
+		'&here='.&escape($here);
 	    $text='Close all folders';
         } else {
-	    $link='"navmaps?condition=1&amp;filter=&amp;'.$queryString.
-		'&here='.&escape($here).'"';
+	    $link='navmaps?condition=1&amp;filter=&amp;'.$queryString.
+		'&here='.&escape($here);
 	    $text='Open all folders';
         }
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'};
+        }
 	if ($args->{'caller'} eq 'navmapsdisplay') {
 	    &add_linkitem($args->{'linkitems'},'changefolder',
-			  'location.href='.$link,$text);
+                          "location.href='$link'",$text);
 	} else {
-	    $result.='<a href='.$link.'>'.&mt($text).'</a>';
+            $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
 	}
         $result .= "\n";
     }
@@ -1472,6 +1472,9 @@ sub render {
 	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
 	<input type="hidden" name="navtime" value="$time" />
 END
+        if ($env{'form.register'}) {
+            $result .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />';
+        }
         if ($args->{'sort'} eq 'discussion') { 
 	    my $totdisc = 0;
 	    my $haveDisc = '';
@@ -1493,18 +1496,22 @@ END
 	$result.='</form>';
     }
 
-   
     if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.
-                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td>&nbsp;</td>';
-	$result.="<td class=\"LC_middle\">".mt('Tools:')."</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.='<td class="LC_middle">'.&mt('Tools:').'</td>';
 	$result.=&show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {
 	    if ($env{'environment.remotenavmap'} ne 'on') {
 		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
 		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
 	    } else {
-		$result.='</tr><tr><td align="left" colspan="4"><br />'.
+		$result.='</tr><tr><td align="left"><br />'.
 		    $args->{'sort_html'}.'</td></tr>';
 	    }
 	}
@@ -1845,79 +1852,38 @@ 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 = ("blank","launchnav","closenav","firsthomework",
+    my @linkorder = ("launchnav","closenav","firsthomework",
 		     "everything","uncompleted","changefolder","clearbubbles");
-    
-    my $result .=' 
-              <td align="left">
-                       <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";
+    my $result .='<td align="left">'."\n".
+                 '<span class="LC_nobreak">'."\n".
+                 '<ul id="LC_toolbar">';
     foreach my $link (@linkorder) {
-        my $link_id = "LC_content_toolbar_".$link;
-	if (defined($linkitems->{$link})) {
-	    if ($linkitems->{$link}{'text'} ne '') {
-		$linkitems->{$link}{'cmd'}=~s/"/'/g;
-		if($linkitems->{$link}{'cmd'}){
-                   if($link eq 'changefolder'){
-                      if($condition){$link_id='LC_content_toolbar_changefolder_toggled'}
-                      else{$link_id='LC_content_toolbar_changefolder'}
-                   }
-                          $result .=  ' <li><a href="#"'.
-			    	' onClick="'.$linkitems->{$link}{'cmd'}.'"'.
-                                ' id="'.$link_id.'"'.
-                                ' class="LC_toolbarItem"'.
-			   	' title="'.$linkitems->{$link}{'text'}.'"></a></li>'."\n";
-		}
-
-	    }
-	}
-    }
-    if ($env{'environment.remotenavmap'} eq 'on') {
-        if (&Apache::loncommon::needs_gci_custom()) {
-            if ($env{'request.course.id'} &&
-                &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                $result .= '<li><a target="loncapaclient" href="/adm/menu" id="LC_content_toolbar_management" class="LC_toolbarItem" title="'.&mt('Test Management').'" /></a></li>';
+        my $link_id = 'LC_content_toolbar_'.$link;
+        if (defined($linkitems->{$link})) {
+            if ($linkitems->{$link}{'text'} ne '') {
+                $linkitems->{$link}{'cmd'}=~s/"/'/g;
+                if ($linkitems->{$link}{'cmd'}) {
+                    if ($link eq 'changefolder') {
+                        if ($condition) {
+                            $link_id='LC_content_toolbar_changefolder_toggled';
+                        } else {
+                            $link_id='LC_content_toolbar_changefolder';
+                        }
+                    }
+                    $result .= '<li><a href="#" '.
+                               'onclick="'.$linkitems->{$link}{'cmd'}.'" '.
+                               'id="'.$link_id.'" '.
+                               'class="LC_toolbarItem" '.
+                               'title="'.$linkitems->{$link}{'text'}.'">'.
+                               '</a></li>'."\n";
+                }
             }
         }
     }
-    $result .= '</ul>';
-    $result .= ' </span></td>'."\n";
-	
+    $result .= '</ul>'.
+               '</span></td>'."\n";
     return $result;
 }
 
@@ -2388,7 +2354,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<getByMapPc>(map_pc):
+=item * B<getMapByMapPc>(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.
@@ -3543,7 +3509,11 @@ sub navHash {
     my $self = shift;
     my $param = shift;
     my $id = shift;
-    return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+    my $arg = $param . ($id?$self->{ID}:"");
+    if (defined($arg)) {
+        return $self->{NAV_MAP}->navhash($arg);
+    }
+    return;
 }
 
 =pod
@@ -3786,6 +3756,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();
@@ -3821,7 +3820,7 @@ 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)$/) {
@@ -3829,6 +3828,15 @@ sub is_survey {
     }
     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;
     my $src = $self->src();
@@ -3882,12 +3890,6 @@ 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
@@ -3918,11 +3920,6 @@ 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