--- loncom/interface/lonannounce.pm 2003/06/18 15:02:20 1.13 +++ loncom/interface/lonannounce.pm 2006/04/23 07:16:07 1.51 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.13 2003/06/18 15:02:20 www Exp $ +# $Id: lonannounce.pm,v 1.51 2006/04/23 07:16:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,8 +32,14 @@ use strict; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonhtmlcommon(); +use Apache::lonlocal; +use Apache::lonnavmaps(); +use Apache::lonrss(); +use Apache::lonnet; +use HTML::Entities(); my %todayhash; +my %showedcheck; sub editfield { my ($r,$start,$end,$text)=@_; @@ -44,72 +50,179 @@ sub editfield { 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(< - - -
Starting date:$startdateform
Ending date:$enddateform
+ + +
$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) { - unless (($_=~/^error\:/) || ($thiscal{$_}=~/^error\:/)) { - $returnhash{$courseid.'@'.$_}=$thiscal{$_}; + foreach my $item (keys(%thiscal)) { + unless (($item=~/^error\:/) || ($thiscal{$item}=~/^error\:/)) { + $returnhash{$courseid.'@'.$item}=$thiscal{$item}; } } + + if ($courseid eq $env{'request.course.id'}) { + my $can_see_hidden = $env{'request.role.adv'}; + my $navmap = Apache::lonnavmaps::navmap->new(); + 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\)$/) { + my $map_url=$1; + if (!$can_see_hidden && !$navmap) { + next; + } + if (!$can_see_hidden) { + my $res = $navmap->getResourceByUrl($map_url); + if ($res && $res->randomout()) { next; } + } + $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url); + } elsif ($middle) { + if (!$can_see_hidden && !$navmap) { + next; + } + if (!$can_see_hidden) { + my $res = $navmap->getBySymb($middle); + if ($res && $res->randomout()) { next; } + } + $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; } sub emptycell { - return ' '; + return ' '; } sub normalcell { 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'})) { + my $output; + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + my $internalflag=0; + my ($courseid,$start,$end,$msg)=split(/\@/,$item,4); + 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; + my $short_msg = substr($msg,0,20).((length($msg) > 20)?'...':''); + if (defined($output)) { $output.='
'; } $output.=''. - substr($msg,0,20).'...
'; + $short_msg.''; } } - return ''.$day.'
'.$output.''; + ($year eq $todayhash{'year'}))?'_current':''). + '" >'.&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; + my $output; + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + my ($courseid,$start,$end,$msg)=split(/\@/,$item,4); + 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; + my $short_msg = substr($msg,0,80).((length($msg) > 80)?'...':''); + if (defined($output)) { $output.='
'; } $output.=''. - substr($msg,0,40).'...
'; + $short_msg.''; } } return $output; @@ -118,11 +231,17 @@ sub plaincell { 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).':
'. + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + my ($courseid,$start,$end,$msg)=split(/\@/,$item,4); + $msg=~s/INTERNAL\://gs; + my $fullmsg=&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=&mt(' to '). + &Apache::lonlocal::locallocaltime($end); + } + $fullmsg.=':
'. $msg.''; $output.='
  • '.$fullmsg.'
    • '; } @@ -130,6 +249,19 @@ sub listcell { 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 { my %th=@_; $th{'day'}++; @@ -141,12 +273,16 @@ 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+)$/); - if (($startdate<$nextday) && ($enddate>$tk)) { + 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{$_}; + $allcal{$item}; } } unless ($mode) { @@ -163,39 +299,69 @@ sub showday { } } +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; %todayhash=&Apache::loncommon::timehash($today); - +# ----------------------------------------------------------------- Check marks + undef(%showedcheck); # ---------------------------------------------------------- Get month and year &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['month','year']); + ['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 - - $r->print(< - -The LearningOnline Network with CAPA - - ENDDOCUMENT - $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + + if ($pickdatemode) { +# no big header in pickdate mode + $r->print(&Apache::loncommon::start_page("Pick a Date",$js, + {'only_body' => 1,}). + &dialscript(). + ''); + } else { + $r->print(&Apache::loncommon::start_page("Announcements and Calendar", + $js)); + } # 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 my $key (keys(%env)) { + if ($key=~/^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 my $host (sort(keys(%Apache::lonnet::hostname))) { + if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) { + $r->print ('
    '. + $host.' '.$Apache::lonnet::hostname{$host}.' '. + '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 = @@ -234,13 +452,20 @@ ENDDOCUMENT } &Apache::lonnet::put('calendar',{ $startdate.'_'.$enddate => - $ENV{'form.msg'} },$coursedom,$coursenum); + $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) { - if ($_=~/^form\.remove\_(.+)$/) { + foreach my $key (keys(%env)) { + if ($key=~/^form\.remove\_(.+)$/) { push(@delwhich,$1); } } @@ -255,33 +480,50 @@ ENDDOCUMENT } # ----------------------------------------------------- Summarize all calendars my %allcal=(); - foreach (&Apache::loncommon::findallcourses()) { - %allcal=(%allcal,&readcalendar($_)); + foreach my $course (sort(&Apache::loncommon::findallcourses())) { + %allcal=(%allcal,&readcalendar($course)); } # ------------------------------- 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); } - if (($year<1970) || ($year>2037)) { - } - $r->print('

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

    '); + + $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'); + '&year='.$todayhash{'year'}.'">Current Month'. + &Apache::loncommon::end_page()); return OK; } + + my $class = "LC_calendar"; + if ($env{'form.pickdate'} eq 'yes') { + $class .= " LC_calendar_pickdate"; + } $r->print( - 'Previous Month '. - 'Next Month'. + ''.&mt('Previous Month').' '. + ''.&mt('Next Month').''. '   Current Month

    '. - ''. - ''); + '&year='.$todayhash{'year'}. + ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'

    '. + '

    SunMonTueWedThuFriSat
    + + + + + + +'); my $tk=&Apache::loncommon::maketime(%firstday); my $outp; @@ -296,7 +538,7 @@ ENDDOCUMENT } $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,0,%allcal); @@ -307,13 +549,20 @@ ENDDOCUMENT } # ------------------------------------------------------------------- End table $r->print('
    '.&mt('Sun').''.&mt('Mon').''.&mt('Tue').''.&mt('Wed').''.&mt('Thu').''.&mt('Fri').''.&mt('Sat').'
    '); - if ($allowed) { $r->print(''); } +# ----------------------------------------------------------------- Check marks + undef(%showedcheck); +# --------------------------------------------------------------- Remove button + if ($allowed) { $r->print(''. + &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').''); } $r->print('

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

    '. - ''); + '&year='.$todayhash{'year'}. + ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'

    '. + ($pickdatemode?'    ':'').&Apache::loncommon::end_page()); return OK; }