--- loncom/interface/lonnavmaps.pm 2002/10/11 14:56:43 1.72 +++ loncom/interface/lonnavmaps.pm 2002/10/17 19:25:27 1.84 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.72 2002/10/11 14:56:43 bowersj2 Exp $ +# $Id: lonnavmaps.pm,v 1.84 2002/10/17 19:25:27 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -45,8 +45,8 @@ use strict; use Apache::Constants qw(:common :http); use Apache::lonnet(); use Apache::loncommon(); -use HTML::TokeParser; use GDBM_File; +use POSIX qw (floor strftime); # -------------------------------------------------------------- Module Globals my %hash; @@ -823,7 +823,7 @@ sub new_handle { # Initialize the nav map my $navmap = Apache::lonnavmaps::navmap->new( $ENV{"request.course.fn"}.".db", - $ENV{"request.course.fn"}."_parms.db", 1); + $ENV{"request.course.fn"}."_parms.db", 1, 1); if (!defined($navmap)) { @@ -843,16 +843,12 @@ sub new_handle { $r->rflush(); if ($navmap->{LAST_CHECK}) { $r->print(' New discussion since '. - timeToHumanString($navmap->{LAST_CHECK}). + 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)

'); } - #if (($currenturl=~/^\/res/) && - # ($currenturl!~/^\/res\/adm/)) { - # $r->print('Current Location

'); - #} # Check that it's defined if (!($navmap->courseMapDefined())) { @@ -917,20 +913,58 @@ sub new_handle { my $currenturl = $ENV{'form.postdata'}; $currenturl=~s/^http\:\/\///; $currenturl=~s/^[^\/]+//; - my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl); + # alreadyHere allows us to only open the maps necessary to view + # the current location once, while at the same time remembering + # the current location. Without that check, the user would never + # be able to close those maps; the user would close it, and the + # currenturl scan would re-open it. + my $queryAdd = "postdata=" . &Apache::lonnet::escape($currenturl) . + "&alreadyHere=1"; $r->print('Show All Resources

'); # Begin the HTML table # four cols: resource + indent, chat+feedback, icon, text string - $r->print('' ."\n"); + $r->print('
' ."\n"); my $condition = 0; if ($ENV{'form.condition'}) { $condition = 1; } - my $mapIterator = $navmap->getIterator(undef, undef, \%filterHash, $condition); + # This needs to be updated to use symbs from the remote, + # instead of uris. The changes to this and the main rendering + # loop should be obvious. + # Here's a simple example of the iterator. + # If there is a current resource + if ($currenturl && !$ENV{'form.alreadyHere'}) { + # Give me every resource... + my $mapIterator = $navmap->getIterator(undef, undef, {}, 1); + my $found = 0; + my $depth = 1; + $mapIterator->next(); # discard the first BEGIN_MAP + my $curRes = $mapIterator->next(); + + while ($depth > 0 && !$found) { + if (ref($curRes) && $curRes->src() eq $currenturl) { + # If this is the correct resource, be sure to + # show it by making sure the containing maps + # are open. + + my $mapStack = $mapIterator->getStack(); + for my $map (@{$mapStack}) { + if ($condition) { + undef $filterHash{$map->map_pc()}; + } else { + $filterHash{$map->map_pc()} = 1; + } + } + $found = 1; + } + $curRes = $mapIterator->next(); + } + } + undef $res; # so we don't accidentally use it later my $indentLevel = 0; my $indentString = "\"\""; @@ -939,9 +973,12 @@ sub new_handle { my $now = time(); my $in24Hours = $now + 24 * 60 * 60; my $depth = 1; + my $displayedHereMarker = 0; # We know the first thing is a BEGIN_MAP (see "$self->{STARTED}" # code in iterator->next), so ignore the first one + my $mapIterator = $navmap->getIterator(undef, undef, \%filterHash, + $condition); $mapIterator->next(); my $curRes = $mapIterator->next(); @@ -1034,9 +1071,16 @@ sub new_handle { } } 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 + } + + # 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. @@ -1063,6 +1107,10 @@ sub new_handle { 'symb='.&Apache::lonnet::escape($curRes->symb()). '"'; my $title = $curRes->title(); + if (!$title) { + $title = $curRes->src(); + $title = substr ($title, rindex($title, "/") + 1); + } my $partLabel = ""; my $newBranchText = ""; @@ -1090,9 +1138,10 @@ sub new_handle { # 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_closed.gif" : "folder_opened.gif"; + "navmap.folder.closed.gif" : "navmap.folder.open.gif"; $icon = "\"\""; $linkopen = "is_problem()) { my $status = $curRes->status($part); my $color = $colormap{$status}; + + # Special case in the navmaps: If in less then + # 24 hours, give it a bit of urgency + if ($status == $curRes->OPEN() && $curRes->duedate() && + $curRes->duedate() < time()+(24*60*60) && + $curRes->duedate() > time()) { + $color = $hurryUpColor; + } + # Special case: If this is the last try, and there is + # more then one available, give a bit of urgency + my $tries = $curRes->tries($part); + my $maxtries = $curRes->maxtries($part); + if ($tries && $maxtries && $maxtries > 1 && + $maxtries - $tries == 1) { + $color = $hurryUpColor; + } if ($color ne "") { $colorizer = "bgcolor=\"$color\""; } @@ -1117,7 +1182,7 @@ sub new_handle { } # FIRST COL: The resource indentation, branch icon, and name - $r->print(" "); + $r->print(""); # Is this the first displayed part of a multi-part problem # that has not been condensed, so we should suppress these two @@ -1175,16 +1250,16 @@ sub new_handle { my $icon = $statusIconMap{$curRes->status($part)}; my $alt = $iconAltTags{$icon}; if ($icon) { - $r->print("\n"); + $r->print("\n"); } else { - $r->print("\n"); + $r->print("\n"); } } else { # not problem, no icon - $r->print("\n"); + $r->print("\n"); } # FOURTH COL: Text description - $r->print("\n"); + $r->print(" \n"); } } $curRes = $mapIterator->next(); @@ -1270,20 +1345,20 @@ sub getDescription { return "Not currently assigned."; } if ($status == $res->OPEN_LATER) { - return "Opens: " . timeToHumanString($res->opendate($part)); + return "Open " . timeToHumanString($res->opendate($part)); } if ($status == $res->OPEN) { - if ($res->duedate()) { - return "Due: $status " . timeToHumanString($res->duedate($part)); + if ($res->duedate($part)) { + return "Due " . timeToHumanString($res->duedate($part)); } else { return "Open, no due date"; } } if ($status == $res->PAST_DUE_ANSWER_LATER) { - return "Answer opens: " . timeToHumanString($res->answerdate($part)); + return "Answer open " . timeToHumanString($res->answerdate($part)); } if ($status == $res->PAST_DUE_NO_ANSWER) { - return "Was Due: " . timeToHumanString($res->duedate($part)); + return "Was due " . timeToHumanString($res->duedate($part)); } if ($status == $res->ANSWER_OPEN) { return "Answer available"; @@ -1295,11 +1370,17 @@ sub getDescription { return "Not yet graded."; } if ($status == $res->TRIES_LEFT) { - my $tries = $res->tries(); - my $maxtries = $res->maxtries(); - my $triesString = "($tries of $maxtries tries used)"; + my $tries = $res->tries($part); + my $maxtries = $res->maxtries($part); + my $triesString = ""; + if ($tries && $maxtries) { + $triesString = "($tries of $maxtries tries used)"; + if ($maxtries > 1 && $maxtries - $tries == 1) { + $triesString = "$triesString"; + } + } if ($res->duedate()) { - return "Due: $status " . timeToHumanString($res->duedate($part)) . + return "Due " . timeToHumanString($res->duedate($part)) . " $triesString"; } else { return "No due date $triesString"; @@ -1311,16 +1392,108 @@ 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. + +# timeToHumanString takes a time number and converts it to a +# human-readable representation, meant to be used in the following +# manner: +# print "Due $timestring" +# print "Open $timestring" +# print "Answer available $timestring" +# Very, very, very, VERY English-only... goodness help a localizer on +# this func... sub timeToHumanString { my ($time) = @_; # zero, '0' and blank are bad times - if ($time) { - return localtime($time); - } else { - return 'Never'; + if (!$time) { + return 'never'; + } + + my $now = time(); + + my @time = localtime($time); + my @now = localtime($now); + + # Positive = future + my $delta = $time - $now; + + my $minute = 60; + my $hour = 60 * $minute; + my $day = 24 * $hour; + my $week = 7 * $day; + my $inPast = 0; + + # Logic in comments: + # Is it now? (extremely unlikely) + if ( $delta == 0 ) { + return "this instant"; + } + + if ($delta < 0) { + $inPast = 1; + $delta = -$delta; + } + + # Is it in the future? + if ( $delta > 0 ) { + # Is it less then a minute away? + my $tense = $inPast ? " ago" : ""; + my $prefix = $inPast ? "" : "in "; + if ( $delta < $minute ) { + if ($delta == 1) { return "${prefix}1 second$tense"; } + return "$prefix$delta seconds$tense"; + } + + # Is it less then an hour away? + if ( $delta < $hour ) { + # If so, use minutes + my $minutes = floor($delta / 60); + if ($minutes == 1) { return "${prefix}1 minute$tense"; } + return "$prefix$minutes minutes$tense"; + } + + # Is it less then 24 hours away? If so, + # display hours + minutes + if ( $delta < $hour * 24) { + my $hours = floor($delta / $hour); + my $minutes = floor(($delta % $hour) / $minute); + my $hourString = "$hours hours"; + my $minuteString = ", $minutes minutes"; + if ($hours == 1) { + $hourString = "1 hour"; + } + if ($minutes == 1) { + $minuteString = ", 1 minute"; + } + if ($minutes == 0) { + $minuteString = ""; + } + return "$prefix$hourString$minuteString$tense"; + } + + # Less then 5 days away, display day of the week and + # HH:MM + if ( $delta < $day * 5 ) { + my $timeStr = strftime("%A at %I:%M %P", localtime($time)); + $timeStr =~ s/12:00 am/midnight/; + $timeStr =~ s/12:00 pm/noon/; + return ($inPast ? "last " : "next ") . + $timeStr; + } + + # Is it this year? + if ( $time[5] == $now[5]) { + # Return on Month Day, HH:MM meridian + my $timeStr = strftime("on %A, %b %e at %I:%M %P", localtime($time)); + $timeStr =~ s/12:00 am/midnight/; + $timeStr =~ s/12:00 pm/noon/; + return $timeStr; + } + + # Not this year, so show the year + my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time)); + $timeStr =~ s/12:00 am/midnight/; + $timeStr =~ s/12:00 pm/noon/; + return $timeStr; } } @@ -1492,6 +1665,8 @@ sub new { $self->{EMAIL_STATUS} = \%emailstatus; } + + $self->{PARM_CACHE} = {}; bless($self); @@ -1613,6 +1788,21 @@ sub finishResource { sub parmval { my $self = shift; my ($what,$symb)=@_; + my $hashkey = $what."|||".$symb; + + if (defined($self->{PARM_CACHE}->{$hashkey})) { + return $self->{PARM_CACHE}->{$hashkey}; + } + + my $result = $self->parmval_real($what, $symb); + $self->{PARM_CACHE}->{$hashkey} = $result; + return $result; +} + +sub parmval_real { + my $self = shift; + my ($what,$symb) = @_; + my $cid=$ENV{'request.course.id'}; my $csec=$ENV{'request.course.sec'}; my $uname=$ENV{'user.name'}; @@ -2074,8 +2264,6 @@ These are methods that help you retrieve =item * B: Returns the "to" value from the compiled nav map. (It is likely you want to use B instead.) -=item * B: Returns the type of the resource, "start", "normal", or "finish". - =back =cut @@ -2105,7 +2293,6 @@ sub symb { } sub title { my $self=shift; return $self->navHash("title_", 1); } sub to { my $self=shift; return $self->navHash("to_", 1); } -sub type { my $self=shift; return $self->navHash("type_", 1); } =pod @@ -2321,7 +2508,7 @@ sub getReturnHash { my $self = shift; if (!defined($self->{RETURN_HASH})) { - my %tmpHash = &Apache::lonnet::restore($self->symb()); + my %tmpHash = &Apache::lonnet::restore($self->symb()); $self->{RETURN_HASH} = \%tmpHash; } } @@ -2412,25 +2599,27 @@ sub extractParts { $self->{PARTS} = []; - # Retrieve part count - my $metadata = &Apache::lonnet::metadata($self->src(), 'allpossiblekeys'); - if (!$metadata) { - $self->{RESOURCE_ERROR} = 1; - $self->{PARTS} = []; - return; - } - - foreach (split(/\,/,$metadata)) { - if ($_ =~ /^parameter\_(.*)\_opendate$/) { - push @{$self->{PARTS}}, $1; + # Retrieve part count, if this is a problem + if ($self->is_problem()) { + my $metadata = &Apache::lonnet::metadata($self->src(), 'allpossiblekeys'); + if (!$metadata) { + $self->{RESOURCE_ERROR} = 1; + $self->{PARTS} = []; + return; } + + foreach (split(/\,/,$metadata)) { + if ($_ =~ /^parameter\_(.*)\_opendate$/) { + push @{$self->{PARTS}}, $1; + } + } + + + # Is this possible to do in one line? - Jeremy + my @sortedParts = sort @{$self->{PARTS}}; + $self->{PARTS} = \@sortedParts; } - - # Is this possible to do in one line? - Jeremy - my @sortedParts = sort @{$self->{PARTS}}; - $self->{PARTS} = \@sortedParts; - return; } @@ -2679,7 +2868,7 @@ sub status { # If it's WRONG... if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) { # and there are TRIES LEFT: - if ($self->tries() < $self->maxtries()) { + if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) { return TRIES_LEFT; } return INCORRECT; # otherwise, return orange; student can't fix this
\n"); + $r->print("
\n"); # print indentation for (my $i = 0; $i < $indentLevel - $deltalevel; $i++) { @@ -1126,6 +1191,16 @@ sub new_handle { $r->print(" ${newBranchText}${linkopen}$icon${linkclose}\n"); + my $curMarkerBegin = ""; + my $curMarkerEnd = ""; + + # Is this the current resource? + if ($curRes->src() eq $currenturl && !$displayedHereMarker) { + $curMarkerBegin = '> '; + $curMarkerEnd = ' <'; + $displayedHereMarker = 1; + } + if ($curRes->is_problem() && $part ne "0" && !$condensed) { $partLabel = " (Part $part)"; $title = ""; @@ -1134,11 +1209,11 @@ sub new_handle { $nonLinkedText .= ' (' . $curRes->countParts() . ' parts)'; } - $r->print(" $title$partLabel $nonLinkedText"); + $r->print(" $curMarkerBegin$title$partLabel $curMarkerEnd $nonLinkedText"); if ($curRes->{RESOURCE_ERROR}) { $r->print(&Apache::loncommon::help_open_topic ("Navmap_Host_Down", - 'Host down')); + 'Host down')); } my $discussionHTML = ""; my $feedbackHTML = ""; @@ -1162,7 +1237,7 @@ sub new_handle { } } - $r->print("$discussionHTML$feedbackHTML$discussionHTML$feedbackHTML $linkopen\"$alt\"$linkclose$linkopen\"$alt\"$linkclose  \n"); + $r->print("\n"); if ($curRes->kind() eq "res" && $curRes->is_problem() && @@ -1195,7 +1270,7 @@ sub new_handle { $r->print('(randomly select ' . $curRes->randompick() .')'); } - $r->print("