--- loncom/interface/lonnavmaps.pm 2009/11/23 14:56:07 1.439
+++ loncom/interface/lonnavmaps.pm 2010/11/15 22:46:47 1.440.2.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.439 2009/11/23 14:56:07 wenzelju Exp $
+# $Id: lonnavmaps.pm,v 1.440.2.3 2010/11/15 22:46:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -699,7 +699,11 @@ sub getDescription {
return &mt("Excused by instructor");
}
if ($status == $res->ATTEMPTED) {
- return &mt("Answer submitted, not yet graded");
+ if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
+ return &mt('Question(s) submitted for review');
+ } else {
+ return &mt("Answer submitted, not yet graded");
+ }
}
if ($status == $res->TRIES_LEFT) {
my $tries = $res->tries($part);
@@ -719,7 +723,11 @@ sub getDescription {
}
}
if ($status == $res->ANSWER_SUBMITTED) {
- return &mt('Answer submitted');
+ if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
+ return &mt('Question(s) submitted for review');
+ } else {
+ return &mt('Answer submitted');
+ }
}
}
@@ -1488,12 +1496,7 @@ END
if ($args->{'caller'} eq 'navmapsdisplay') {
$result .= '
'.
- &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').' | ';
- if ($env{'environment.remotenavmap'} ne 'on') {
- $result .= ' | ';
- } else {
- $result .= '
';
- }
+ &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').' | ';
$result.="".mt('Tools:')." | ";
$result.=&show_linkitems_toolbar($args->{'linkitems'});
if ($args->{'sort_html'}) {
@@ -1501,7 +1504,7 @@ END
$result.=' | | | '.
''.$args->{'sort_html'}.' |
';
} else {
- $result.=' '.
+ $result.=' |
'.
$args->{'sort_html'}.' |
';
}
}
@@ -1528,7 +1531,6 @@ END
( $res->NETWORK_FAILURE => 1,
$res->NOTHING_SET => 1,
$res->CORRECT => 1 );
- my @backgroundColors = ("LC_trEven", "LC_trOdd");
# Shared variables
$args->{'counter'} = 0; # counts the rows
@@ -1763,7 +1765,6 @@ END
# show them.
foreach my $part (@parts) {
$rownum ++;
- my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)];
$result .= &Apache::loncommon::start_data_table_row();
@@ -1886,7 +1887,7 @@ sub show_linkitems_toolbar {
my $result .='
'."\n';
$result .= ' | '."\n";
@@ -2379,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(map_pc):
+=item * B(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.
@@ -3873,6 +3882,12 @@ resource of the map.
Returns a string with the type of the map in it.
+=item *B:
+
+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
@@ -3903,6 +3918,11 @@ 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