--- loncom/interface/lonannounce.pm 2002/08/09 20:15:16 1.4 +++ loncom/interface/lonannounce.pm 2004/01/15 01:43:43 1.25 @@ -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.25 2004/01/15 01:43:43 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,35 @@ package Apache::lonannounce; use strict; use Apache::Constants qw(:common); use Apache::loncommon; +use Apache::lonhtmlcommon(); +use Apache::lonlocal; +use HTML::Entities(); + +my %todayhash; +my %showedcheck; + +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); + my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement'). + &Apache::loncommon::help_open_faq(274). + &Apache::loncommon::help_open_bug('Communication Tools'); + $r->print(< + + +
Starting date:$startdateform
Ending date:$enddateform
+ +
+ENDFORM +} sub readcalendar { my $courseid=shift; @@ -51,17 +80,67 @@ 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'}. + ', '.&Apache::lonlocal::locallocaltime($start).' - '.&Apache::lonlocal::locallocaltime($end).': '.$msg; + if ($courseid eq $ENV{'request.course.id'}) { + if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) + && (!$showedcheck{$start.'_'.$end}) + && ($ENV{'form.pickdate'} ne 'yes')) { + $output.=''; + $showedcheck{$start.'_'.$end}=1; + } + } + $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); + $fullmsg=~s/&/\\&/g; + $output.=''. + substr($msg,0,20).'...
'; + } + } + return ''.&tfont(''.&picklink($day,$day,$month,$year).'
'.$output).''; +} + +sub plaincell { + my ($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; + $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); + $fullmsg=~s/&/\\&/g; + $output.=''. + substr($msg,0,40).'...
'; + } + } + return $output; +} + +sub listcell { + 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=localtime($start).' to '.localtime($end).':
'. + $msg.''; + $output.='
  • '.$fullmsg.'
    • '; } } - return ''.$day.'
    '.$output.''; + return $output; } sub nextday { @@ -71,7 +150,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,35 +158,86 @@ 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 tfont { + my $text=shift; + if ($ENV{'form.pickdate'} eq 'yes') { + return ''.$text.''; + } else { + return $text; + } +} + +sub picklink { + my ($text,$day,$month,$year)=@_; + if ($ENV{'form.pickdate'} eq 'yes') { + return ''. + $text.''; + } else { + return $text; + } +} + +sub dialscript { + return (< +function dialin(day,month,year) { + opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_year.value=year; + var slct=opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_month; + var i; + for (i=0;i +ENDDIA } sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; # ---------------------------------------------------------- Get time right now my $today=time; - my %todayhash=&Apache::loncommon::timehash($today); - + %todayhash=&Apache::loncommon::timehash($today); +# ----------------------------------------------------------------- Check marks + %showedcheck=(); + undef %showedcheck; # ---------------------------------------------------------- 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($_)); - } + ['month','year','pickdate','formname','element']); # --------------------------------------------------- Decide what month to show my $year=$todayhash{'year'}; if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; } my $month=$todayhash{'month'}; if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; } + +# ---------------------------------------------- See if we are in pickdate mode + my $pickdatemode=($ENV{'form.pickdate'} eq 'yes'); + my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}. + '&element='.$ENV{'form.element'}; # --------------------------------------------- Find out first day of the month my %firstday=&Apache::loncommon::timehash( @@ -117,51 +247,14 @@ sub handler { 'dlsav' => $todayhash{'dlsav'} )); my $weekday=$firstday{'weekday'}; # ------------------------------------------------------------ Print the screen + $r->print(< The LearningOnline Network with CAPA - -

    Announcements

    ENDDOCUMENT - + if ($pickdatemode) { +# no big header in pickdate mode + $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1). + &dialscript(). + ''); + } else { + $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + } # does this user have privileges to post, etc? my $allowed=0; if ($ENV{'request.course.id'}) { $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); } - +# does this user have privileges to post to servers? + my $serverpost=0; + if ($ENV{'request.role.domain'}) { + $serverpost=&Apache::lonnet::allowed('psa', + $ENV{'request.role.domain'}); + } else { + $serverpost=&Apache::lonnet::allowed('psa','/'); + } +# -------------------------------- BUT: do no fancy stuff when in pickdate mode + if ($pickdatemode) { + $serverpost=0; + $allowed=0; + } +# ------------------------------------------------------------ Process commands + if ($serverpost) { + if ($ENV{'form.serveraction'}) { + foreach (keys %ENV) { + if ($_=~/^form\.postto\_(\w+)/) { + $r->print( + '
    Posting '.$1.': '.&Apache::lonnet::postannounce + ($1,$ENV{'form.serverannnounce'})); + } + } + } + $r->print(< +

    Post Server Announcements

    +Post announcements to the system login and roles screen
    +(leave blank to delete announcement)
    +
    +Check machines:
    +SERVERANNOUNCE +# list servers + foreach (sort keys %Apache::lonnet::hostname) { + if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) { + $r->print ('
    '. + $_.' '.$Apache::lonnet::hostname{$_}.' '. + 'current'); + } + } + $r->print( + '
    '); + } if ($allowed) { my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; 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,36 +358,55 @@ 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); } - $r->print('

    '.('','January','February','March','April','May', - 'June','July','August','September','October', - 'November','December')[$month].' '.$year.'

    '. - 'Previous Month '. - 'Next Month

    '. - ''. - ''); + + $r->print('

    '.('',&mt('January'),&mt('February'),&mt('March'), + &mt('April'),&mt('May'), + &mt('June'),&mt('July'),&mt('August'), + &mt('September'),&mt('October'), + &mt('November'),&mt('December'))[$month].' '. + $year.'

    '); +# Reached the end of times, give up + if (($year<1970) || ($year>2037)) { + $r->print('

    No calendar available for this date.

    '. + 'Current Month'); + return OK; + } + $r->print( + ''.&mt('Previous Month').' '. + ''.&mt('Next Month').''. + '   '.&mt('Current Month').'

    '. + '

    SunMonTueWedThuFriSat
    '); my $tk=&Apache::loncommon::maketime(%firstday); my $outp; @@ -245,25 +416,37 @@ 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(''); - for (my $k=0;$k<=3;$k++) { + for (my $k=0;$k<=4;$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('
    '. +&tfont(&mt('Sun')) +.''. +&tfont(&mt('Mon')) +.''. +&tfont(&mt('Tue')) +.''. +&tfont(&mt('Wed')) +.''. +&tfont(&mt('Thu')) +.''. +&tfont(&mt('Fri')) +.''. +&tfont(&mt('Sat')) +.'

    '. - 'Previous Month '. - 'Next Month

    '. + $r->print(''); +# ----------------------------------------------------------------- Check marks + %showedcheck=(); + undef %showedcheck; +# --------------------------------------------------------------- Remove button + if ($allowed) { $r->print(''. + &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').''); } + $r->print('

    '. + ''.&mt('Previous Month').' '. + ''.&mt('Next Month').''. + '   '.&mt('Current Month').'

    '. + ($pickdatemode?'    ':''). ''); return OK; }