--- loncom/interface/lonannounce.pm 2003/09/02 21:15:59 1.18 +++ 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.18 2003/09/02 21:15:59 www Exp $ +# $Id: lonannounce.pm,v 1.30 2004/08/17 15:38:58 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,7 @@ use strict; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonhtmlcommon(); +use Apache::lonlocal; use HTML::Entities(); my %todayhash; @@ -46,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 } @@ -68,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; } @@ -80,13 +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'}. - ', '.localtime($start).' - '.localtime($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})) { + && (!$showedcheck{$start.'_'.$end}) + && ($ENV{'form.pickdate'} ne 'yes') + && (!$internalflag)) { $output.=''; $showedcheck{$start.'_'.$end}=1; @@ -98,11 +157,11 @@ sub normalcell { substr($msg,0,20).'...
'; } } - return ''.$day.'
'.$output.''; + '>'.&tfont(''.&picklink($day,$day,$month,$year).'
'.$output).''; } sub plaincell { @@ -113,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.=''. @@ -130,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.'
    • '; } @@ -149,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)) { @@ -171,9 +245,46 @@ sub showday { } } +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; @@ -185,7 +296,7 @@ sub handler { undef %showedcheck; # ---------------------------------------------------------- Get month and year &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['month','year','pickdate']); + ['month','year','pickdate','formname','element']); # --------------------------------------------------- Decide what month to show my $year=$todayhash{'year'}; if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; } @@ -194,14 +305,15 @@ sub handler { # ---------------------------------------------- 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 @@ -226,6 +338,7 @@ 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")); @@ -327,9 +440,12 @@ SERVERANNOUNCE 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.'

    '); + $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.

    '. @@ -339,14 +455,27 @@ SERVERANNOUNCE } $r->print( 'Previous Month '. + ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').' '. 'Next Month'. + ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').''. '   Current Month

    '. - ''. - ''); + ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'

    '. + '

    SunMonTueWedThuFriSat
    '); my $tk=&Apache::loncommon::maketime(%firstday); my $outp; @@ -361,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); @@ -376,15 +505,16 @@ SERVERANNOUNCE %showedcheck=(); undef %showedcheck; # --------------------------------------------------------------- Remove button - if ($allowed) { $r->print(''); } + if ($allowed) { $r->print(''. + &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').''); } $r->print('

    '. 'Previous Month '. + ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').' '. 'Next Month'. + ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').''. '   Current Month

    '. + ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'

    '. ($pickdatemode?'':''). ''); return OK;
    '. +&tfont(&mt('Sun')) +.''. +&tfont(&mt('Mon')) +.''. +&tfont(&mt('Tue')) +.''. +&tfont(&mt('Wed')) +.''. +&tfont(&mt('Thu')) +.''. +&tfont(&mt('Fri')) +.''. +&tfont(&mt('Sat')) +.'