--- loncom/interface/lonannounce.pm 2003/10/04 20:49:40 1.22 +++ loncom/interface/lonannounce.pm 2004/08/17 15:38:58 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.22 2003/10/04 20:49:40 www Exp $ +# $Id: lonannounce.pm,v 1.30 2004/08/17 15:38:58 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,14 +47,15 @@ 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'); $r->print(<
Starting date:$startdateform
Ending date:$enddateform
-
+
ENDFORM } @@ -69,6 +70,52 @@ 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=~/^\[(.*)\]\./) { + $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; } @@ -81,14 +128,24 @@ sub normalcell { my $output=''; foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { if ($_) { + my $internalflag=0; my ($courseid,$start,$end,@msg)=split(/\@/,$_); my $msg=join('@',@msg); + if ($msg=~/INTERNAL\:/) { + $msg=~s/INTERNAL\://gs; + $internalflag=1; + } my $fullmsg=$ENV{'course.'.$courseid.'.description'}. - ', '.&Apache::lonlocal::locallocaltime($start).' - '.&Apache::lonlocal::locallocaltime($end).': '.$msg; + ', '.&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end); + } + $fullmsg.=': '.$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')) { + && ($ENV{'form.pickdate'} ne 'yes') + && (!$internalflag)) { $output.=''; $showedcheck{$start.'_'.$end}=1; @@ -100,11 +157,11 @@ sub normalcell { substr($msg,0,20).'...
'; } } - return ''.&tfont(''.&picklink($day,$day,$month,$year).'
'.$output).''; + '>'.&tfont(''.&picklink($day,$day,$month,$year).'
'.$output).''; } sub plaincell { @@ -115,7 +172,12 @@ sub plaincell { my ($courseid,$start,$end,@msg)=split(/\@/,$_); my $msg=join('@',@msg); my $fullmsg=$ENV{'course.'.$courseid.'.description'}. - ', '.localtime($start).' - '.localtime($end).': '.$msg; + ', '.&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end); + } + $msg=~s/INTERNAL\://gs; + $fullmsg.=': '.$msg; $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); $fullmsg=~s/&/\\&/g; $output.=''. @@ -132,7 +194,13 @@ sub listcell { if ($_) { my ($courseid,$start,$end,@msg)=split(/\@/,$_); my $msg=join('@',@msg); - my $fullmsg=localtime($start).' to '.localtime($end).':
'. + $msg=~s/INTERNAL\://gs; + my $fullmsg=&Apache::lonlocal::locallocaltime($start); + if ($start!=$end) { + $fullmsg.=&mt(' to '). + &Apache::lonlocal::locallocaltime($end); + } + $fullmsg.=':
'. $msg.''; $output.='
  • '.$fullmsg.'
    • '; } @@ -151,7 +219,11 @@ sub showday { my %th=&Apache::loncommon::timehash($tk); my ($nextday,$nextmonth)=&nextday(%th); my $outp=''; - my $oneday=24*3600; + if ($mode) { + my $oneday=24*3600; + $tk-=$oneday; + $nextday+=$oneday; + } foreach (keys %allcal) { my ($course,$startdate,$enddate)=($_=~/^(\w+)\@(\d+)\_(\d+)$/); if (($startdate<$nextday) && ($enddate>$tk)) { @@ -241,7 +313,7 @@ sub handler { &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 @@ -418,7 +490,7 @@ SERVERANNOUNCE } $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); @@ -433,7 +505,8 @@ SERVERANNOUNCE %showedcheck=(); undef %showedcheck; # --------------------------------------------------------------- Remove button - if ($allowed) { $r->print(''); } + if ($allowed) { $r->print(''. + &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').''); } $r->print('

    '. ''.&mt('Previous Month').' '.