: The standard Apache response object. If you pass this to the render, it will use it to flush the table every 20 rows and handle the rendering itself.
+
=back
=head2 Additional Info
@@ -1061,24 +699,6 @@ sub long_status { return 3; }
# Data for render_resource
-my $resObj = 'Apache::lonnavmaps::resource';
-# Defines a status->color mapping, null string means don't color
-my %colormap =
- ( $resObj->NETWORK_FAILURE => '',
- $resObj->CORRECT => '',
- $resObj->EXCUSED => '#3333FF',
- $resObj->PAST_DUE_ANSWER_LATER => '',
- $resObj->PAST_DUE_NO_ANSWER => '',
- $resObj->ANSWER_OPEN => '#006600',
- $resObj->OPEN_LATER => '',
- $resObj->TRIES_LEFT => '',
- $resObj->INCORRECT => '',
- $resObj->OPEN => '',
- $resObj->NOTHING_SET => '' );
-# And a special case in the nav map; what to do when the assignment
-# is not yet done and due in less then 24 hours
-my $hurryUpColor = "#FF0000";
-
sub render_resource {
my ($resource, $part, $params) = @_;
@@ -1137,7 +757,7 @@ sub render_resource {
. $params->{'hereType'} . '&here=' .
&Apache::lonnet::escape($params->{'here'}) .
'&jumpType=' . SYMB() . '&jump=' .
- &Apache::lonnet::escape($params->{$resource->symb()}) . "'>";
+ &Apache::lonnet::escape($resource->symb()) . "'>";
}
if ($resource->randomout()) {
@@ -1227,11 +847,59 @@ sub render_communication_status {
}
sub render_quick_status {
my ($resource, $part, $params) = @_;
- return "| quick_status | ";
+ my $result = "";
+ my $firstDisplayed = !$params->{'condensed'} &&
+ $params->{'multipart'} && $part eq "0";
+
+ my $link = $params->{"resourceLink"};
+ my $linkopen = "";
+ my $linkclose = "";
+
+ if ($resource->is_problem() &&
+ !$firstDisplayed) {
+ my $icon = $statusIconMap{$resource->status($part)};
+ my $alt = $iconAltTags{$icon};
+ if ($icon) {
+ $result .= "$linkopen $linkclose | \n";
+ } else {
+ $result .= " | \n";
+ }
+ } else { # not problem, no icon
+ $result .= " | \n";
+ }
+
+ return $result;
}
sub render_long_status {
my ($resource, $part, $params) = @_;
- return "long_status | ";
+ my $result = "\n";
+ my $firstDisplayed = !$params->{'condensed'} &&
+ $params->{'multipart'} && $part eq "0";
+
+ my $color;
+ if ($resource->is_problem()) {
+ $color = $colormap{$resource->status};
+
+ if (dueInLessThen24Hours($resource, $part) ||
+ lastTry($resource, $part)) {
+ $color = $hurryUpColor;
+ }
+ }
+
+ if ($resource->kind() eq "res" &&
+ $resource->is_problem() &&
+ !$firstDisplayed) {
+ if ($color) {$result .= ""; }
+ $result .= getDescription($resource, $part);
+ if ($color) {$result .= ""; }
+ }
+ if ($resource->is_map() && advancedUser() && $resource->randompick()) {
+ $result .= '(randomly select ' . $resource->randompick() .')';
+ }
+
+ $result .= " | \n";
+
+ return $result;
}
my @preparedColumns = (\&render_resource, \&render_communication_status,
@@ -1264,9 +932,15 @@ sub render {
my $jumpToSymb = $args->{'jumpToSymb'};
my $hereURL = $args->{'hereURL'};
my $hereSymb = $args->{'hereSymb'};
+ # keeps track of when the current resource is found,
+ # so we can back up a few and put the anchor above the
+ # current resource
+ my $currentJumpIndex = setDefault($args->{'currentJumpIndex'}, 0);
+ my $currentJumpDelta = 2; # change this to change how many resources are displayed
+ # before the current resource when using #current
+ my $r = $args->{'r'};
+
- #if (defined($jumpToURL)) {
- # $args->{'jumpType'} =
# End parameter setting
@@ -1278,11 +952,6 @@ sub render {
$res->NOTHING_SET => 1,
$res->CORRECT => 1 );
my @backgroundColors = ("#FFFFFF", "#F6F6F6");
- my $currentJumpIndex = 0; # keeps track of when the current resource is found,
- # so we can back up a few and put the anchor above the
- # current resource
- my $currentJumpDelta = 2; # change this to change how many resources are displayed
- # before the current resource when using #current
# Shared variables
$args->{'counter'} = 0; # counts the rows
@@ -1421,40 +1090,44 @@ sub render {
my $srcHasQuestion = $src =~ /\?/;
$args->{"resourceLink"} = $src.
($srcHasQuestion?'&':'?') .
- 'symb=' . &Apache::lonnet::escape($curRes->symb()).
- '"';
+ 'symb=' . &Apache::lonnet::escape($curRes->symb());
# Now, display each column.
foreach my $col (@$cols) {
+ my $colHTML = '';
+ if (ref($col)) {
+ $colHTML .= &$col($curRes, $part, $args);
+ } else {
+ $colHTML .= &{$preparedColumns[$col]}($curRes, $part, $args);
+ }
# If this is the first column and it's time to print
# the anchor, do so
if ($col == $cols->[0] &&
$args->{'counter'} == $args->{'currentJumpIndex'} -
- $args->{'currentJumpDelta'}) {
- $result .= '';
+ $currentJumpDelta) {
+ # Jam the anchor after the tag;
+ # necessary for valid HTML (which Mozilla requires)
+ $colHTML =~ s/\>/\>\/;
$displayedJumpMarker = 1;
}
-
-
- if (ref($col)) {
- $result .= &$col($curRes, $part, $args);
- } else {
- $result .= &{$preparedColumns[$col]}($curRes, $part, $args);
- }
-
+ $result .= $colHTML . "\n";
}
-
- $result .= " \n";
+ $result .= " \n";
+ }
+
+ if ($r && $rownum % 20 == 0) {
+ $r->print($result);
+ $result = "";
+ $r->rflush();
}
-
$curRes = $it->next();
}
# Print out the part that jumps to #curloc if it exists
- if ($args->{"displayedJumpMarker"}) {
- $result .= "\n";
+ if ($displayedJumpMarker) {
+ $result .= "\n";
}
$result .= "";
@@ -2205,7 +1878,9 @@ sub next {
# If this is a blank resource, don't actually return it.
# Should you ever find you need it, make sure to add an option to the code
# that you can use; other things depend on this behavior.
- if (!$self->{HERE}->src() || !$self->{HERE}->browsePriv()) {
+ my $browsePriv = $self->{HERE}->browsePriv();
+ if (!$self->{HERE}->src() ||
+ (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
return $self->next();
}
| 
";
-
- my $isNewBranch = 0;
- my $now = time();
- my $in24Hours = $now + 24 * 60 * 60;
- my $displayedHereMarker = 0;
- my $displayedJumpMarker = 0;
-
- # We know the first thing is a BEGIN_MAP (see "$self->{STARTED}"
- # code in iterator->next), so ignore the first one
- $mapIterator = $navmap->getIterator(undef, undef, \%filterHash,
- $condition);
- $mapIterator->next();
- $curRes = $mapIterator->next();
- $depth = 1;
-
- my @backgroundColors = ("#FFFFFF", "#F6F6F6");
- my $rowNum = 0;
-
- $counter = 0;
-
- while ($depth > 0) {
- if ($curRes == $mapIterator->BEGIN_MAP() ||
- $curRes == $mapIterator->BEGIN_BRANCH()) {
- $indentLevel++;
- }
- if ($curRes == $mapIterator->END_MAP() ||
- $curRes == $mapIterator->END_BRANCH()) {
- $indentLevel--;
- }
- if ($curRes == $mapIterator->BEGIN_BRANCH()) {
- $isNewBranch = 1;
- }
- if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
- if ($curRes == $mapIterator->END_MAP()) { $depth--; }
-
- if (ref($curRes)) { $counter++; }
-
- if (ref($curRes)) {
-
- my $deltalevel = $isNewBranch? 1 : 0; # reserves space for branch icon
-
- if ($indentLevel - $deltalevel < 0) {
- # If this would be at a negative depth (top-level maps in
- # new-style courses, we want to suppress their title display)
- # then ignore it.
- $curRes = $mapIterator->next();
- next;
- }
-
- # Step one: Decide which parts to show
- my @parts = @{$curRes->parts()};
- my $multipart = scalar(@parts) > 1;
- my $condensed = 0;
-
- if ($curRes->is_problem()) {
-
- # Is it multipart?
- if ($multipart) {
- # If it's multipart, see if part 0 is "open"
- # if it is, display all parts, if it isn't,
- # just display first
- if (!$curRes->opendate("0")) {
- # no parts are open, display as one part
- @parts = ("0");
- $condensed = 1;
- } else {
- # Otherwise, only display part 0 if we want to
- # attach feedback or email information to it
- if ($curRes->hasDiscussion() || $curRes->getFeedback()) {
- # Is this right? I think this will toss it
- # if it DOES have discussion, not if it doesn't?
- # - Jeremy (yes, commenting on his own code)
- shift @parts;
- } else {
- # Now, we decide whether to condense the
- # parts due to similarity
- my $status = $curRes->status($parts[1]);
- my $due = $curRes->duedate($parts[1]);
- my $open = $curRes->opendate($parts[1]);
- my $statusAllSame = 1;
- my $dueAllSame = 1;
- my $openAllSame = 1;
- for (my $i = 2; $i < scalar(@parts); $i++) {
- if ($curRes->status($parts[$i]) != $status){
- $statusAllSame = 0;
- }
- if ($curRes->duedate($parts[$i]) != $due ) {
- $dueAllSame = 0;
- }
- if ($curRes->opendate($parts[$i]) != $open) {
- $openAllSame = 0;
- }
- }
-
- # $*allSame is true if all the statuses were
- # the same. Now, if they are all the same and
- # match one of the statuses to condense, or they
- # are all open with the same due date, or they are
- # all OPEN_LATER with the same open date, display the
- # status of the first non-zero part (to get the 'correct'
- # status right, since 0 is never 'correct' or 'open').
- if (($statusAllSame && defined($condenseStatuses{$status})) ||
- ($dueAllSame && $status == $curRes->OPEN && $statusAllSame)||
- ($openAllSame && $status == $curRes->OPEN_LATER && $statusAllSame) ){
- @parts = ($parts[1]);
- $condensed = 1;
- }
- }
- }
- }
-
- } else {
- $parts[0] = "0"; # this is to get past foreach loop below
- # you can consider a non-problem resource as a resource
- # with only one part without loss, and it simplifies the looping
- }
-
- # Is it a multipart problem with a single part, now in
- # @parts with "0" filtered out? If so, 'forget' it's a multi-part
- # problem and treat it like a single-part problem.
- if ( scalar(@parts) == 1 ) {
- $multipart = 0;
- }
-
- # Display one part, in event of network error.
- # If this is a single part, we can at least show the correct
- # status, but if it's multipart, we're lost, since we can't
- # retreive the metadata to count the parts
- if ($curRes->{RESOURCE_ERROR}) {
- @parts = ("0");
- }
-
- # Step Two: Print the actual data.
-
- # For each part we intend to display...
- foreach my $part (@parts) {
-
- my $nonLinkedText = ""; # unlinked stuff after title
-
- my $stack = $mapIterator->getStack();
- my $src = getLinkForResource($stack);
-
- # Pass the correct symb on the querystring, so the
- # remote will figure out where we are if we click a link
- my $srcHasQuestion = $src =~ /\?/;
- my $link = $src.
- ($srcHasQuestion?'&':'?') .
- 'symb='.&Apache::lonnet::escape($curRes->symb()).
- '"';
-
- my $title = $curRes->compTitle();
- if ($src=~/^\/uploaded\//) {
- $nonLinkedText=$title;
- $title='';
- }
- my $partLabel = "";
- my $newBranchText = "";
-
- # If this is a new branch, label it so
- if ($isNewBranch) {
- $newBranchText = "![](\"/adm/lonIcons/branch.gif\")
";
- $isNewBranch = 0;
- }
-
- # links to open and close the folders
- my $linkopen = "";
- my $linkclose = "";
-
- my $icon = "![\"\"](\"/adm/lonIcons/html.gif\")
";
- if ($curRes->is_problem()) {
- if ($part eq "0" || $condensed) {
- $icon = '
';
- } else {
- $icon = $indentString;
- }
- }
-
- # Display the correct icon, link to open or shut map
- if ($curRes->is_map()) {
- my $mapId = $curRes->map_pc();
- my $nowOpen = (!defined($filterHash{$mapId}));
- if ($condition) {$nowOpen = !$nowOpen;}
- $icon = $nowOpen ?
- "navmap.folder.closed.gif" : "navmap.folder.open.gif";
- $icon = "
' .
- $linkclose;
- }
-
- if ($curRes->getFeedback()) {
- my $feedback = $curRes->getFeedback();
- foreach (split(/\,/, $feedback)) {
- if ($_) {
- $feedbackHTML .= ' '
- . '
';
- }
- }
- }
-
- if ($curRes->getErrors()) {
- my $errors = $curRes->getErrors();
- foreach (split(/,/, $errors)) {
- if ($_) {
- $errorHTML .= ' '
- . '
';
- }
- }
- }
-
- $r->print("