loncom/interface/lonwhatsnew.pm - diff

Return to lonwhatsnew.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonwhatsnew.pm between versions 1.49 and 1.54

version 1.49, 2006/01/12 09:32:26	version 1.54, 2006/05/01 19:37:34
Line 100 sub handler {	Line 100 sub handler {
({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,	({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
text=>"Change thresholds"});	text=>"Change thresholds"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs	$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,"What's New?",#'Course_Action_Items_Thresholds'	("What's New?",#'Course_Action_Items_Thresholds'
));	));
} elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {	} elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,	({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
text=>"Change interval"});	text=>"Change interval"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs	$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,"What's New?",#'Course_Action_Items_Intervals'	("What's New?",#'Course_Action_Items_Intervals'
));	));
} elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {	} elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,	({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
text=>"Change discussion display"});	text=>"Change discussion display"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs	$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,"What's New?",#'Course_Action_Items_Intervals'	("What's New?",#'Course_Action_Items_Intervals'
));	));
} elsif ($command eq 'courseinit') {	} elsif ($command eq 'courseinit') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,	({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
text=>"Course initialization preference"});	text=>"Course initialization preference"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs	$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,"What's New?",#'Course_Action_Items_Initialization'	("What's New?",#'Course_Action_Items_Initialization'
));	));
} else {	} else {
$r->print(&Apache::lonhtmlcommon::breadcrumbs	$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,"What's New?",#'Course_Action_Items_Display'	("What's New?",#'Course_Action_Items_Display'
));	));
}	}
&display_main_box($r,$command,$refpage,\%checkallowed);	&display_main_box($r,$command,$refpage,\%checkallowed);
Line 183 sub display_main_box {	Line 183 sub display_main_box {
&display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles,	&display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles,
\%interval_titles,\%initpage,$cdom,$crs,$checkallowed);	\%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
}	}
	my $end_page = &Apache::loncommon::end_page();
$r->print(<<END_OF_BLOCK);	$r->print(<<END_OF_BLOCK);
</td>	</td>
</tr>	</tr>
</table><br />	</table><br />
</body>	$end_page
</html>
END_OF_BLOCK	END_OF_BLOCK
}	}

Line 201 END_OF_BLOCK	Line 201 END_OF_BLOCK

sub display_header {	sub display_header {
my ($command,$checkallowed) = @_;	my ($command,$checkallowed) = @_;
my $html=&Apache::lonxml::xmlbegin();
my $bodytag=&Apache::loncommon::bodytag('Course Action Items');
my $scripttag;	my $scripttag;
unless ($command eq 'chgthreshold' \|\| $command eq 'chginterval') {	unless ($command eq 'chgthreshold' \|\| $command eq 'chginterval') {
$scripttag = <<"END";	$scripttag = <<"END";
Line 226 END	Line 225 END
</script>	</script>
';	';
}	}
return(<<ENDHEAD);	return &Apache::loncommon::start_page('Course Action Items',$scripttag);
$html
<head>
<title>Course Action Items</title>
$scripttag
</head>
$bodytag
ENDHEAD
}	}

#-------------------------------	#-------------------------------
Line 401 sub display_actions_box {	Line 393 sub display_actions_box {
&getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);	&getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
}	}
if ($show{'coursenormalmail'}) {	if ($show{'coursenormalmail'}) {
&getnormalmail(\@newmsgs);	$msgcount = &getnormalmail(\@newmsgs);
}	}
if ($show{'coursecritmail'}) {	if ($show{'coursecritmail'}) {
&getcritmail(\@critmsgs);	$critmsgcount = &getcritmail(\@critmsgs);
}	}

$r->print(qq\|<a href="javascript:changeAll('hide');">$lt{'hial'}</a>	$r->print(qq\|<a href="javascript:changeAll('hide');">$lt{'hial'}</a>
Line 712 sub getitems {	Line 704 sub getitems {
# force retrieve Resource to seed the part id cache we'll need it later	# force retrieve Resource to seed the part id cache we'll need it later
my @allres=$navmap->retrieveResources(undef,	my @allres=$navmap->retrieveResources(undef,
sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});	sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
my %lastreadtime;
my %resourcetracker;	my %resourcetracker;
my $discussiontime;	my $discussiontime;

Line 721 sub getitems {	Line 712 sub getitems {
&checkversions($cdom,$crs,$navmap,$changed,$starttime);	&checkversions($cdom,$crs,$navmap,$changed,$starttime);
}	}

if ($$show{'coursediscussion'}) {
my %lastread = &Apache::lonnet::dump('nohist_'.
$env{'request.course.id'}.'_discuss',
$env{'user.domain'},$env{'user.name'},'lastread');
foreach my $key (keys(%lastread)) {
my $newkey = $key;
$newkey =~ s/_lastread$//;
$lastreadtime{$newkey} = $lastread{$key};
}
}

if ($$show{'abovethreshold'}) {	if ($$show{'abovethreshold'}) {
%resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker',	%resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker',
$cdom,$crs);	$cdom,$crs);
Line 752 sub getitems {	Line 732 sub getitems {

# Check if there are unread discussion postings	# Check if there are unread discussion postings
if ($$show{'coursediscussion'}) {	if ($$show{'coursediscussion'}) {
&check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title,	&check_discussions($resource,$symb,$ressymb,$title,
$newdiscussions,$unread);	$newdiscussions,$unread,$countunread);
}	}

# Check for ungraded problems	# Check for ungraded problems
Line 776 sub getitems {	Line 756 sub getitems {
}	}

}	}
my $hasdiscussion = @{$newdiscussions};
if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post;
$discussiontime = $navmap->{DISCUSSION_TIME};
foreach my $ressymb (@{$newdiscussions}) {
$$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb};
}
if ($countunread eq 'on') { #Get count of unread postings for each resource
my $discussiondata = $navmap->get_discussion_data();
foreach my $ressymb (@{$newdiscussions}) {
&get_discussions($cdom,$crs,$discussiondata,$ressymb,
$unread,\%lastreadtime);
}
}
}
}	}

sub check_discussions {	sub check_discussions {
my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,	my ($resource,$symb,$ressymb,$title,$newdiscussions,$unread,
$unread) = @_;	$countunread) = @_;
if ($resource->hasDiscussion()) {
%{$$unread{$ressymb}} = ();
$$unread{$ressymb}{'title'} = $title;
$$unread{$ressymb}{'symb'} = $symb;
push(@{$newdiscussions}, $ressymb);
}
}

sub get_discussions {	if (!$resource->hasDiscussion()) { return; }
my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_;
my $prevread = 0;	%{$$unread{$ressymb}} = ();
my $unreadcount = 0;	$$unread{$ressymb}{'title'} = $title;
if (defined($$lastreadtime{$ressymb})) {	$$unread{$ressymb}{'symb'} = $symb;
$prevread = $$lastreadtime{$ressymb};	push(@{$newdiscussions}, $ressymb);
}
my $version = $$discussiondata{'version:'.$ressymb};	$$unread{$ressymb}{'lastpost'} = $resource->last_post_time();
if ($version) {
my $hiddenflag = 0;	if ($countunread eq 'on') {
my $deletedflag = 0;	$$unread{$ressymb}{'unreadcount'} = $resource->unread_discussion();
my ($hidden,$deleted);
for (my $id=$version; $id>0; $id--) {
my $vkeys=$$discussiondata{$id.':keys:'.$ressymb};
my @keys=split(/:/,$vkeys);
if (grep/^hidden$/,@keys) {
unless ($hiddenflag) {
$hidden = $$discussiondata{$id.':'.$ressymb.':hidden'};
$hiddenflag = 1;
}
} elsif (grep/^deleted$/,@keys) {
unless ($deletedflag) {
$deleted = $$discussiondata{$id.':'.$ressymb.':deleted'};
$deletedflag = 1;
}
} else {
unless (($hidden =~/\.$id\./) \|\| ($deleted =~/\.$id\./)) {
if ($prevread <$$discussiondata{$id.':'.$ressymb.':timestamp'}) {
$unreadcount ++;
$$unread{$ressymb}{$unreadcount} = $id.': '.
$$discussiondata{$id.':'.$ressymb.':subject'};
}
}
}
}
$$unread{$ressymb}{'unreadcount'} = $unreadcount;
}	}
}	}


sub check_handgraded {	sub check_handgraded {
my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;	my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;
if ($resource->is_problem()) {	if ($resource->is_problem()) {
Line 1096 sub getnormalmail {	Line 1029 sub getnormalmail {
if ($shortsubj eq '') {	if ($shortsubj eq '') {
$shortsubj = &mt('No subject');	$shortsubj = &mt('No subject');
}	}
$shortsubj = &Apache::lonnet::unescape($shortsubj);
push(@{$newmsgs}, {	push(@{$newmsgs}, {
msgid => $msgid,	msgid => $msgid,
sendtime => $sendtime,	sendtime => $sendtime,
Line 1128 sub getcritmail {	Line 1060 sub getcritmail {
if ($shortsubj eq '') {	if ($shortsubj eq '') {
$shortsubj = &mt('No subject');	$shortsubj = &mt('No subject');
}	}
$shortsubj = &Apache::lonnet::unescape($shortsubj);
push(@{$critmsgs}, {	push(@{$critmsgs}, {
msgid => $msgid,	msgid => $msgid,
sendtime => $sendtime,	sendtime => $sendtime,

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.49
changed lines
	Added in v.1.54