--- loncom/interface/lonannounce.pm 2002/08/09 20:15:16 1.4 +++ loncom/interface/lonannounce.pm 2003/05/23 16:14:33 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.4 2002/08/09 20:15:16 www Exp $ +# $Id: lonannounce.pm,v 1.12 2003/05/23 16:14:33 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,29 @@ package Apache::lonannounce; use strict; use Apache::Constants qw(:common); use Apache::loncommon; +use Apache::lonhtmlcommon(); + +my %todayhash; + +sub editfield { + my ($r,$start,$end,$text)=@_; + # Deal with date forms + my $startdateform = &Apache::lonhtmlcommon::date_setter('anno', + 'startdate', + $start); + my $enddateform = &Apache::lonhtmlcommon::date_setter('anno', + 'enddate', + $end); + + $r->print(< + + +
Starting date:$startdateform
Ending date:$enddateform
+ +
+ENDFORM +} sub readcalendar { my $courseid=shift; @@ -51,17 +74,60 @@ sub emptycell { } sub normalcell { - my ($day,$text)=@_; + my ($day,$month,$year,$text)=@_; + my $output=''; + foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { + if ($_) { + my ($courseid,$start,$end,@msg)=split(/\@/,$_); + my $msg=join('@',@msg); + my $fullmsg=$ENV{'course.'.$courseid.'.description'}. + ', '.localtime($start).' - '.localtime($end).': '.$msg; + if ($courseid eq $ENV{'request.course.id'}) { + if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + $output.=''; + } + } + $output.=''. + substr($msg,0,20).'...
'; + } + } + return ''.$day.'
'.$output.''; +} + +sub plaincell { + my ($text)=@_; my $output=''; foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { if ($_) { - my ($courseid,$msg)=split(/\@/,$_); - my $fullmsg=$ENV{'course.'.$courseid.'.description'}.': '.$msg; - $output.=''. - substr($msg,0,20).'...
'; + my ($courseid,$start,$end,@msg)=split(/\@/,$_); + my $msg=join('@',@msg); + my $fullmsg=$ENV{'course.'.$courseid.'.description'}. + ', '.localtime($start).' - '.localtime($end).': '.$msg; + $output.=''. + substr($msg,0,40).'...
'; } } - return ''.$day.'
'.$output.''; + return $output; +} + +sub listcell { + my ($text)=@_; + my $output=''; + foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { + if ($_) { + my ($courseid,$start,$end,@msg)=split(/\@/,$_); + my $msg=join('@',@msg); + my $fullmsg=localtime($start).' to '.localtime($end).':
'. + $msg.''; + $output.='
  • '.$fullmsg.'
    • '; + } + } + return $output; } sub nextday { @@ -71,7 +137,7 @@ sub nextday { } sub showday { - my ($tk,%allcal)=@_; + my ($tk,$mode,%allcal)=@_; my %th=&Apache::loncommon::timehash($tk); my ($nextday,$nextmonth)=&nextday(%th); my $outp=''; @@ -79,10 +145,22 @@ sub showday { foreach (keys %allcal) { my ($course,$startdate,$enddate)=($_=~/^(\w+)\@(\d+)\_(\d+)$/); if (($startdate<$nextday) && ($enddate>$tk)) { - $outp.='___&&&___'.$course.'@'.$allcal{$_}; + $outp.='___&&&___'.$course.'@'.$startdate.'@'.$enddate.'@'. + $allcal{$_}; } } - return ($nextday,$nextmonth,&normalcell($th{'day'},$outp)); + unless ($mode) { + return ($nextday,$nextmonth,&normalcell( + $th{'day'},$th{'month'},$th{'year'},$outp)); + } elsif ($outp) { + if ($mode==1) { + return '
    '.&plaincell($outp); + } else { + return ''; + } + } else { + return ''; + } } sub handler { @@ -93,16 +171,11 @@ sub handler { # ---------------------------------------------------------- Get time right now my $today=time; - my %todayhash=&Apache::loncommon::timehash($today); + %todayhash=&Apache::loncommon::timehash($today); # ---------------------------------------------------------- Get month and year &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['month','year']); -# ----------------------------------------------------- Summarize all calendars - my %allcal=(); - foreach (&Apache::loncommon::findallcourses()) { - %allcal=(%allcal,&readcalendar($_)); - } # --------------------------------------------------- Decide what month to show my $year=$todayhash{'year'}; if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; } @@ -117,51 +190,14 @@ sub handler { 'dlsav' => $todayhash{'dlsav'} )); my $weekday=$firstday{'weekday'}; # ------------------------------------------------------------ Print the screen + $r->print(< The LearningOnline Network with CAPA - -

    Announcements

    ENDDOCUMENT - + $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); # does this user have privileges to post, etc? my $allowed=0; if ($ENV{'request.course.id'}) { @@ -187,8 +221,19 @@ ENDDOCUMENT my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; # ----------------------------------------------------- Store new submitted one if ($ENV{'form.action'} eq 'new') { + my $startdate = + &Apache::lonhtmlcommon::get_date_from_form('startdate'); + my $enddate = + &Apache::lonhtmlcommon::get_date_from_form('enddate'); + unless ($startdate=~/^\d+$/) { $startdate=time; } + unless ($enddate=~/^\d+$/) { $enddate=$startdate+1; } + if ($startdate>$enddate) { + my $buffer=$startdate; + $startdate=$enddate; + $enddate=$buffer; + } &Apache::lonnet::put('calendar',{ - $ENV{'form.startdate'}.'_'.$ENV{'form.enddate'} => + $startdate.'_'.$enddate => $ENV{'form.msg'} },$coursedom,$coursenum); } # ---------------------------------------------------------------- Remove items @@ -206,26 +251,15 @@ ENDDOCUMENT $tomorrowhash{'day'}++; my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash); - $r->print(< - - - - - - -Set Starting Date -Set Ending Date

    - -

    -
    -ENDFORM + &editfield($r,$today,$tomorrow,''); } +# ----------------------------------------------------- Summarize all calendars + my %allcal=(); + foreach (&Apache::loncommon::findallcourses()) { + %allcal=(%allcal,&readcalendar($_)); + } + +# ------------------------------- Initialize table and forward backward buttons my ($pm,$py,$fm,$fy)=($month-1,$year,$month+1,$year); if ($pm<1) { ($pm,$py)=(12,$year-1); } if ($fm>12){ ($fm,$fy)=(1,$year+1); } @@ -233,9 +267,11 @@ ENDFORM 'June','July','August','September','October', 'November','December')[$month].' '.$year.''. 'Previous Month '. - 'Next Month

    '. + 'Next Month'. + '   Current Month

    '. ''. - ''); + ''); my $tk=&Apache::loncommon::maketime(%firstday); my $outp; @@ -245,7 +281,7 @@ ENDFORM $r->print(''); for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); } for (my $i=$weekday;$i<=6;$i++) { - ($tk,$nm,$outp)=&showday($tk,%allcal); + ($tk,$nm,$outp)=&showday($tk,0,%allcal); $r->print($outp); } $r->print(''); @@ -253,17 +289,20 @@ ENDFORM for (my $k=0;$k<=3;$k++) { $r->print(''); for (my $i=0;$i<=6;$i++) { - ($tk,$nm,$outp)=&showday($tk,%allcal); + ($tk,$nm,$outp)=&showday($tk,0,%allcal); if ($month!=$nm) { $outp=&emptycell; } $r->print($outp); } $r->print(''); } # ------------------------------------------------------------------- End table - if ($allowed) { $r->print(''); } - $r->print('
    SunMonTueWedThuFriSatTueWedThuFriSat

    '. + $r->print(''); + if ($allowed) { $r->print(''); } + $r->print('

    '. 'Previous Month '. - 'Next Month

    '. + 'Next Month'. + '   Current Month

    '. ''); return OK; }