|
version 1.337, 2005/09/20 07:52:03
|
version 1.384, 2006/05/30 12:46:09
|
|
Line 40 use Apache::lonnet;
|
Line 40 use Apache::lonnet;
|
| use POSIX qw (floor strftime); |
use POSIX qw (floor strftime); |
| use Data::Dumper; # for debugging, not always |
use Data::Dumper; # for debugging, not always |
| use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
| |
use lib '/home/httpd/lib/perl/'; |
| |
use LONCAPA; |
| |
|
| # symbolic constants |
# symbolic constants |
| sub SYMB { return 1; } |
sub SYMB { return 1; } |
|
Line 57 my %statusIconMap =
|
Line 59 my %statusIconMap =
|
| $resObj->CLOSED => '', |
$resObj->CLOSED => '', |
| $resObj->OPEN => 'navmap.open.gif', |
$resObj->OPEN => 'navmap.open.gif', |
| $resObj->CORRECT => 'navmap.correct.gif', |
$resObj->CORRECT => 'navmap.correct.gif', |
| $resObj->PARTIALLY_CORRECT => 'navmap.ellipsis.gif', |
$resObj->PARTIALLY_CORRECT => 'navmap.partial.gif', |
| $resObj->INCORRECT => 'navmap.wrong.gif', |
$resObj->INCORRECT => 'navmap.wrong.gif', |
| $resObj->ATTEMPTED => 'navmap.ellipsis.gif', |
$resObj->ATTEMPTED => 'navmap.ellipsis.gif', |
| $resObj->ERROR => '' |
$resObj->ERROR => '' |
|
Line 171 sub real_handler {
|
Line 173 sub real_handler {
|
| &Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
| } |
} |
| &Apache::loncommon::no_cache($r); |
&Apache::loncommon::no_cache($r); |
| $r->send_http_header; |
|
| |
|
| my %toplinkitems=(); |
my %toplinkitems=(); |
| &add_linkitem(\%toplinkitems,'blank','',"Select Action"); |
&add_linkitem(\%toplinkitems,'blank','',"Select Action"); |
|
Line 194 MENU
|
Line 195 MENU
|
| $navstatus |
$navstatus |
| MENU |
MENU |
| } |
} |
| my $html=&Apache::lonxml::xmlbegin(); |
$r->send_http_header; |
| $r->print(<<"ENDSUBM"); |
my $js =<<"ENDSUBM"; |
| $html |
|
| <head> |
|
| <script type="text/javascript"> |
<script type="text/javascript"> |
| function submitthis() { |
function submitthis() { |
| $menu |
$menu |
|
Line 205 MENU
|
Line 204 MENU
|
| } |
} |
| |
|
| </script> |
</script> |
| </head> |
|
| <body bgcolor="#FFFFFF" onLoad="submitthis()"></body> |
|
| </html> |
|
| ENDSUBM |
ENDSUBM |
| return; |
$r->print(&Apache::loncommon::start_page(undef,$js, |
| |
{'only_body' => 1, |
| |
'bgcolor' => '#FFFFFF', |
| |
'add_entries' => |
| |
{'onload' => |
| |
"submitthis()"}}). |
| |
&Apache::loncommon::end_page()); |
| |
|
| |
return OK; |
| } |
} |
| if ($ENV{QUERY_STRING} =~ /^launchExternal/) { |
if ($ENV{QUERY_STRING} =~ /^launchExternal/) { |
| &Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); |
&Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); |
|
Line 238 MENU
|
Line 242 MENU
|
| $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; |
$env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; |
| return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
| } |
} |
| my $html=&Apache::lonxml::xmlbegin(); |
$r->send_http_header; |
| $r->print("$html<head>\n"); |
|
| $r->print("<title>".&mt('Navigate Course Contents')."</title>"); |
|
| # ------------------------------------------------------------ Get query string |
# ------------------------------------------------------------ Get query string |
| &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']); |
| |
|
| # ----------------------------------------------------- Force menu registration |
# ----------------------------------------------------- Force menu registration |
| my $addentries=''; |
|
| my $more_unload; |
|
| my $body_only=''; |
my $body_only=''; |
| |
my $js; |
| if ($env{'environment.remotenavmap'} eq 'on') { |
if ($env{'environment.remotenavmap'} eq 'on') { |
| $r->print('<script type="text/javascript"> |
$js='<script type="text/javascript"> |
| function collapse() { |
function collapse() { |
| this.document.location="/adm/navmaps?collapseExternal"; |
this.document.location="/adm/navmaps?collapseExternal"; |
| } |
} |
| </script>'); |
</script>'; |
| # FIXME need to be smarter to only catch window close events |
|
| # $more_unload="collapse()" |
|
| $body_only=1; |
$body_only=1; |
| } |
} |
| if ($env{'form.register'}) { |
|
| $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). |
|
| '" onUnload="'.&Apache::lonmenu::unloadevents().';'. |
|
| $more_unload.'"'; |
|
| $r->print(&Apache::lonmenu::registerurl(1)); |
|
| } else { |
|
| $addentries=' onUnload="'.$more_unload.'"'; |
|
| } |
|
| |
|
| # Header |
# Header |
| $r->print('</head>'. |
$r->print(&Apache::loncommon::start_page('Navigate Course Contents',$js, |
| &Apache::loncommon::bodytag('Navigate Course Contents','', |
{'only_body' => $body_only, |
| $addentries,$body_only,'', |
'force_register' => |
| $env{'form.register'})); |
$env{'form.register'},})); |
| $r->print('<script>window.focus();</script>'); |
$r->print('<script type="text/javascript">window.focus();</script>'); |
| |
|
| $r->rflush(); |
$r->rflush(); |
| |
|
| # Check that it's defined |
# Check that it's defined |
| if (!($navmap->courseMapDefined())) { |
if (!($navmap->courseMapDefined())) { |
| $r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT')); |
$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT')); |
| $r->print('<font size="+2" color="red">Coursemap undefined.</font>' . |
$r->print('<font size="+2" color="red">'.&mt('Coursemap undefined.'). |
| '</body></html>'); |
'</font>' . |
| |
&Apache::loncommon::end_page()); |
| return OK; |
return OK; |
| } |
} |
| |
|
|
Line 327 MENU
|
Line 320 MENU
|
| "Close navigation window"); |
"Close navigation window"); |
| } |
} |
| |
|
| my $jumpToFirstHomework = 0; |
|
| # Check to see if the student is jumping to next open, do-able problem |
# Check to see if the student is jumping to next open, do-able problem |
| if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) { |
if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) { |
| $jumpToFirstHomework = 1; |
|
| # Find the next homework problem that they can do. |
# Find the next homework problem that they can do. |
| my $iterator = $navmap->getIterator(undef, undef, undef, 1); |
my $iterator = $navmap->getIterator(undef, undef, undef, 1); |
| my $curRes; |
my $curRes; |
| my $foundDoableProblem = 0; |
my $foundDoableProblem = 0; |
| my $problemRes; |
my $minimumduedate; |
| |
|
| while (($curRes = $iterator->next()) && !$foundDoableProblem) { |
while ($curRes = $iterator->next()) { |
| if (ref($curRes) && $curRes->is_problem()) { |
if (ref($curRes) && $curRes->is_problem()) { |
| my $status = $curRes->status(); |
my $status = $curRes->status(); |
| if ($curRes->completable()) { |
if ($curRes->completable()) { |
| $problemRes = $curRes; |
my $thisduedate=$curRes->duedate(); |
| |
unless ($foundDoableProblem) { |
| |
$minimumduedate=$thisduedate; |
| |
} |
| |
|
| $foundDoableProblem = 1; |
$foundDoableProblem = 1; |
| |
|
| # Pop open all previous maps |
if ($thisduedate<=$minimumduedate) { |
| my $stack = $iterator->getStack(); |
# Pop open all previous maps |
| pop @$stack; # last resource in the stack is the problem |
my $stack = $iterator->getStack(); |
| # itself, which we don't need in the map stack |
pop @$stack; # last resource in the stack is the problem |
| my @mapPcs = map {$_->map_pc()} @$stack; |
# itself, which we don't need in the map stack |
| $env{'form.filter'} = join(',', @mapPcs); |
my @mapPcs = map {$_->map_pc()} @$stack; |
| |
$env{'form.filter'} = join(',', @mapPcs); |
| # Mark as both "here" and "jump" |
|
| $env{'form.postsymb'} = $curRes->symb(); |
# Mark as both "here" and "jump" |
| |
$env{'form.postsymb'} = $curRes->symb(); |
| |
$minimumduedate=$thisduedate; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 364 MENU
|
Line 363 MENU
|
| } else { |
} else { |
| &add_linkitem(\%toplinkitems,'firsthomework', |
&add_linkitem(\%toplinkitems,'firsthomework', |
| 'location.href="navmaps?jumpToFirstHomework"', |
'location.href="navmaps?jumpToFirstHomework"', |
| "Show Me My First Homework Problem"); |
"Show my first due problem"); |
| } |
} |
| |
|
| my $suppressEmptySequences = 0; |
my $suppressEmptySequences = 0; |
|
Line 381 MENU
|
Line 380 MENU
|
| }; |
}; |
| &add_linkitem(\%toplinkitems,'everything', |
&add_linkitem(\%toplinkitems,'everything', |
| 'location.href="navmaps?sort='.$env{'form.sort'}.'"', |
'location.href="navmaps?sort='.$env{'form.sort'}.'"', |
| "Show Everything"); |
"Show everything"); |
| $r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>"); |
$r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>"); |
| $env{'form.filter'} = ''; |
$env{'form.filter'} = ''; |
| $env{'form.condition'} = 1; |
$env{'form.condition'} = 1; |
| $resource_no_folder_link = 1; |
$resource_no_folder_link = 1; |
|
Line 390 MENU
|
Line 389 MENU
|
| &add_linkitem(\%toplinkitems,'uncompleted', |
&add_linkitem(\%toplinkitems,'uncompleted', |
| 'location.href="navmaps?sort='.$env{'form.sort'}. |
'location.href="navmaps?sort='.$env{'form.sort'}. |
| '&showOnlyHomework=1"', |
'&showOnlyHomework=1"', |
| "Show Only Uncompleted Homework"); |
"Show only uncompleted problems"); |
| } |
} |
| |
|
| my %selected=($env{'form.sort'} => 'selected=on'); |
my %selected=($env{'form.sort'} => 'selected=on'); |
|
Line 433 MENU
|
Line 432 MENU
|
| #my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
| #$r->print("<br />$td"); |
#$r->print("<br />$td"); |
| |
|
| $r->print("</body></html>"); |
$r->print(&Apache::loncommon::end_page()); |
| $r->rflush(); |
$r->rflush(); |
| |
|
| return OK; |
return OK; |
|
Line 472 sub getLinkForResource {
|
Line 471 sub getLinkForResource {
|
| my $anchor; |
my $anchor; |
| if ($res->is_page()) { |
if ($res->is_page()) { |
| foreach (@$stack) { if (defined($_)) { $anchor = $_; } } |
foreach (@$stack) { if (defined($_)) { $anchor = $_; } } |
| $anchor=&Apache::lonnet::escape($anchor->shown_symb()); |
$anchor=&escape($anchor->shown_symb()); |
| return ($res->link(),$res->shown_symb(),$anchor); |
return ($res->link(),$res->shown_symb(),$anchor); |
| } |
} |
| # in case folder was skipped over as "only sequence" |
# in case folder was skipped over as "only sequence" |
| my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb()); |
my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb()); |
| if ($map=~/\.page$/) { |
if ($map=~/\.page$/) { |
| my $url=&Apache::lonnet::clutter($map); |
my $url=&Apache::lonnet::clutter($map); |
| $anchor=&Apache::lonnet::escape($src->shown_symb()); |
$anchor=&escape($src->shown_symb()); |
| return ($url,$res->shown_symb(),$anchor); |
return ($url,$res->shown_symb(),$anchor); |
| } |
} |
| } |
} |
|
Line 514 sub getDescription {
|
Line 513 sub getDescription {
|
| return &mt("Not currently assigned."); |
return &mt("Not currently assigned."); |
| } |
} |
| if ($status == $res->OPEN_LATER) { |
if ($status == $res->OPEN_LATER) { |
| return "Open " . timeToHumanString($res->opendate($part)); |
return "Open " . timeToHumanString($res->opendate($part),'start'); |
| } |
} |
| if ($status == $res->OPEN) { |
if ($status == $res->OPEN) { |
| if ($res->duedate($part)) { |
if ($res->duedate($part)) { |
| return &mt("Due")." " .timeToHumanString($res->duedate($part)); |
return &mt("Due")." " .timeToHumanString($res->duedate($part),'end'); |
| } else { |
} else { |
| return &mt("Open, no due date"); |
return &mt("Open, no due date"); |
| } |
} |
| } |
} |
| if ($status == $res->PAST_DUE_ANSWER_LATER) { |
if ($status == $res->PAST_DUE_ANSWER_LATER) { |
| return &mt("Answer open")." " . timeToHumanString($res->answerdate($part)); |
return &mt("Answer open")." " . timeToHumanString($res->answerdate($part),'start'); |
| } |
} |
| if ($status == $res->PAST_DUE_NO_ANSWER) { |
if ($status == $res->PAST_DUE_NO_ANSWER) { |
| return &mt("Was due")." " . timeToHumanString($res->duedate($part)); |
return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end'); |
| } |
} |
| if ($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) { |
if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) |
| |
&& $res->handgrade($part) ne 'yes') { |
| return &mt("Answer available"); |
return &mt("Answer available"); |
| } |
} |
| if ($status == $res->EXCUSED) { |
if ($status == $res->EXCUSED) { |
|
Line 549 sub getDescription {
|
Line 549 sub getDescription {
|
| } |
} |
| } |
} |
| if ($res->duedate($part)) { |
if ($res->duedate($part)) { |
| return &mt("Due")." " . timeToHumanString($res->duedate($part)) . |
return &mt("Due")." " . timeToHumanString($res->duedate($part),'end') . |
| " $triesString"; |
" $triesString"; |
| } else { |
} else { |
| return &mt("No due date")." $triesString"; |
return &mt("No due date")." $triesString"; |
|
Line 602 sub advancedUser {
|
Line 602 sub advancedUser {
|
| # print "Answer available $timestring" |
# print "Answer available $timestring" |
| # Very, very, very, VERY English-only... goodness help a localizer on |
# Very, very, very, VERY English-only... goodness help a localizer on |
| # this func... |
# this func... |
| |
|
| |
|
| sub timeToHumanString { |
sub timeToHumanString { |
| my ($time) = @_; |
my ($time,$type,$format) = @_; |
| |
|
| # zero, '0' and blank are bad times |
# zero, '0' and blank are bad times |
| if (!$time) { |
if (!$time) { |
| return &mt('never'); |
return &mt('never'); |
|
Line 674 sub timeToHumanString {
|
Line 677 sub timeToHumanString {
|
| return "$prefix$hourString$minuteString$tense"; |
return "$prefix$hourString$minuteString$tense"; |
| } |
} |
| |
|
| |
# If there's a caller supplied format, use it. |
| |
|
| |
if($format ne '') { |
| |
my $timeStr = strftime($format, localtime($time)); |
| |
return $timeStr.&Apache::lonlocal::gettimezone($time); |
| |
} |
| |
|
| # Less then 5 days away, display day of the week and |
# Less then 5 days away, display day of the week and |
| # HH:MM |
# HH:MM |
| |
|
| if ( $delta < $day * 5 ) { |
if ( $delta < $day * 5 ) { |
| my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time)); |
my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time)); |
| $timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 am/00:00/; |
| $timeStr =~ s/12:00 pm/noon/; |
$timeStr =~ s/12:00 pm/noon/; |
| return ($inPast ? "last " : "this ") . |
return ($inPast ? "last " : "this ") . |
| $timeStr; |
$timeStr.&Apache::lonlocal::gettimezone($time); |
| } |
} |
| |
|
| |
my $conjunction='on'; |
| |
if ($type eq 'start') { |
| |
$conjunction='at'; |
| |
} elsif ($type eq 'end') { |
| |
$conjunction='by'; |
| |
} |
| # Is it this year? |
# Is it this year? |
| if ( $time[5] == $now[5]) { |
if ( $time[5] == $now[5]) { |
| # Return on Month Day, HH:MM meridian |
# Return on Month Day, HH:MM meridian |
| my $timeStr = strftime("on %A, %b %e at %I:%M %P", localtime($time)); |
my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time)); |
| $timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 am/00:00/; |
| $timeStr =~ s/12:00 pm/noon/; |
$timeStr =~ s/12:00 pm/noon/; |
| return $timeStr; |
return $timeStr.&Apache::lonlocal::gettimezone($time); |
| } |
} |
| |
|
| # Not this year, so show the year |
# Not this year, so show the year |
| my $timeStr = strftime("on %A, %b %e %Y at %I:%M %P", localtime($time)); |
my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time)); |
| $timeStr =~ s/12:00 am/00:00/; |
$timeStr =~ s/12:00 am/00:00/; |
| $timeStr =~ s/12:00 pm/noon/; |
$timeStr =~ s/12:00 pm/noon/; |
| return $timeStr; |
return $timeStr.&Apache::lonlocal::gettimezone($time); |
| } |
} |
| } |
} |
| |
|
|
Line 1047 sub render_resource {
|
Line 1064 sub render_resource {
|
| # it will be quoted with ' in the href. |
# it will be quoted with ' in the href. |
| |
|
| my ($left,$right) = split(/\?/, $link); |
my ($left,$right) = split(/\?/, $link); |
| $left =~ s/'/\\'/g; |
|
| $link = $left.'?'.$right; |
$link = $left.'?'.$right; |
| |
|
| my $src = $resource->src(); |
my $src = $resource->src(); |
|
Line 1067 sub render_resource {
|
Line 1083 sub render_resource {
|
| # links to open and close the folder |
# links to open and close the folder |
| |
|
| |
|
| my $linkopen = "<a href='$link'>"; |
my $linkopen = "<a href=\"$link\">"; |
| |
|
| |
|
| my $linkclose = "</a>"; |
my $linkclose = "</a>"; |
|
Line 1077 sub render_resource {
|
Line 1093 sub render_resource {
|
| |
|
| if ($resource->is_problem()) { |
if ($resource->is_problem()) { |
| if ($part eq '0' || $params->{'condensed'}) { |
if ($part eq '0' || $params->{'condensed'}) { |
| $icon ='<img src="'.$location.'/problem.gif" alt=" " border="0" />'; |
$icon ='<img src="'.$location.'/problem.gif" alt="'.&mt('Problem').'" border="0" />'; |
| } else { |
} else { |
| $icon = $params->{'indentString'}; |
$icon = $params->{'indentString'}; |
| } |
} |
|
Line 1094 sub render_resource {
|
Line 1110 sub render_resource {
|
| } |
} |
| |
|
| my $folderType = $resource->is_sequence() ? 'folder' : 'page'; |
my $folderType = $resource->is_sequence() ? 'folder' : 'page'; |
| |
my $title=$resource->title; |
| |
$title=~s/\"/\"/g; |
| if (!$params->{'resource_no_folder_link'}) { |
if (!$params->{'resource_no_folder_link'}) { |
| $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif'; |
$icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif'; |
| $icon = "<img src='$location/$icon' alt='". |
$icon = "<img src='$location/$icon' alt=\"". |
| ($nowOpen ? 'Open Folder' : 'Close Folder')."' border='0' />"; |
($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />"; |
| |
|
| $linkopen = "<a href='" . $params->{'url'} . '?' . |
$linkopen = "<a href=\"" . $params->{'url'} . '?' . |
| $params->{'queryString'} . '&filter='; |
$params->{'queryString'} . '&filter='; |
| $linkopen .= ($nowOpen xor $it->{CONDITION}) ? |
$linkopen .= ($nowOpen xor $it->{CONDITION}) ? |
| addToFilter($filter, $mapId) : |
addToFilter($filter, $mapId) : |
| removeFromFilter($filter, $mapId); |
removeFromFilter($filter, $mapId); |
| $linkopen .= "&condition=" . $it->{CONDITION} . '&hereType=' |
$linkopen .= "&condition=" . $it->{CONDITION} . '&hereType=' |
| . $params->{'hereType'} . '&here=' . |
. $params->{'hereType'} . '&here=' . |
| &Apache::lonnet::escape($params->{'here'}) . |
&escape($params->{'here'}) . |
| '&jump=' . |
'&jump=' . |
| &Apache::lonnet::escape($resource->symb()) . |
&escape($resource->symb()) . |
| "&folderManip=1'>"; |
"&folderManip=1\">"; |
| |
|
| } else { |
} else { |
| # Don't allow users to manipulate folder |
# Don't allow users to manipulate folder |
| $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . |
$icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . |
| '.nomanip.gif'; |
'.nomanip.gif'; |
| $icon = "<img src='$location/$icon' alt='". |
$icon = "<img src='$location/$icon' alt=\"". |
| ($nowOpen ? 'Open Folder' : 'Close Folder')."' border='0' />"; |
($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />"; |
| |
|
| $linkopen = ""; |
$linkopen = ""; |
| $linkclose = ""; |
$linkclose = ""; |
|
Line 1125 sub render_resource {
|
Line 1142 sub render_resource {
|
| } |
} |
| |
|
| if ($resource->randomout()) { |
if ($resource->randomout()) { |
| $nonLinkedText .= ' <i>(hidden)</i> '; |
$nonLinkedText .= ' <i>('.&mt('hidden').')</i> '; |
| |
} |
| |
if (!$resource->condval()) { |
| |
$nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> '; |
| } |
} |
| |
|
| # We're done preparing and finally ready to start the rendering |
# We're done preparing and finally ready to start the rendering |
|
Line 1149 sub render_resource {
|
Line 1169 sub render_resource {
|
| # Is this the current resource? |
# Is this the current resource? |
| if (!$params->{'displayedHereMarker'} && |
if (!$params->{'displayedHereMarker'} && |
| $resource->symb() eq $params->{'here'} ) { |
$resource->symb() eq $params->{'here'} ) { |
| $curMarkerBegin = '<font color="red" size="+2">> </font>'; |
$curMarkerBegin = '<font color="red" size="+2">></font>'; |
| $curMarkerEnd = '<font color="red" size="+2"><</font>'; |
$curMarkerEnd = '<font color="red" size="+2"><</font>'; |
| $params->{'displayedHereMarker'} = 1; |
$params->{'displayedHereMarker'} = 1; |
| } |
} |
|
Line 1157 sub render_resource {
|
Line 1177 sub render_resource {
|
| if ($resource->is_problem() && $part ne '0' && |
if ($resource->is_problem() && $part ne '0' && |
| !$params->{'condensed'}) { |
!$params->{'condensed'}) { |
| my $displaypart=$resource->part_display($part); |
my $displaypart=$resource->part_display($part); |
| $partLabel = " (Part: $displaypart)"; |
$partLabel = " (".&mt('Part: [_1]', $displaypart).")"; |
| if ($link!~/\#/) { $link.='#'.&Apache::lonnet::escape($part); } |
if ($link!~/\#/) { $link.='#'.&escape($part); } |
| $title = ""; |
$title = ""; |
| } |
} |
| |
|
| if ($params->{'condensed'} && $resource->countParts() > 1) { |
if ($params->{'condensed'} && $resource->countParts() > 1) { |
| $nonLinkedText .= ' (' . $resource->countParts() . ' parts)'; |
$nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')'; |
| } |
} |
| |
|
| my $target; |
my $target; |
|
Line 1171 sub render_resource {
|
Line 1191 sub render_resource {
|
| $target=' target="loncapaclient" '; |
$target=' target="loncapaclient" '; |
| } |
} |
| if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) { |
if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) { |
| $result .= " $curMarkerBegin<a $target href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>"; |
$result .= " $curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>"; |
| } else { |
} else { |
| $result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>"; |
$result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>"; |
| } |
} |
|
Line 1188 sub render_communication_status {
|
Line 1208 sub render_communication_status {
|
| if ($env{'environment.remotenavmap'} eq 'on') { |
if ($env{'environment.remotenavmap'} eq 'on') { |
| $target=' target="loncapaclient" '; |
$target=' target="loncapaclient" '; |
| } |
} |
| my $linkopen = "<a $target href='$link'>"; |
my $linkopen = "<a $target href=\"$link\">"; |
| my $linkclose = "</a>"; |
my $linkclose = "</a>"; |
| my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc"); |
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc"); |
| if ($resource->hasDiscussion()) { |
if ($resource->hasDiscussion()) { |
|
Line 1202 sub render_communication_status {
|
Line 1222 sub render_communication_status {
|
| foreach (split(/\,/, $feedback)) { |
foreach (split(/\,/, $feedback)) { |
| if ($_) { |
if ($_) { |
| $feedbackHTML .= ' <a '.$target.' href="/adm/email?display=' |
$feedbackHTML .= ' <a '.$target.' href="/adm/email?display=' |
| . &Apache::lonnet::escape($_) . '">' |
. &escape($_) . '">' |
| . '<img src="'.$location.'/feedback.gif" ' |
. '<img src="'.$location.'/feedback.gif" ' |
| . 'border="0" /></a>'; |
. 'border="0" /></a>'; |
| } |
} |
|
Line 1217 sub render_communication_status {
|
Line 1237 sub render_communication_status {
|
| if ($_) { |
if ($_) { |
| $errorcount++; |
$errorcount++; |
| $errorHTML .= ' <a '.$target.' href="/adm/email?display=' |
$errorHTML .= ' <a '.$target.' href="/adm/email?display=' |
| . &Apache::lonnet::escape($_) . '">' |
. &escape($_) . '">' |
| . '<img src="'.$location.'/bomb.gif" ' |
. '<img src="'.$location.'/bomb.gif" ' |
| . 'border="0" /></a>'; |
. 'border="0" /></a>'; |
| } |
} |
|
Line 1242 sub render_quick_status {
|
Line 1262 sub render_quick_status {
|
| if ($env{'environment.remotenavmap'} eq 'on') { |
if ($env{'environment.remotenavmap'} eq 'on') { |
| $target=' target="loncapaclient" '; |
$target=' target="loncapaclient" '; |
| } |
} |
| my $linkopen = "<a $target href='$link'>"; |
my $linkopen = "<a $target href=\"$link\">"; |
| my $linkclose = "</a>"; |
my $linkclose = "</a>"; |
| |
|
| if ($resource->is_problem() && |
if ($resource->is_problem() && |
|
Line 1401 sub render {
|
Line 1421 sub render {
|
| # no columns, no nav maps. |
# no columns, no nav maps. |
| return ''; |
return ''; |
| } |
} |
| my $mustCloseNavMap = 0; |
|
| my $navmap; |
my $navmap; |
| if (defined($args->{'navmap'})) { |
if (defined($args->{'navmap'})) { |
| $navmap = $args->{'navmap'}; |
$navmap = $args->{'navmap'}; |
|
Line 1450 sub render {
|
Line 1469 sub render {
|
| # Step 1: Check to see if we have a navmap |
# Step 1: Check to see if we have a navmap |
| if (!defined($navmap)) { |
if (!defined($navmap)) { |
| $navmap = Apache::lonnavmaps::navmap->new(); |
$navmap = Apache::lonnavmaps::navmap->new(); |
| $mustCloseNavMap = 1; |
if (!defined($navmap)) { |
| } |
# no londer in course |
| |
return '<font color="red">'.&mt('No course selected').'</font><br /> |
| |
<a href="/adm/roles">'.&mt('Select a course').'</a><br />'; |
| |
} |
| |
} |
| |
|
| # Step two: Locate what kind of here marker is necessary |
# Step two: Locate what kind of here marker is necessary |
| # Determine where the "here" marker is and where the screen jumps to. |
# Determine where the "here" marker is and where the screen jumps to. |
|
Line 1515 sub render {
|
Line 1538 sub render {
|
| # Step 1: Check to see if we have a navmap |
# Step 1: Check to see if we have a navmap |
| if (!defined($navmap)) { |
if (!defined($navmap)) { |
| $navmap = Apache::lonnavmaps::navmap->new(); |
$navmap = Apache::lonnavmaps::navmap->new(); |
| $mustCloseNavMap = 1; |
|
| } |
} |
| |
|
| # See if we're being passed a specific map |
# See if we're being passed a specific map |
|
Line 1588 sub render {
|
Line 1610 sub render {
|
| my ($link,$text); |
my ($link,$text); |
| if ($condition) { |
if ($condition) { |
| $link='"navmaps?condition=0&filter=&'.$queryString. |
$link='"navmaps?condition=0&filter=&'.$queryString. |
| '&here='.&Apache::lonnet::escape($here).'"'; |
'&here='.&escape($here).'"'; |
| $text='Close All Folders'; |
$text='Close all folders'; |
| } else { |
} else { |
| $link='"navmaps?condition=1&filter=&'.$queryString. |
$link='"navmaps?condition=1&filter=&'.$queryString. |
| '&here='.&Apache::lonnet::escape($here).'"'; |
'&here='.&escape($here).'"'; |
| $text='Open All Folders'; |
$text='Open all folders'; |
| } |
} |
| if ($args->{'caller'} eq 'navmapsdisplay') { |
if ($args->{'caller'} eq 'navmapsdisplay') { |
| &add_linkitem($args->{'linkitems'},'changefolder', |
&add_linkitem($args->{'linkitems'},'changefolder', |
|
Line 1836 END
|
Line 1858 END
|
| $args->{'multipart'} = $curRes->multipart(); |
$args->{'multipart'} = $curRes->multipart(); |
| |
|
| if ($condenseParts) { # do the condensation |
if ($condenseParts) { # do the condensation |
| if (!$curRes->opendate("0")) { |
|
| @parts = (); |
|
| $args->{'condensed'} = 1; |
|
| } |
|
| if (!$args->{'condensed'}) { |
if (!$args->{'condensed'}) { |
| # Decide whether to condense based on similarity |
# Decide whether to condense based on similarity |
| my $status = $curRes->status($parts[0]); |
my $status = $curRes->status($parts[0]); |
|
Line 1907 END
|
Line 1925 END
|
| my $srcHasQuestion = $src =~ /\?/; |
my $srcHasQuestion = $src =~ /\?/; |
| $args->{"resourceLink"} = $src. |
$args->{"resourceLink"} = $src. |
| ($srcHasQuestion?'&':'?') . |
($srcHasQuestion?'&':'?') . |
| 'symb=' . &Apache::lonnet::escape($symb).$anchor; |
'symb=' . &escape($symb).$anchor; |
| } |
} |
| # Now, we've decided what parts to show. Loop through them and |
# Now, we've decided what parts to show. Loop through them and |
| # show them. |
# show them. |
|
Line 2047 In order of increasing complexity and po
|
Line 2065 In order of increasing complexity and po
|
| |
|
| =over 4 |
=over 4 |
| |
|
| =item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb>, B<Url> or B<MapPc>. This provides |
=item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb> or B<MapPc> and getResourceByUrl. This provides |
| various ways to obtain resource objects, based on various identifiers. |
various ways to obtain resource objects, based on various identifiers. |
| Use this when you want to request information about one object or |
Use this when you want to request information about one object or |
| a handful of resources you already know the identities of, from some |
a handful of resources you already know the identities of, from some |
| other source. For more about Ids, Symbs, and MapPcs, see the |
other source. For more about Ids, Symbs, and MapPcs, see the |
| Resource documentation. Note that Url should be a B<last resort>, |
Resource documentation. Note that Url should be a B<last resort>, |
| not your first choice; it only works when there is only one |
not your first choice; it only really works when there is only one |
| instance of the resource in the course, which only applies to |
instance of the resource in the course, which only applies to |
| maps, and even that may change in the future. |
maps, and even that may change in the future (see the B<getResourceByUrl> |
| |
documentation for more details.) |
| |
|
| =item * C<my @resources = $navmap-E<gt>retrieveResources(args)>. This |
=item * C<my @resources = $navmap-E<gt>retrieveResources(args)>. This |
| retrieves resources matching some criterion and returns them |
retrieves resources matching some criterion and returns them |
|
Line 2211 sub generate_email_discuss_status {
|
Line 2230 sub generate_email_discuss_status {
|
| foreach my $msgid (@keys) { |
foreach my $msgid (@keys) { |
| if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) { |
if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) { |
| my $plain= |
my $plain= |
| &Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid)); |
&LONCAPA::unescape(&LONCAPA::unescape($msgid)); |
| if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) { |
if ($plain=~/ \[([^\]]+)\]\:/) { |
| my ($what,$url)=($1,$2); |
my $url=$1; |
| if ($what eq 'Error') { |
if ($plain=~/\:Error \[/) { |
| $error{$url}.=','.$msgid; |
$error{$url}.=','.$msgid; |
| } else { |
} else { |
| $feedback{$url}.=','.$msgid; |
$feedback{$url}.=','.$msgid; |
|
Line 2247 sub get_user_data {
|
Line 2266 sub get_user_data {
|
| $self->{RETRIEVED_USER_DATA} = 1; |
$self->{RETRIEVED_USER_DATA} = 1; |
| } |
} |
| |
|
| |
sub get_discussion_data { |
| |
my $self = shift; |
| |
if ($self->{RETRIEVED_DISCUSSION_DATA}) { |
| |
return $self->{DISCUSSION_DATA}; |
| |
} |
| |
|
| |
$self->generate_email_discuss_status(); |
| |
|
| |
my $cid=$env{'request.course.id'}; |
| |
my $cdom=$env{'course.'.$cid.'.domain'}; |
| |
my $cnum=$env{'course.'.$cid.'.num'}; |
| |
# Retrieve discussion data for resources in course |
| |
my %discussion_data = &Apache::lonnet::dumpstore($cid,$cdom,$cnum); |
| |
|
| |
|
| |
$self->{DISCUSSION_DATA} = \%discussion_data; |
| |
$self->{RETRIEVED_DISCUSSION_DATA} = 1; |
| |
return $self->{DISCUSSION_DATA}; |
| |
} |
| |
|
| |
|
| # Internal function: Takes a key to look up in the nav hash and implements internal |
# Internal function: Takes a key to look up in the nav hash and implements internal |
| # memory caching of that key. |
# memory caching of that key. |
| sub navhash { |
sub navhash { |
|
Line 2302 sub hasDiscussion {
|
Line 2342 sub hasDiscussion {
|
| } |
} |
| } |
} |
| |
|
| |
sub last_post_time { |
| |
my $self = shift; |
| |
my $symb = shift; |
| |
my $ressymb = $self->wrap_symb($symb); |
| |
return $self->{DISCUSSION_TIME}->{$ressymb}; |
| |
} |
| |
|
| |
sub unread_discussion { |
| |
my $self = shift; |
| |
my $symb = shift; |
| |
|
| |
$self->get_discussion_data(); |
| |
|
| |
my $ressymb = $self->wrap_symb($symb); |
| |
# keys used to store bulletinboard postings use 'unwrapped' symb. |
| |
my $discsymb = $self->unwrap_symb($ressymb); |
| |
my $version = $self->{DISCUSSION_DATA}{'version:'.$discsymb}; |
| |
if (!$version) { return; } |
| |
|
| |
my $prevread = $self->{LAST_READ}{$ressymb}; |
| |
|
| |
my $unreadcount = 0; |
| |
my $hiddenflag = 0; |
| |
my $deletedflag = 0; |
| |
my ($hidden,$deleted); |
| |
|
| |
my %subjects; |
| |
|
| |
for (my $id=$version; $id>0; $id--) { |
| |
my $vkeys=$self->{DISCUSSION_DATA}{$id.':keys:'.$discsymb}; |
| |
my @keys=split(/:/,$vkeys); |
| |
if (grep(/^hidden$/ ,@keys)) { |
| |
if (!$hiddenflag) { |
| |
$hidden = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':hidden'}; |
| |
$hiddenflag = 1; |
| |
} |
| |
} elsif (grep(/^deleted$/,@keys)) { |
| |
if (!$deletedflag) { |
| |
$deleted = $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':deleted'}; |
| |
$deletedflag = 1; |
| |
} |
| |
} else { |
| |
if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./) |
| |
&& $prevread < $self->{DISCUSSION_DATA}{$id.':'.$discsymb.':timestamp'}) { |
| |
$unreadcount++; |
| |
$subjects{$unreadcount}= |
| |
$id.': '.$self->{DISCUSSION_DATA}{$id.':'.$discsymb.':subject'}; |
| |
} |
| |
} |
| |
} |
| |
if (wantarray) { |
| |
return ($unreadcount,\%subjects); |
| |
} |
| |
return $unreadcount |
| |
} |
| |
|
| sub wrap_symb { |
sub wrap_symb { |
| my $self = shift; |
my $self = shift; |
| my $symb = shift; |
my $symb = shift; |
| if ($symb =~ m-___(adm/\w+/\w+/)(\d+)(/bulletinboard)$-) { |
if ($symb =~ m-___(adm/[^/]+/[^/]+/)(\d+)(/bulletinboard)$-) { |
| unless ($symb =~ m|adm/wrapper/adm|) { |
unless ($symb =~ m|adm/wrapper/adm|) { |
| $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3; |
$symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3; |
| } |
} |
|
Line 2313 sub wrap_symb {
|
Line 2409 sub wrap_symb {
|
| return $symb; |
return $symb; |
| } |
} |
| |
|
| |
sub unwrap_symb { |
| |
my $self = shift; |
| |
my $ressymb = shift; |
| |
my $discsymb = $ressymb; |
| |
if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/[^/]+/[^/]+/\d+/bulletinboard)$-) { |
| |
$discsymb = $1.$2; |
| |
} |
| |
return $discsymb; |
| |
} |
| |
|
| # Private method: Does the given resource (as a symb string) have |
# Private method: Does the given resource (as a symb string) have |
| # current feedback? Returns the string in the feedback hash, which |
# current feedback? Returns the string in the feedback hash, which |
| # will be false if it does not exist. |
# will be false if it does not exist. |
|
Line 2457 sub parmval_real {
|
Line 2563 sub parmval_real {
|
| |
|
| my $cid=$env{'request.course.id'}; |
my $cid=$env{'request.course.id'}; |
| my $csec=$env{'request.course.sec'}; |
my $csec=$env{'request.course.sec'}; |
| |
my $cgroup=''; |
| |
my @cgrps=split(/:/,$env{'request.course.groups'}); |
| |
if (@cgrps > 0) { |
| |
@cgrps = sort(@cgrps); |
| |
$cgroup = $cgrps[0]; |
| |
} |
| my $uname=$env{'user.name'}; |
my $uname=$env{'user.name'}; |
| my $udom=$env{'user.domain'}; |
my $udom=$env{'user.domain'}; |
| |
|
|
Line 2464 sub parmval_real {
|
Line 2576 sub parmval_real {
|
| my $result=''; |
my $result=''; |
| |
|
| my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb); |
my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb); |
| |
$mapname = &Apache::lonnet::deversion($mapname); |
| # ----------------------------------------------------- Cascading lookup scheme |
# ----------------------------------------------------- Cascading lookup scheme |
| my $rwhat=$what; |
my $rwhat=$what; |
| $what=~s/^parameter\_//; |
$what=~s/^parameter\_//; |
|
Line 2474 sub parmval_real {
|
Line 2586 sub parmval_real {
|
| my $mapparm=$mapname.'___(all).'.$what; |
my $mapparm=$mapname.'___(all).'.$what; |
| my $usercourseprefix=$cid; |
my $usercourseprefix=$cid; |
| |
|
| |
my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what; |
| |
my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm; |
| |
my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm; |
| |
|
| my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what; |
my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what; |
| my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm; |
my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm; |
| my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm; |
my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm; |
|
Line 2494 sub parmval_real {
|
Line 2610 sub parmval_real {
|
| } |
} |
| |
|
| # ------------------------------------------------------- second, check course |
# ------------------------------------------------------- second, check course |
| |
if ($cgroup ne '' and defined($courseopt)) { |
| |
if (defined($$courseopt{$grplevelr})) { return $$courseopt{$grplevelr}; } |
| |
if (defined($$courseopt{$grplevelm})) { return $$courseopt{$grplevelm}; } |
| |
if (defined($$courseopt{$grplevel})) { return $$courseopt{$grplevel}; } |
| |
} |
| |
|
| if ($csec and defined($courseopt)) { |
if ($csec and defined($courseopt)) { |
| if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; } |
if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; } |
| if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; } |
if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; } |
|
Line 2544 sub parmval_real {
|
Line 2666 sub parmval_real {
|
| |
|
| =pod |
=pod |
| |
|
| =item * B<getResourceByUrl>(url): |
=item * B<getResourceByUrl>(url,multiple): |
| |
|
| Retrieves a resource object by URL of the resource. If passed a |
Retrieves a resource object by URL of the resource, unless the optional |
| resource object, it will simply return it, so it is safe to use this |
multiple parameter is included in wahich caes an array of resource |
| method in code like "$res = $navmap->getResourceByUrl($res)", if |
objects is returned. If passed a resource object, it will simply return |
| you're not sure if $res is already an object, or just a URL. If the |
it, so it is safe to use this method in code like |
| resource appears multiple times in the course, only the first instance |
"$res = $navmap->getResourceByUrl($res)" |
| will be returned. As a result, this is probably useful only for maps. |
if you're not sure if $res is already an object, or just a URL. If the |
| |
resource appears multiple times in the course, only the first instance |
| |
will be returned (useful for maps), unless the multiple parameter has |
| |
been included, in which case all instances are returned in an array. |
| |
|
| =item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall): |
=item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall): |
| |
|
|
Line 2586 Convience method for
|
Line 2711 Convience method for
|
| which will tell whether the map has resources matching the description |
which will tell whether the map has resources matching the description |
| in the filter function. |
in the filter function. |
| |
|
| |
=item * B<usedVersion>(url): |
| |
|
| |
Retrieves version infomation for a url. Returns the version (a number, or |
| |
the string "mostrecent") for resources which have version information in |
| |
the big hash. |
| |
|
| =cut |
=cut |
| |
|
| |
|
| sub getResourceByUrl { |
sub getResourceByUrl { |
| my $self = shift; |
my $self = shift; |
| my $resUrl = shift; |
my $resUrl = shift; |
| |
my $multiple = shift; |
| |
|
| if (ref($resUrl)) { return $resUrl; } |
if (ref($resUrl)) { return $resUrl; } |
| |
|
| $resUrl = &Apache::lonnet::clutter($resUrl); |
$resUrl = &Apache::lonnet::clutter($resUrl); |
| my $resId = $self->{NAV_HASH}->{'ids_' . $resUrl}; |
my $resId = $self->{NAV_HASH}->{'ids_' . $resUrl}; |
| if ($resId =~ /,/) { |
|
| $resId = (split (/,/, $resId))[0]; |
|
| } |
|
| if (!$resId) { return ''; } |
if (!$resId) { return ''; } |
| return $self->getById($resId); |
if ($multiple) { |
| |
my @resources = (); |
| |
my @resIds = split (/,/, $resId); |
| |
foreach my $id (@resIds) { |
| |
my $resourceId = $self->getById($id); |
| |
if ($resourceId) { |
| |
push(@resources,$resourceId); |
| |
} |
| |
} |
| |
return @resources; |
| |
} else { |
| |
if ($resId =~ /,/) { |
| |
$resId = (split (/,/, $resId))[0]; |
| |
} |
| |
return $self->getById($resId); |
| |
} |
| } |
} |
| |
|
| sub retrieveResources { |
sub retrieveResources { |
|
Line 2669 sub hasResource {
|
Line 2813 sub hasResource {
|
| return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0; |
return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0; |
| } |
} |
| |
|
| |
sub usedVersion { |
| |
my $self = shift; |
| |
my $linkurl = shift; |
| |
return $self->navhash("version_$linkurl"); |
| |
} |
| |
|
| 1; |
1; |
| |
|
| package Apache::lonnavmaps::iterator; |
package Apache::lonnavmaps::iterator; |
| use WeakRef; |
use Scalar::Util qw(weaken); |
| use Apache::lonnet; |
use Apache::lonnet; |
| |
|
| =pod |
=pod |
|
Line 3153 sub populateStack {
|
Line 3303 sub populateStack {
|
| 1; |
1; |
| |
|
| package Apache::lonnavmaps::DFSiterator; |
package Apache::lonnavmaps::DFSiterator; |
| use WeakRef; |
use Scalar::Util qw(weaken); |
| use Apache::lonnet; |
use Apache::lonnet; |
| |
|
| # Not documented in the perldoc: This is a simple iterator that just walks |
# Not documented in the perldoc: This is a simple iterator that just walks |
|
Line 3337 sub populateStack {
|
Line 3487 sub populateStack {
|
| 1; |
1; |
| |
|
| package Apache::lonnavmaps::resource; |
package Apache::lonnavmaps::resource; |
| use WeakRef; |
use Scalar::Util qw(weaken); |
| use Apache::lonnet; |
use Apache::lonnet; |
| |
|
| =pod |
=pod |
|
Line 3516 sub kind { my $self=shift; return $self-
|
Line 3666 sub kind { my $self=shift; return $self-
|
| sub randomout { my $self=shift; return $self->navHash("randomout_", 1); } |
sub randomout { my $self=shift; return $self->navHash("randomout_", 1); } |
| sub randompick { |
sub randompick { |
| my $self = shift; |
my $self = shift; |
| return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb . |
return $self->parmval('randompick'); |
| '.0.parameter_randompick'}; |
|
| } |
} |
| sub link { |
sub link { |
| my $self=shift; |
my $self=shift; |
|
Line 3573 sub condition {
|
Line 3722 sub condition {
|
| my $condition=&Apache::lonnet::directcondval($condid); |
my $condition=&Apache::lonnet::directcondval($condid); |
| return $condition; |
return $condition; |
| } |
} |
| |
sub condval { |
| |
my $self=shift; |
| |
my ($pathname,$filename) = |
| |
&Apache::lonnet::split_uri_for_cond($self->src()); |
| |
|
| |
my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~ |
| |
/\&\Q$filename\E\:([\d\|]+)\&/); |
| |
if ($match) { |
| |
return &Apache::lonnet::condval($1); |
| |
} |
| |
return 0; |
| |
} |
| sub compTitle { |
sub compTitle { |
| my $self = shift; |
my $self = shift; |
| my $title = $self->title(); |
my $title = $self->title(); |
|
Line 3624 sub retrieveResources {
|
Line 3784 sub retrieveResources {
|
| return $self->{NAV_MAP}->retrieveResources(@_); |
return $self->{NAV_MAP}->retrieveResources(@_); |
| } |
} |
| |
|
| |
sub is_exam { |
| |
my ($self,$part) = @_; |
| |
if ($self->parmval('type',$part) eq 'exam') { |
| |
return 1; |
| |
} |
| |
if ($self->src() =~ /\.(exam)$/) { |
| |
return 1; |
| |
} |
| |
return 0; |
| |
} |
| sub is_html { |
sub is_html { |
| my $self=shift; |
my $self=shift; |
| my $src = $self->src(); |
my $src = $self->src(); |
|
Line 3636 sub is_page {
|
Line 3806 sub is_page {
|
| return $self->navHash("is_map_", 1) && |
return $self->navHash("is_map_", 1) && |
| $self->navHash("map_type_" . $self->map_pc()) eq 'page'; |
$self->navHash("map_type_" . $self->map_pc()) eq 'page'; |
| } |
} |
| |
sub is_practice { |
| |
my $self=shift; |
| |
my ($part) = @_; |
| |
if ($self->parmval('type',$part) eq 'practice') { |
| |
return 1; |
| |
} |
| |
return 0; |
| |
} |
| sub is_problem { |
sub is_problem { |
| my $self=shift; |
my $self=shift; |
| my $src = $self->src(); |
my $src = $self->src(); |
| return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) |
if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) { |
| |
return !($self->is_practice()); |
| |
} |
| |
return 0; |
| } |
} |
| sub contains_problem { |
sub contains_problem { |
| my $self=shift; |
my $self=shift; |
|
Line 3651 sub contains_problem {
|
Line 3832 sub contains_problem {
|
| } |
} |
| sub is_sequence { |
sub is_sequence { |
| my $self=shift; |
my $self=shift; |
| my $src = $self->src(); |
|
| return $self->navHash("is_map_", 1) && |
return $self->navHash("is_map_", 1) && |
| $self->navHash("map_type_" . $self->map_pc()) eq 'sequence'; |
$self->navHash("map_type_" . $self->map_pc()) eq 'sequence'; |
| } |
} |
|
Line 3666 sub is_survey {
|
Line 3846 sub is_survey {
|
| } |
} |
| return 0; |
return 0; |
| } |
} |
| |
sub is_task { |
| |
my $self=shift; |
| |
my $src = $self->src(); |
| |
return ($src =~ /\.(task)$/) |
| |
} |
| |
|
| sub is_empty_sequence { |
sub is_empty_sequence { |
| my $self=shift; |
my $self=shift; |
|
Line 3721 Returns a string with the type of the ma
|
Line 3906 Returns a string with the type of the ma
|
| sub map_finish { |
sub map_finish { |
| my $self = shift; |
my $self = shift; |
| my $src = $self->src(); |
my $src = $self->src(); |
| $src = Apache::lonnet::clutter($src); |
$src = &Apache::lonnet::clutter($src); |
| my $res = $self->navHash("map_finish_$src", 0); |
my $res = $self->navHash("map_finish_$src", 0); |
| $res = $self->{NAV_MAP}->getById($res); |
$res = $self->{NAV_MAP}->getById($res); |
| return $res; |
return $res; |
|
Line 3734 sub map_pc {
|
Line 3919 sub map_pc {
|
| sub map_start { |
sub map_start { |
| my $self = shift; |
my $self = shift; |
| my $src = $self->src(); |
my $src = $self->src(); |
| $src = Apache::lonnet::clutter($src); |
$src = &Apache::lonnet::clutter($src); |
| my $res = $self->navHash("map_start_$src", 0); |
my $res = $self->navHash("map_start_$src", 0); |
| $res = $self->{NAV_MAP}->getById($res); |
$res = $self->{NAV_MAP}->getById($res); |
| return $res; |
return $res; |
|
Line 3846 sub awarded {
|
Line 4031 sub awarded {
|
| if (!defined($part)) { $part = '0'; } |
if (!defined($part)) { $part = '0'; } |
| return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.awarded'}; |
return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.awarded'}; |
| } |
} |
| |
# this should work exactly like the copy in lonhomework.pm |
| sub duedate { |
sub duedate { |
| (my $self, my $part) = @_; |
(my $self, my $part) = @_; |
| |
my $date; |
| my $interval=$self->parmval("interval", $part); |
my $interval=$self->parmval("interval", $part); |
| if ($interval) { |
my $due_date=$self->parmval("duedate", $part); |
| |
if (defined($interval)) { |
| my $first_access=&Apache::lonnet::get_first_access('map',$self->symb); |
my $first_access=&Apache::lonnet::get_first_access('map',$self->symb); |
| if ($first_access) { return ($first_access+$interval); } |
if (defined($first_access)) { |
| |
$interval = $first_access+$interval; |
| |
$date = ($interval < $due_date)? $interval : $due_date; |
| |
} else { |
| |
$date = $due_date; |
| |
} |
| |
} else { |
| |
$date = $due_date; |
| } |
} |
| return $self->parmval("duedate", $part); |
return $date; |
| } |
} |
| sub handgrade { |
sub handgrade { |
| (my $self, my $part) = @_; |
(my $self, my $part) = @_; |
|
Line 3950 Returns a false value if there has been
|
Line 4145 Returns a false value if there has been
|
| logged in, true if there has. Always returns false if the discussion |
logged in, true if there has. Always returns false if the discussion |
| data was not extracted when the nav map was constructed. |
data was not extracted when the nav map was constructed. |
| |
|
| |
=item * B<last_post_time>: |
| |
|
| |
Returns a false value if there hasn't been discussion otherwise returns |
| |
unix timestamp of last time a discussion posting (or edit) was made. |
| |
|
| |
=item * B<unread_discussion>: |
| |
|
| |
returns in scalar context the count of the number of unread discussion |
| |
postings |
| |
|
| |
returns in list context both the count of postings and a hash ref |
| |
containing the subjects of all unread postings |
| |
|
| =item * B<getFeedback>: |
=item * B<getFeedback>: |
| |
|
| Gets the feedback for the resource and returns the raw feedback string |
Gets the feedback for the resource and returns the raw feedback string |
|
Line 3958 email data was not extracted when the na
|
Line 4166 email data was not extracted when the na
|
| used like this: |
used like this: |
| |
|
| for (split(/\,/, $res->getFeedback())) { |
for (split(/\,/, $res->getFeedback())) { |
| my $link = &Apache::lonnet::escape($_); |
my $link = &escape($_); |
| ... |
... |
| |
|
| and use the link as appropriate. |
and use the link as appropriate. |
|
Line 3970 sub hasDiscussion {
|
Line 4178 sub hasDiscussion {
|
| return $self->{NAV_MAP}->hasDiscussion($self->symb()); |
return $self->{NAV_MAP}->hasDiscussion($self->symb()); |
| } |
} |
| |
|
| |
sub last_post_time { |
| |
my $self = shift; |
| |
return $self->{NAV_MAP}->last_post_time($self->symb()); |
| |
} |
| |
|
| |
sub unread_discussion { |
| |
my $self = shift; |
| |
return $self->{NAV_MAP}->unread_discussion($self->symb()); |
| |
} |
| |
|
| sub getFeedback { |
sub getFeedback { |
| my $self = shift; |
my $self = shift; |
| my $source = $self->src(); |
my $source = $self->src(); |
|
Line 4067 sub countResponses {
|
Line 4285 sub countResponses {
|
| sub responseTypes { |
sub responseTypes { |
| my $self = shift; |
my $self = shift; |
| my %responses; |
my %responses; |
| foreach my $part ($self->parts()) { |
foreach my $part (@{$self->parts()}) { |
| foreach my $responsetype ($self->responseType($part)) { |
foreach my $responsetype ($self->responseType($part)) { |
| $responses{$responsetype}++ if (defined($responsetype)); |
$responses{$responsetype}++ if (defined($responsetype)); |
| } |
} |
|
Line 4144 sub extractParts {
|
Line 4362 sub extractParts {
|
| } |
} |
| foreach (split(/\,/,$metadata)) { |
foreach (split(/\,/,$metadata)) { |
| if ($_ =~ /^(?:part|Task)_(.*)$/) { |
if ($_ =~ /^(?:part|Task)_(.*)$/) { |
| &Apache::lonnet::logthis($self->src()." part -> ".$1); |
|
| my $part = $1; |
my $part = $1; |
| # This floods the logs if it blows up |
# This floods the logs if it blows up |
| if (defined($parts{$part})) { |
if (defined($parts{$part})) { |
|
Line 4179 sub extractParts {
|
Line 4396 sub extractParts {
|
| # So we have to use our knowlege of part names to figure out |
# So we have to use our knowlege of part names to figure out |
| # where the part names begin and end, and even then, it is possible |
# where the part names begin and end, and even then, it is possible |
| # to construct ambiguous situations. |
# to construct ambiguous situations. |
| foreach (split /,/, $metadata) { |
foreach my $data (split /,/, $metadata) { |
| if ($_ =~ /^([a-zA-Z]+)response_(.*)/) { |
if ($data =~ /^([a-zA-Z]+)response_(.*)/ |
| |
|| $data =~ /^(Task)_(.*)/) { |
| my $responseType = $1; |
my $responseType = $1; |
| my $partStuff = $2; |
my $partStuff = $2; |
| my $partIdSoFar = ''; |
my $partIdSoFar = ''; |
|
Line 4192 sub extractParts {
|
Line 4410 sub extractParts {
|
| if ($parts{$partIdSoFar}) { |
if ($parts{$partIdSoFar}) { |
| my @otherChunks = @partChunks[$i+1..$#partChunks]; |
my @otherChunks = @partChunks[$i+1..$#partChunks]; |
| my $responseId = join('_', @otherChunks); |
my $responseId = join('_', @otherChunks); |
| push @{$responseIdHash{$partIdSoFar}}, $responseId; |
if ($self->is_task()) { |
| push @{$responseTypeHash{$partIdSoFar}}, $responseType; |
push(@{$responseIdHash{$partIdSoFar}}, |
| |
$partIdSoFar); |
| |
} else { |
| |
push(@{$responseIdHash{$partIdSoFar}}, |
| |
$responseId); |
| |
} |
| |
push(@{$responseTypeHash{$partIdSoFar}}, |
| |
$responseType); |
| } |
} |
| } |
} |
| } |
} |
|
Line 4560 sub status {
|
Line 4785 sub status {
|
| return CORRECT; |
return CORRECT; |
| } |
} |
| |
|
| |
# If it's WRONG... and not open |
| |
if ( ($completionStatus == INCORRECT || |
| |
$completionStatus == INCORRECT_BY_OVERRIDE) |
| |
&& (!$self->opendate($part) || $self->opendate($part) > time()) ) { |
| |
return INCORRECT; |
| |
} |
| |
|
| if ($completionStatus == ATTEMPTED) { |
if ($completionStatus == ATTEMPTED) { |
| return ATTEMPTED; |
return ATTEMPTED; |
| } |
} |
|
Line 4765 sub getNext {
|
Line 4997 sub getNext {
|
| my $to = $self->to(); |
my $to = $self->to(); |
| foreach my $branch ( split(/,/, $to) ) { |
foreach my $branch ( split(/,/, $to) ) { |
| my $choice = $self->{NAV_MAP}->getById($branch); |
my $choice = $self->{NAV_MAP}->getById($branch); |
| if (!$choice->condition()) { next; } |
#if (!$choice->condition()) { next; } |
| my $next = $choice->goesto(); |
my $next = $choice->goesto(); |
| $next = $self->{NAV_MAP}->getById($next); |
$next = $self->{NAV_MAP}->getById($next); |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to lonnavmaps.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface