--- loncom/interface/lonnavmaps.pm	2009/12/27 01:31:05	1.441
+++ loncom/interface/lonnavmaps.pm	2011/10/07 15:10:12	1.444.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.441 2009/12/27 01:31:05 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.444.2.6 2011/10/07 15:10:12 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 = 
     (
@@ -526,6 +527,7 @@ my %colormap =
       $resObj->INCORRECT              => '',
       $resObj->OPEN                   => '',
       $resObj->NOTHING_SET            => '',
+      $resObj->CREDIT_ATTEMPTED       => '',
       $resObj->ATTEMPTED              => '',
       $resObj->ANSWER_SUBMITTED       => '',
       $resObj->PARTIALLY_CORRECT      => '#006600'
@@ -699,7 +701,16 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        return &mt("Answer submitted, not yet graded");
+        if ($res->is_anonsurvey($part) || $res->is_survey($part)) {
+            return &mt("Survey submission recorded");
+        } else {
+            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);
@@ -797,14 +808,31 @@ sub timeToHumanString {
 
         # Less than an hour
         if ( $delta < $hour ) {
-            # If so, use minutes
+            # If so, use minutes; or minutes, seconds (if format requires)
             my $minutes = floor($delta / 60);
+            if (($format ne '') && ($format =~ /\%(T|S)/)) {
+                my $display;
+                if ($minutes == 1) {
+                    $display = "${prefix}1 minute";
+                } else {
+                    $display = "$prefix$minutes minutes";
+                }
+                my $seconds = $delta % $minute;
+                if ($seconds == 0) {
+                    $display .= $tense;
+                } elsif ($seconds == 1) {
+                    $display .= ", 1 second$tense";
+                } else {
+                    $display .= ", $seconds seconds$tense";
+                }
+                return $display;
+            }
             if ($minutes == 1) { return "${prefix}1 minute$tense"; }
             return "$prefix$minutes minutes$tense";
         }
         
         # Is it less than 24 hours away? If so,
-        # display hours + minutes
+        # display hours + minutes, (and + seconds, if format specified it)
         if ( $delta < $hour * 24) {
             my $hours = floor($delta / $hour);
             my $minutes = floor(($delta % $hour) / $minute);
@@ -819,15 +847,30 @@ sub timeToHumanString {
             if ($minutes == 0) {
                 $minuteString = "";
             }
+            if (($format ne '') && ($format =~ /\%(T|S)/)) {
+                my $display = "$prefix$hourString$minuteString";
+                my $seconds = $delta-(($hours * $hour)+($minutes * $minute));
+                if ($seconds == 0) {
+                    $display .= $tense;
+                } elsif ($seconds == 1) {
+                    $display .= ", 1 second$tense";
+                } else {
+                    $display .= ", $seconds seconds$tense";
+                }
+                return $display;
+            }
             return "$prefix$hourString$minuteString$tense";
         }
 
+        # Date/time is more than 24 hours away
+
 	my $dt = DateTime->from_epoch(epoch => $time)
 	                 ->set_time_zone(&Apache::lonlocal::gettimezone());
 
-	# If there's a caller supplied format, use it.
+	# If there's a caller supplied format, use it, unless it only displays
+        # H:M:S or H:M.
 
-	if ($format ne '') {
+        if (($format ne '') && ($format ne '%T') && ($format ne '%R')) {
 	    my $timeStr = $dt->strftime($format);
 	    return $timeStr.' ('.$dt->time_zone_short_name().')';
 	}
@@ -1037,7 +1080,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;
     }
     
@@ -1047,7 +1090,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>';
             }
         }
     }
@@ -1061,7 +1104,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>';
             }
         }
     }
@@ -1121,7 +1164,7 @@ sub render_long_status {
     }
     
     if ($resource->kind() eq "res" &&
-        ($resource->is_problem() || $resource->is_practice()) &&
+        $resource->is_raw_problem() &&
         !$firstDisplayed) {
         if ($color) {$result .= "<font color=\"$color\"><b>"; }
         $result .= getDescription($resource, $part);
@@ -1436,19 +1479,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.
+		'&amp;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.
+		'&amp;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";
     }
@@ -1464,6 +1510,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 = '';
@@ -1485,26 +1534,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>';
-	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'});
+                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td>&nbsp;</td>'.
+                   '<td class="LC_middle">'.&mt('Tools:').'</td>'.
+                   &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"><br />'.
-		    $args->{'sort_html'}.'</td></tr>';
-	    }
-	}
+	        $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 />'.
+                           $args->{'sort_html'}.'</td></tr>';
+            }
+        } else {
+            $result .= '</tr>';
+        }
         $result .= '</table>';
     } elsif ($args->{'sort_html'}) { 
         $result.=$args->{'sort_html'}; 
@@ -1755,7 +1800,7 @@ END
 	    if (defined($anchor)) { $anchor='#'.$anchor; }
 	    my $srcHasQuestion = $src =~ /\?/;
 	    $args->{"resourceLink"} = $src.
-		($srcHasQuestion?'&':'?') .
+		($srcHasQuestion?'&amp;':'?') .
 		'symb=' . &escape($symb).$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
@@ -1817,12 +1862,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();
@@ -1842,71 +1886,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\">";
-	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";
-		}
-
-	    }
-	}
+    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";
+                }
+            }
+        }
     }
-    $result .= '</ul>';
-    $result .= ' </span></td>'."\n";
-	
+    $result .= '</ul>'.
+               '</span></td>'."\n";
     return $result;
 }
 
@@ -2377,7 +2388,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.
@@ -3779,6 +3790,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();
@@ -3814,7 +3854,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)$/) {
@@ -3822,6 +3862,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();
@@ -3875,6 +3924,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
@@ -3905,6 +3960,12 @@ 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
@@ -4660,6 +4721,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
@@ -4671,6 +4736,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;
@@ -4689,6 +4755,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;
 }
 
@@ -4778,6 +4851,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.
@@ -4851,6 +4928,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; 
@@ -4953,7 +5034,7 @@ sub check_for_slot {
                 my $taskstatus = $self->taskstatus();
                 $is_correct = (($taskstatus eq 'pass') || 
                                ($self->solved() =~ /^correct_/));
-                $got_grade = ($self->solved() =~ /^(?:pass|fail)$/);
+                $got_grade = ($taskstatus =~ /^(?:pass|fail)$/);
             } else {
                 $got_grade = 1;
                 $is_correct = ($self->solved() =~ /^correct_/);   
@@ -5043,6 +5124,7 @@ my %compositeToSimple =
       INCORRECT()             => INCORRECT,
       OPEN()                  => OPEN,
       ATTEMPTED()             => ATTEMPTED,
+      CREDIT_ATTEMPTED()      => CORRECT,
       ANSWER_SUBMITTED()      => ATTEMPTED
      );
 
@@ -5116,8 +5198,9 @@ sub completable {
         # "If any of the parts are open, or have tries left (implies open),
         # and it is not "attempted" (manually graded problem), it is
         # not "complete"
-	if ($self->getCompletionStatus($part) == ATTEMPTED() ||
-	    $status == ANSWER_SUBMITTED() ) {
+        if ($self->getCompletionStatus($part) == ATTEMPTED() ||
+            $self->getCompletionStatus($part) == CREDIT_ATTEMPTED() ||
+            $status == ANSWER_SUBMITTED() ) {
 	    # did this part already, as well as we can
 	    next;
 	}