| \n");
@@ -1097,14 +1114,12 @@ sub new_handle {
$r->print(" ${newBranchText}${linkopen}$icon${linkclose}\n");
- my $nonLinkedText = "";
-
- if ($curRes->is_problem() && $part != "0" && !$condensed) {
+ if ($curRes->is_problem() && $part ne "0" && !$condensed) {
$partLabel = " (Part $part)";
$title = "";
}
if ($multipart && $condensed) {
- $nonLinkedText = ' (' . $curRes->countParts() . ' parts)';
+ $nonLinkedText .= ' (' . $curRes->countParts() . ' parts)';
}
$r->print(" $title$partLabel $nonLinkedText");
@@ -1142,12 +1157,13 @@ sub new_handle {
# columns?
my $firstDisplayed = !$condensed && $multipart && $part eq "0";
- # THIRD ROW: Problem status icon
+ # THIRD COL: Problem status icon
if ($curRes->is_problem() &&
!$firstDisplayed) {
my $icon = $statusIconMap{$curRes->status($part)};
+ my $alt = $iconAltTags{$icon};
if ($icon) {
- $r->print(" | $linkopen![](\"/adm/lonIcons/$icon\") $linkclose | \n");
+ $r->print("$linkopen$linkclose | \n");
} else {
$r->print(" | \n");
}
@@ -1155,7 +1171,7 @@ sub new_handle {
$r->print(" | \n");
}
- # FOURTH ROW: Text description
+ # FOURTH COL: Text description
$r->print("\n");
if ($curRes->kind() eq "res" &&
@@ -1163,6 +1179,9 @@ sub new_handle {
!$firstDisplayed) {
$r->print (getDescription($curRes, $part));
}
+ if ($curRes->is_map() && advancedUser() && $curRes->randompick()) {
+ $r->print('(randomly select ' . $curRes->randompick() .')');
+ }
$r->print(" |
\n");
}
@@ -1232,7 +1251,7 @@ sub getLinkForResource {
sub getDescription {
my $res = shift;
my $part = shift;
- my $status = $res->getDateStatus();
+ my $status = $res->status($part);
if ($status == $res->NETWORK_FAILURE) { return ""; }
if ($status == $res->NOTHING_SET) {
@@ -1260,6 +1279,9 @@ sub getDescription {
if ($status == $res->EXCUSED) {
return "Excused by instructor";
}
+ if ($status == $res->ATTEMPTED) {
+ return "Not yet graded.";
+ }
if ($status == $res->TRIES_LEFT) {
my $tries = $res->tries();
my $maxtries = $res->maxtries();
@@ -1273,6 +1295,10 @@ sub getDescription {
}
}
+sub advancedUser {
+ return $ENV{'user.adv'};
+}
+
# I want to change this into something more human-friendly. For
# now, this is a simple call to localtime. The final function
# probably belongs in loncommon.
@@ -1770,21 +1796,33 @@ sub new {
return $self;
}
+# FIXME: Document this.
+sub cancelTopRecursion {
+ my $self = shift;
+
+ if (!$self->{RECURSIVE_ITERATOR_FLAG}) {return;}
+
+ # is this the iterator we want to kill?
+ if ($self->{RECURSIVE_ITERATOR_FLAG} &&
+ !$self->{RECURSIVE_ITERATOR}->{RECURSIVE_ITERATOR_FLAG}) {
+ $self->{RECURSIVE_ITERATOR_FLAG} = 0;
+ undef $self->{RECURSIVE_ITERATOR};
+ return;
+ }
+
+ $self->{RECURSIVE_ITERATOR}->cancelTopRecursion();
+}
+
# Note... this function is *touchy*. I strongly recommend tracing
# through it with the debugger a few times on a non-trivial map before
# modifying it. Order is *everything*.
+# FIXME: Doc that skipMap will prevent the recursion, if any.
sub next {
my $self = shift;
+ my $skipMap = shift;
# Iterator logic goes here
- # Is this return value pre-determined?
- if (defined($self->{FORCE_NEXT})) {
- my $tmp = $self->{FORCE_NEXT};
- $self->{FORCE_NEXT} = undef;
- return $tmp;
- }
-
# Are we using a recursive iterator? If so, pull from that and
# watch the depth; we want to resume our level at the correct time.
if ($self->{RECURSIVE_ITERATOR_FLAG})
@@ -1804,6 +1842,13 @@ sub next {
return $next;
}
+ # Is this return value pre-determined?
+ if (defined($self->{FORCE_NEXT})) {
+ my $tmp = $self->{FORCE_NEXT};
+ $self->{FORCE_NEXT} = undef;
+ return $tmp;
+ }
+
# Is there a current resource to grab? If not, then return
# END_BRANCH and END_MAP in succession.
if (scalar(@{$self->{BRANCH_STACK}}) == 0) {
@@ -1892,7 +1937,6 @@ sub next {
$self->{FORCE_NEXT} = $self->END_BRANCH();
$self->{BRANCH_DEPTH}--;
}
- return $self->{HERE};
}
while (@$next) {
@@ -1908,15 +1952,12 @@ sub next {
}
# If this is a map and we want to recurse down it... (not filtered out)
- if ($self->{HERE}->is_map() &&
+ if ($self->{HERE}->is_map() && !$skipMap &&
(defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
$self->{RECURSIVE_ITERATOR_FLAG} = 1;
my $firstResource = $self->{HERE}->map_start();
my $finishResource = $self->{HERE}->map_finish();
- # Odd perl syntax here; $self->new allows one to create a new iterator
- # can't figure out how to ref this package directly correctly
- # isn't MAIN::new, __PACKAGE__::new or Apache::lonnavmaps::iterator->new
$self->{RECURSIVE_ITERATOR} =
Apache::lonnavmaps::iterator->new ($self->{NAV_MAP}, $firstResource,
$finishResource, $self->{FILTER}, $self->{ALREADY_SEEN},
@@ -2038,6 +2079,12 @@ sub goesto { my $self=shift; return $sel
sub to { my $self=shift; return $self->navHash("to_", 1); }
sub kind { my $self=shift; return $self->navHash("kind_", 1); }
sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }
+sub randomout { my $self=shift; return $self->navHash("randomout_", 1); }
+sub randompick {
+ my $self = shift;
+ return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .
+ '.0.parameter_randompick'};
+}
sub src {
my $self=shift;
return $self->navHash("src_", 1);
@@ -2452,6 +2499,8 @@ B