|
version 1.334, 2005/07/15 05:20:37
|
version 1.371, 2006/03/16 20:48:30
|
|
Line 57 my %statusIconMap =
|
Line 57 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 90 my %colormap =
|
Line 90 my %colormap =
|
| my $hurryUpColor = "#FF0000"; |
my $hurryUpColor = "#FF0000"; |
| |
|
| sub launch_win { |
sub launch_win { |
| my ($mode,$script,$toplinkitems)=@_; |
my ($mode,$script,$toplinkitems,$firsttime)=@_; |
| my $result; |
my $result; |
| if ($script ne 'no') { |
if ($script ne 'no') { |
| $result.='<script type="text/javascript">'; |
$result.='<script type="text/javascript">'; |
| } |
} |
| $result.='function launch_navmapwin() { |
if ($firsttime) { |
| |
$result.='function launch_navmapwin() { |
| |
newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\'); |
| |
}'; |
| |
} else { |
| |
$result.='function launch_navmapwin() { |
| newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\'); |
newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\'); |
| }'; |
}'; |
| |
} |
| if ($mode eq 'now') { |
if ($mode eq 'now') { |
| $result.="\nlaunch_navmapwin();\n"; |
$result.="\nlaunch_navmapwin();\n"; |
| } |
} |
|
Line 165 sub real_handler {
|
Line 171 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 188 MENU
|
Line 193 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 199 MENU
|
Line 202 MENU
|
| } |
} |
| |
|
| </script> |
</script> |
| </head> |
|
| <body bgcolor="#FFFFFF" onLoad="submitthis()"></body> |
|
| </html> |
|
| ENDSUBM |
ENDSUBM |
| return; |
$r->print(&Apache::lonxml::xmlbegin(). |
| |
&Apache::loncommon::head(undef,$js). |
| |
'<body bgcolor="#FFFFFF" onLoad="submitthis()">'. |
| |
&Apache::loncommon::end_page(undef,$js)); |
| |
|
| |
return OK; |
| } |
} |
| if ($ENV{QUERY_STRING} eq 'launchExternal') { |
if ($ENV{QUERY_STRING} =~ /^launchExternal/) { |
| &Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); |
&Apache::lonnet::put('environment',{'remotenavmap' => 'on'}); |
| &Apache::lonnet::appenv('environment.remotenavmap' => 'on'); |
&Apache::lonnet::appenv('environment.remotenavmap' => 'on'); |
| |
my $menu=&Apache::lonmenu::reopenmenu(); |
| |
my $navstatus=&Apache::lonmenu::get_nav_status(); |
| |
if ($menu) { |
| |
$r->print(<<MENU); |
| |
<script type="text/javascript"> |
| |
swmenu=$menu |
| |
swmenu.clearTimeout(swmenu.menucltim); |
| |
$navstatus |
| |
</script> |
| |
MENU |
| |
} |
| |
} |
| |
if ($ENV{QUERY_STRING} eq 'turningOffExternal') { |
| |
$env{'environment.remotenavmap'}='off'; |
| } |
} |
| |
|
| # Create the nav map |
# Create the nav map |
|
Line 218 ENDSUBM
|
Line 237 ENDSUBM
|
| $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']); |
| |
|
|
Line 228 ENDSUBM
|
Line 246 ENDSUBM
|
| my $addentries=''; |
my $addentries=''; |
| my $more_unload; |
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 |
# FIXME need to be smarter to only catch window close events |
| # $more_unload="collapse()" |
# $more_unload="collapse()" |
| $body_only=1; |
$body_only=1; |
|
Line 248 ENDSUBM
|
Line 267 ENDSUBM
|
| } |
} |
| |
|
| # Header |
# Header |
| $r->print('</head>'. |
$r->print(&Apache::lonxml::xmlbegin(). |
| |
&Apache::loncommon::head('Navigate Course Contents',$js). |
| &Apache::loncommon::bodytag('Navigate Course Contents','', |
&Apache::loncommon::bodytag('Navigate Course Contents','', |
| $addentries,$body_only,'', |
$addentries,$body_only,'', |
| $env{'form.register'})); |
$env{'form.register'})); |
|
Line 260 ENDSUBM
|
Line 280 ENDSUBM
|
| 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">Coursemap undefined.</font>' . |
| '</body></html>'); |
&Apache::loncommon::end_page()); |
| return OK; |
return OK; |
| } |
} |
| |
|
|
Line 290 ENDSUBM
|
Line 310 ENDSUBM
|
| |
|
| if ($ENV{QUERY_STRING} eq 'launchExternal') { |
if ($ENV{QUERY_STRING} eq 'launchExternal') { |
| $r->print(' |
$r->print(' |
| <form name="returnwin" action="/adm/flip?postdata=return%3a" |
<form name="returnwin" action="/adm/flip?postdata=navlaunch%3a" |
| method="post" target="loncapaclient"> |
method="post" target="loncapaclient"> |
| </form>'); |
</form>'); |
| $r->print(' |
$r->print(' |
|
Line 413 ENDSUBM
|
Line 433 ENDSUBM
|
| #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 494 sub getDescription {
|
Line 514 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 529 sub getDescription {
|
Line 550 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 582 sub advancedUser {
|
Line 603 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 654 sub timeToHumanString {
|
Line 678 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(); |
| |
} |
| |
|
| # 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(); |
| } |
} |
| |
|
| |
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(); |
| } |
} |
| |
|
| # 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(); |
| } |
} |
| } |
} |
| |
|
|
Line 1027 sub render_resource {
|
Line 1065 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 1047 sub render_resource {
|
Line 1084 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 1057 sub render_resource {
|
Line 1094 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 1074 sub render_resource {
|
Line 1111 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) : |
|
Line 1090 sub render_resource {
|
Line 1128 sub render_resource {
|
| &Apache::lonnet::escape($params->{'here'}) . |
&Apache::lonnet::escape($params->{'here'}) . |
| '&jump=' . |
'&jump=' . |
| &Apache::lonnet::escape($resource->symb()) . |
&Apache::lonnet::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 1105 sub render_resource {
|
Line 1143 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 1129 sub render_resource {
|
Line 1170 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 1137 sub render_resource {
|
Line 1178 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.='#'.&Apache::lonnet::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 1151 sub render_resource {
|
Line 1192 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 1164 sub render_communication_status {
|
Line 1205 sub render_communication_status {
|
| my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = ""; |
my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = ""; |
| |
|
| my $link = $params->{"resourceLink"}; |
my $link = $params->{"resourceLink"}; |
| my $linkopen = "<a href='$link'>"; |
my $target; |
| |
if ($env{'environment.remotenavmap'} eq 'on') { |
| |
$target=' target="loncapaclient" '; |
| |
} |
| |
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 1177 sub render_communication_status {
|
Line 1222 sub render_communication_status {
|
| my $feedback = $resource->getFeedback(); |
my $feedback = $resource->getFeedback(); |
| foreach (split(/\,/, $feedback)) { |
foreach (split(/\,/, $feedback)) { |
| if ($_) { |
if ($_) { |
| $feedbackHTML .= ' <a href="/adm/email?display=' |
$feedbackHTML .= ' <a '.$target.' href="/adm/email?display=' |
| . &Apache::lonnet::escape($_) . '">' |
. &Apache::lonnet::escape($_) . '">' |
| . '<img src="'.$location.'/feedback.gif" ' |
. '<img src="'.$location.'/feedback.gif" ' |
| . 'border="0" /></a>'; |
. 'border="0" /></a>'; |
|
Line 1192 sub render_communication_status {
|
Line 1237 sub render_communication_status {
|
| last if ($errorcount>=10); # Only output 10 bombs maximum |
last if ($errorcount>=10); # Only output 10 bombs maximum |
| if ($_) { |
if ($_) { |
| $errorcount++; |
$errorcount++; |
| $errorHTML .= ' <a href="/adm/email?display=' |
$errorHTML .= ' <a '.$target.' href="/adm/email?display=' |
| . &Apache::lonnet::escape($_) . '">' |
. &Apache::lonnet::escape($_) . '">' |
| . '<img src="'.$location.'/bomb.gif" ' |
. '<img src="'.$location.'/bomb.gif" ' |
| . 'border="0" /></a>'; |
. 'border="0" /></a>'; |
|
Line 1214 sub render_quick_status {
|
Line 1259 sub render_quick_status {
|
| $params->{'multipart'} && $part eq "0"; |
$params->{'multipart'} && $part eq "0"; |
| |
|
| my $link = $params->{"resourceLink"}; |
my $link = $params->{"resourceLink"}; |
| my $linkopen = "<a href='$link'>"; |
my $target; |
| |
if ($env{'environment.remotenavmap'} eq 'on') { |
| |
$target=' target="loncapaclient" '; |
| |
} |
| |
my $linkopen = "<a $target href=\"$link\">"; |
| my $linkclose = "</a>"; |
my $linkclose = "</a>"; |
| |
|
| if ($resource->is_problem() && |
if ($resource->is_problem() && |
|
Line 1373 sub render {
|
Line 1422 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 1422 sub render {
|
Line 1470 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 1487 sub render {
|
Line 1539 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 1808 END
|
Line 1859 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 2019 In order of increasing complexity and po
|
Line 2066 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 2184 sub generate_email_discuss_status {
|
Line 2232 sub generate_email_discuss_status {
|
| 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)); |
&Apache::lonnet::unescape(&Apache::lonnet::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 2219 sub get_user_data {
|
Line 2267 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 2274 sub hasDiscussion {
|
Line 2343 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); |
| |
|
| |
my $version = $self->{DISCUSSION_DATA}{'version:'.$ressymb}; |
| |
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:'.$ressymb}; |
| |
my @keys=split(/:/,$vkeys); |
| |
if (grep(/^hidden$/ ,@keys)) { |
| |
if (!$hiddenflag) { |
| |
$hidden = $self->{DISCUSSION_DATA}{$id.':'.$ressymb.':hidden'}; |
| |
$hiddenflag = 1; |
| |
} |
| |
} elsif (grep(/^deleted$/,@keys)) { |
| |
if (!$deletedflag) { |
| |
$deleted = $self->{DISCUSSION_DATA}{$id.':'.$ressymb.':deleted'}; |
| |
$deletedflag = 1; |
| |
} |
| |
} else { |
| |
if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./) |
| |
&& $prevread < $self->{DISCUSSION_DATA}{$id.':'.$ressymb.':timestamp'}) { |
| |
$unreadcount++; |
| |
$subjects{$unreadcount}= |
| |
$id.': '.$self->{DISCUSSION_DATA}{$id.':'.$ressymb.':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; |
|
Line 2429 sub parmval_real {
|
Line 2553 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 2446 sub parmval_real {
|
Line 2576 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 2466 sub parmval_real {
|
Line 2600 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 2516 sub parmval_real {
|
Line 2656 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 2558 Convience method for
|
Line 2701 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 2641 sub hasResource {
|
Line 2803 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 3125 sub populateStack {
|
Line 3293 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 3309 sub populateStack {
|
Line 3477 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 3488 sub kind { my $self=shift; return $self-
|
Line 3656 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 3545 sub condition {
|
Line 3712 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 3596 sub retrieveResources {
|
Line 3774 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 3608 sub is_page {
|
Line 3796 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)$/) |
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 3638 sub is_survey {
|
Line 3837 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 3922 Returns a false value if there has been
|
Line 4126 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 3942 sub hasDiscussion {
|
Line 4159 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 4039 sub countResponses {
|
Line 4266 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 4115 sub extractParts {
|
Line 4342 sub extractParts {
|
| return; |
return; |
| } |
} |
| foreach (split(/\,/,$metadata)) { |
foreach (split(/\,/,$metadata)) { |
| if ($_ =~ /^part_(.*)$/) { |
if ($_ =~ /^(?:part|Task)_(.*)$/) { |
| 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 4151 sub extractParts {
|
Line 4378 sub extractParts {
|
| # 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 (split /,/, $metadata) { |
| if ($_ =~ /^([a-zA-Z]+)response_(.*)/) { |
if ($_ =~ /^([a-zA-Z]+)response_(.*)/ |
| |
|| $_ =~ /^(Task)_(.*)/) { |
| my $responseType = $1; |
my $responseType = $1; |
| my $partStuff = $2; |
my $partStuff = $2; |
| my $partIdSoFar = ''; |
my $partIdSoFar = ''; |
|
Line 4531 sub status {
|
Line 4759 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 4736 sub getNext {
|
Line 4971 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