--- loncom/interface/lonnavmaps.pm	2010/05/18 20:30:08	1.444.2.1
+++ loncom/interface/lonnavmaps.pm	2011/10/10 17:36:56	1.444.2.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.444.2.1 2010/05/18 20:30:08 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.444.2.7 2011/10/10 17:36:56 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -509,7 +509,7 @@ my %statusIconMap =
 my %iconAltTags =   #texthash does not work here
     ( 'navmap.correct.gif'  => 'Correct',
       'navmap.wrong.gif'    => 'Incorrect',
-      'navmap.open.gif'     => 'Open',
+      'navmap.open.gif'     => 'Is Open',
       'navmap.partial.gif'  => 'Partially Correct',
       'navmap.ellipsis.gif' => 'Attempted',
      );
@@ -527,6 +527,7 @@ my %colormap =
       $resObj->INCORRECT              => '',
       $resObj->OPEN                   => '',
       $resObj->NOTHING_SET            => '',
+      $resObj->CREDIT_ATTEMPTED       => '',
       $resObj->ATTEMPTED              => '',
       $resObj->ANSWER_SUBMITTED       => '',
       $resObj->PARTIALLY_CORRECT      => '#006600'
@@ -640,7 +641,7 @@ sub getDescription {
         return &mt("Not currently assigned.");
     }
     if ($status == $res->OPEN_LATER) {
-        return &mt("Open ") .timeToHumanString($open,'start');
+        return &mt("Open [_1]",&timeToHumanString($open,'start'));
     }
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -674,22 +675,22 @@ sub getDescription {
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes ")."  " .timeToHumanString($due,'start');
+		return &mt("Closes [_1]",&timeToHumanString($due,'start'));
 	    } else {
-		return &mt("Due")."  " .timeToHumanString($due,'end');
+		return &mt("Due [_1]",&timeToHumanString($due,'end'));
 	    }
         } else {
             return &mt("Open, no due date");
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
-        return &mt("Answer open")." " .timeToHumanString($answer,'start');
+        return &mt("Answer open [_1]",&timeToHumanString($answer,'start'));
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
 	if ($res->is_practice()) {
-	    return &mt("Closed")." " . timeToHumanString($due,'start');
+	    return &mt("Closed [_1]",&timeToHumanString($due,'start'));
 	} else {
-	    return &mt("Was due")." " . timeToHumanString($due,'end');
+	    return &mt("Was due [_1]",&timeToHumanString($due,'end'));
 	}
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
@@ -706,6 +707,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);
@@ -717,7 +723,7 @@ sub getDescription {
             }
         }
         if ($due) {
-            return &mt("Due")." " . timeToHumanString($due,'end') .
+            return &mt("Due [_1]",&timeToHumanString($due,'end')) .
                 " $triesString";
         } else {
             return &mt("No due date")." $triesString";
@@ -802,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);
@@ -824,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().')';
 	}
@@ -968,10 +1006,10 @@ sub render_resource {
     }
 
     if ($resource->randomout()) {
-        $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
+        $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
     }
     if (!$resource->condval()) {
-        $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
+        $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
     }
     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
         $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
@@ -1126,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);
@@ -1442,11 +1480,11 @@ sub render {
 	my ($link,$text);
         if ($condition) {
 	    $link='navmaps?condition=0&amp;filter=&amp;'.$queryString.
-		'&here='.&escape($here);
+		'&amp;here='.&escape($here);
 	    $text='Close all folders';
         } else {
 	    $link='navmaps?condition=1&amp;filter=&amp;'.$queryString.
-		'&here='.&escape($here);
+		'&amp;here='.&escape($here);
 	    $text='Open all folders';
         }
         if ($env{'form.register'}) {
@@ -1498,23 +1536,20 @@ 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.='<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'}; 
@@ -1765,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
@@ -1827,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();
@@ -2354,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.
@@ -3890,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
@@ -3920,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
@@ -4675,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
@@ -4686,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;
@@ -4704,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;
 }
 
@@ -4793,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.
@@ -4866,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; 
@@ -4968,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_/);   
@@ -5058,6 +5124,7 @@ my %compositeToSimple =
       INCORRECT()             => INCORRECT,
       OPEN()                  => OPEN,
       ATTEMPTED()             => ATTEMPTED,
+      CREDIT_ATTEMPTED()      => CORRECT,
       ANSWER_SUBMITTED()      => ATTEMPTED
      );
 
@@ -5131,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;
 	}