--- loncom/interface/lonannounce.pm 2002/08/08 13:44:17 1.3
+++ loncom/interface/lonannounce.pm 2002/08/09 20:15:16 1.4
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.3 2002/08/08 13:44:17 www Exp $
+# $Id: lonannounce.pm,v 1.4 2002/08/09 20:15:16 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,7 +52,16 @@ sub emptycell {
sub normalcell {
my ($day,$text)=@_;
- return '
'.$day.' '.$text.' | ';
+ my $output='';
+ foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {
+ if ($_) {
+ my ($courseid,$msg)=split(/\@/,$_);
+ my $fullmsg=$ENV{'course.'.$courseid.'.description'}.': '.$msg;
+ $output.=''.
+ substr($msg,0,20).'...
';
+ }
+ }
+ return ''.$day.' '.$output.' | ';
}
sub nextday {
@@ -66,11 +75,10 @@ sub showday {
my %th=&Apache::loncommon::timehash($tk);
my ($nextday,$nextmonth)=&nextday(%th);
my $outp='';
+ my $oneday=24*3600;
foreach (keys %allcal) {
my ($course,$startdate,$enddate)=($_=~/^(\w+)\@(\d+)\_(\d+)$/);
- print $course.' '.localtime($startdate).' '.localtime($enddate).
- localtime($tk).' '.localtime($nextday).'
';
- if (($startdate>$tk) && ($enddate<$nextday)) {
+ if (($startdate<$nextday) && ($enddate>$tk)) {
$outp.='___&&&___'.$course.'@'.$allcal{$_};
}
}