--- loncom/interface/lonannounce.pm 2002/08/09 20:15:16 1.4 +++ loncom/interface/lonannounce.pm 2006/01/12 22:58:47 1.40 @@ -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.40 2006/01/12 22:58:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,11 +31,47 @@ package Apache::lonannounce; use strict; use Apache::Constants qw(:common); use Apache::loncommon; +use Apache::lonhtmlcommon(); +use Apache::lonlocal; +use Apache::lonrss(); +use Apache::lonnet; +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_menu('','Calendar Add Announcement','Calendar_Add_Announcement','',274,'Communication Tools'); + my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement', + 'start' => 'Starting date', + 'end' => 'Ending date', + 'incrss' => 'Include in course RSS newsfeed'); + + $r->print(< + + +
$lt{'start'}:$startdateform
$lt{'end'}:$enddateform
+ +
+ +
+ENDFORM +} sub readcalendar { my $courseid=shift; - my $coursenum=$ENV{'course.'.$courseid.'.num'}; - my $coursedom=$ENV{'course.'.$courseid.'.domain'}; + my $coursenum=$env{'course.'.$courseid.'.num'}; + my $coursedom=$env{'course.'.$courseid.'.domain'}; my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum); my %returnhash=(); foreach (keys %thiscal) { @@ -43,6 +79,59 @@ sub readcalendar { $returnhash{$courseid.'@'.$_}=$thiscal{$_}; } } + if ($courseid eq $env{'request.course.id'}) { + my %resourcedata= + &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum); + foreach my $thiskey (sort keys %resourcedata) { + if ($resourcedata{$thiskey.'.type'}=~/^date/) { + my ($course,$middle,$part,$name)= + ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/); + my $section=&mt('All Students'); + if ($middle=~/^\[(.*)\]\./) { + my $sec=$1; + # if we have a section don't show ones that aren't ours + if ($env{'request.course.sec'} && + $env{'request.course.sec'} ne $sec) { next; } + # if a student without a section don't show any section ones + if (!$env{'request.role.adv'} && + !$env{'request.course.sec'}) { next; } + $section=&mt('Group/Section').': '.$1; + $middle=~s/^\[(.*)\]\.//; + } + $middle=~s/\.$//; + my $realm=&mt('All Resources'); + if ($middle=~/^(.+)\_\_\_\(all\)$/) { + $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1); + } elsif ($middle) { + $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle); + } + my $datetype=''; + if ($name eq 'duedate') { + $datetype=&mt('Due'); +# see if accidentally answerdate is before duedate + my $answerkey=$thiskey; + $answerkey=~s/duedate$/answerdate/; + if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) { + $datetype='Due and Answer Available'; + } + } + if ($name eq 'opendate') { $datetype=&mt('Opening'); } + if ($name eq 'answerdate') { +# see if accidentally answerdate is before duedate + my $duekey=$thiskey; + $duekey=~s/answerdate$/duedate/; + if ($resourcedata{$duekey}>$resourcedata{$thiskey}) { +# forget it + next; + } + $datetype=&mt('Answer Available'); + } + $returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'. + $resourcedata{$thiskey}}= + 'INTERNAL:'.$datetype.': '.$realm.' ('.$section.')'; + } + } + } return %returnhash; } @@ -51,17 +140,106 @@ sub emptycell { } sub normalcell { - my ($day,$text)=@_; + my ($day,$month,$year,$text)=@_; + my $output=''; + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + my $internalflag=0; + my ($courseid,$start,$end,@msg)=split(/\@/,$item); + my $msg=join('@',@msg); + if ($msg=~/INTERNAL\:/) { + $msg=~s/INTERNAL\://gs; + $internalflag=1; + } + my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}. + '\n'.&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end); + } + $fullmsg.=':\n'.$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') + && (!$internalflag)) { + $output.=''; + $showedcheck{$start.'_'.$end}=1; + } + } + $fullmsg=~s/[\n\r]/\\n/gs; + $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=''; + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + my ($courseid,$start,$end,@msg)=split(/\@/,$item); + my $msg=join('@',@msg); + my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}. + '\n'.&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end); + } + $msg=~s/INTERNAL\://gs; + $fullmsg.=':\n'.$msg; + $fullmsg=~s/[\n\r]/\\n/gs; + $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); + $fullmsg=~s/&/\\&/g; + $output.=''. + substr($msg,0,80).'...
'; + } + } + 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 @items=&order($text); + foreach my $item (@items) { + if ($item) { + my ($courseid,$start,$end,@msg)=split(/\@/,$item); + my $msg=join('@',@msg); + $msg=~s/INTERNAL\://gs; + my $fullmsg=&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=&mt(' to '). + &Apache::lonlocal::locallocaltime($end); + } + $fullmsg.=':
'. + $msg.''; + $output.='
  • '.$fullmsg.'
    • '; } } - return ''.$day.'
    '.$output.''; + return $output; +} + +sub order { + my ($text)=@_; + my @items = split(/___&&&___/,$text); + sort { + my (undef,$astart,$aend)=split(/\@/,$a); + my (undef,$bstart,$bend)=split(/\@/,$b); + if ($astart != $bstart) { + return $astart <=> $bstart; + } + return $aend <=> $bend; + } @items; } sub nextday { @@ -71,97 +249,115 @@ sub nextday { } sub showday { - my ($tk,%allcal)=@_; + my ($tk,$mode,%allcal)=@_; 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+)$/); - if (($startdate<$nextday) && ($enddate>$tk)) { - $outp.='___&&&___'.$course.'@'.$allcal{$_}; + if ($mode) { + my $oneday=24*3600; + $tk-=$oneday; + $nextday+=$oneday; + } + foreach my $item (keys(%allcal)) { + my ($course,$startdate,$enddate)=($item=~/^(\w+)\@(\d+)\_(\d+)$/); + if (($startdate<$nextday) && ($enddate>=$tk)) { + $outp.='___&&&___'.$course.'@'.$startdate.'@'.$enddate.'@'. + $allcal{$item}; } } - 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'}; } + if ($env{'form.year'}) { $year=$env{'form.year'}; } my $month=$todayhash{'month'}; - if ($ENV{'form.month'}) { $month=$ENV{'form.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( &Apache::loncommon::maketime( 'day' => 1, 'month'=> $month, 'year' => $year, 'hours' => 0, 'minutes' => 0, 'seconds' => 0, - 'dlsav' => $todayhash{'dlsav'} )); + 'dlsav' => -1 )); my $weekday=$firstday{'weekday'}; # ------------------------------------------------------------ Print the screen + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html 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'}); + 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'}; + 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') { + 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'} => - $ENV{'form.msg'} },$coursedom,$coursenum); + $startdate.'_'.$enddate => + $env{'form.msg'} },$coursedom,$coursenum); + if ($env{'form.rsspost'}) { + &Apache::lonrss::addentry($coursenum,$coursedom,'Course_Announcements', + &mt('Event from [_1] to [_2]', + &Apache::lonlocal::locallocaltime($startdate), + &Apache::lonlocal::locallocaltime($enddate)), + $env{'form.msg'},'/adm/announcements','public'); + } } # ---------------------------------------------------------------- Remove items - if ($ENV{'form.action'} eq 'del') { + if ($env{'form.action'} eq 'del') { my @delwhich=(); - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.remove\_(.+)$/) { push(@delwhich,$1); } @@ -206,36 +468,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 +526,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; }