New discussion since '.
+ strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
+ '
New message (click to open)'. + '
Discussions New message (click to open)'.
+ '| Key: | '); + + # Print discussions and feedback header + if ($navmap->{LAST_CHECK}) { + $r->print(' '.
+ ' New discussion since '.
+ strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
+ ' | '.
+ ' New message (click to open) '. + ' | ');
+ } else {
+ $r->print(' '.
+ ' Discussions | '.
+ ' New message (click to open)'.
+ ' | ');
+ }
+ $r->print('
New discussion since '.
- localtime($lastcheck).
- ' New message (click to open)'); - if (($currenturl=~/^\/res/) && - ($currenturl!~/^\/res\/adm/)) { - $r->print('Current Location
'); - } - - # Handle a network error - - if ($networkFailedFlag) - { - $r->print('
LON-CAPA's network is having difficulties, some problem" .
- " information, such as due dates, will not be available.");
- }
-# ----------------------------------------------------- The little content list
- for ($i=0;$i<=$#rows;$i++) {
- if ($rows[$i]) {
- my @colcont=split(/\&/,$rows[$i]);
- my $avespan=$lcm/($#colcont+1);
- for ($j=0;$j<=$#colcont;$j++) {
- my $rid=$colcont[$j];
- if ($rid=~/^h(.+)/) {
- $rid=$1;
- $r->print(' '.$hash{'title_'.$rid}.
- '
');
- }
- }
- }
- }
-# ----------------------------------------------------------------- Start table
- $r->print('
| '; - my $adde=' | '; - my $hwk=''; - my $hwke=''; - if ($rid=~/^l(\d+\.\d+),(.+)/) { $linkid=$1; $rid=$2; } - if ($rid=~/^i(\d+),(.+)/) { $indent=$1; $rid=$2; } - if ($rid=~/^h(.+)/) { - $rid=$1; - $add=''; - $adde=' | '; - if (($ENV{'user.adv'}) && - ($parmhash{$symb.'.0.parameter_randompick'})) { - $adde=' (randomly select '. - $parmhash{$symb.'.0.parameter_randompick'}. - ')'; - } - } - if ($rid=~/^j(.+)/) { $rid=$1; } - if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) { - # sub astatus describes what code/tcode mean - my $code=$1; - my $tcode=$2; - my $ctext=$3; - $rid=$4; - - # will open later - if ($tcode eq '1') { - $add=''; - } - - # solved/correct - if ($code eq '3') { - $add=' | '; - } elsif ($code eq '4') { # partially correct - $add=' | '; - } else { - # not attempted - - # we end up here on network failure, so pick a neutral - # color if the network failed instead of bright red. - if ( $networkFailedFlag ) - { - $add = ' | '; - } - else - { - $add=' | '; - } - - if ($tcode eq '2') { # open, not past due - $add=' | '; - } - - if ($tcode eq '4') { # due in next 24 hours - $add=' | '; - $adde=' | '; - } - } - $hwk=''; - $hwke=''; - if ($code eq '1') { - $hwke=' ('.$ctext.')'; - } - if ($code eq '2' || $code eq '4') { - $hwk=''; - $hwke=' ('.$ctext.')'; - } - if ($code eq '3') { - $hwk=''; - $hwke=' ('.$ctext.')'; - } - if ($networkFailedFlag) - { - $hwke=' (status unavailable)'; - } - } - if ($rid && $hash{'src_'.$rid} eq $currenturl) { - $add=$add.''. - '> '; - $adde= - ' <'.$adde; - } - if ($discussiontimes{$symb}>$lastcheck) { - $adde= - '
|---|
| \n"); + if ($curRes->randomout()) { + $nonLinkedText .= ' (hidden) '; + } + + $rowNum++; + my $backgroundColor = $backgroundColors[$rowNum % scalar(@backgroundColors)]; + + # FIRST COL: The resource indentation, branch icon, name, and anchor + $r->print(" | ||||||
| \n");
+
+ # Print the anchor if necessary
+ if ($counter == $currentJumpIndex - $currentJumpDelta ) {
+ $r->print('');
+ $displayedJumpMarker = 1;
+ }
# print indentation
- for (my $i = 0; $i < $indentLevel; $i++) {
+ for (my $i = 0; $i < $indentLevel - $deltalevel; $i++) {
$r->print($indentString);
}
- $r->print(" ${newBranchText}${linkopen} | \n");
+
+ # SECOND COL: Is there text, feedback, errors??
+ my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
- if ($curRes->is_problem() && $part != "0") { $partLabel = " (Part $part)"; }
+ if ($curRes->hasDiscussion()) {
+ $discussionHTML = $linkopen .
+ '\n");
+ 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(" | $discussionHTML$feedbackHTML$errorHTML | "); + + # Is this the first displayed part of a multi-part problem + # that has not been condensed, so we should suppress these two + # columns so we don't display useless status info about part + # "0"? + my $firstDisplayed = !$condensed && $multipart && $part eq "0"; + + # 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 | \n");
+ } else {
+ $r->print("\n"); + } + } else { # not problem, no icon + $r->print(" | \n"); + } + + # FOURTH COL: Text description + $r->print(" | \n"); - if ($curRes->kind() eq "res" and - $curRes->is_problem() ) { + if ($curRes->kind() eq "res" && + $curRes->is_problem() && + !$firstDisplayed) { + $r->print ("") if ($color); $r->print (getDescription($curRes, $part)); + $r->print ("") if ($color); + } + if ($curRes->is_map() && advancedUser() && $curRes->randompick()) { + $r->print('(randomly select ' . $curRes->randompick() .')'); } + + $r->print(" |
";
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 ($curRes != $mapIterator->END_NAV_MAP) {
+ while ($depth > 0) {
if ($curRes == $mapIterator->BEGIN_MAP() ||
$curRes == $mapIterator->BEGIN_BRANCH()) {
$indentLevel++;
@@ -891,39 +390,135 @@ sub new_handle {
if ($curRes == $mapIterator->BEGIN_BRANCH()) {
$isNewBranch = 1;
}
+ if ($curRes == $mapIterator->BEGIN_MAP()) { $depth++; }
+ if ($curRes == $mapIterator->END_MAP()) { $depth--; }
- if (ref($curRes) && $curRes->src()) {
+ if (ref($curRes)) { $counter++; }
- my @parts;
+ 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()) {
- @parts = @{$curRes->parts()};
- if (scalar(@parts) > 1) { shift(@parts); }
+
+ # 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
+ $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
+ # 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) {
-
- # For each thing we're displaying...
+ 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->title();
+
+ my $title = $curRes->compTitle();
+ if ($src=~/^\/uploaded\//) {
+ $nonLinkedText=$title;
+ $title='';
+ }
my $partLabel = "";
my $newBranchText = "";
# If this is a new branch, label it so
- # (temporary, this should be an icon w/ alt text)
if ($isNewBranch) {
- $newBranchText = "NB -> ";
+ $newBranchText = "![](\"/adm/lonIcons/branch.gif\")
";
$isNewBranch = 0;
}
@@ -931,60 +526,197 @@ sub new_handle {
my $linkopen = "![\"\"](\"/adm/lonIcons/html.gif\")
";
if ($curRes->is_problem()) {
- $icon = "problem.gif";
+ 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});
+ my $nowOpen = (!defined($filterHash{$mapId}));
+ if ($condition) {$nowOpen = !$nowOpen;}
$icon = $nowOpen ?
- "folder_opened.gif" : "folder_closed.gif";
+ "navmap.folder.closed.gif" : "navmap.folder.open.gif";
+ $icon = "