--- loncom/interface/lonannounce.pm 2002/08/09 20:39:13 1.5 +++ loncom/interface/lonannounce.pm 2003/05/21 19:15:41 1.10 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.5 2002/08/09 20:39:13 www Exp $ +# $Id: lonannounce.pm,v 1.10 2003/05/21 19:15:41 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,27 @@ package Apache::lonannounce; use strict; use Apache::Constants qw(:common); use Apache::loncommon; +use Apache::lonhtmlcommon(); + +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); + + $r->print(< + + +
Starting date:$startdateform
Ending date:$enddateform
+ +
+ENDFORM +} sub readcalendar { my $courseid=shift; @@ -120,51 +141,14 @@ sub handler { 'dlsav' => $todayhash{'dlsav'} )); my $weekday=$firstday{'weekday'}; # ------------------------------------------------------------ Print the screen + $r->print(< The LearningOnline Network with CAPA - -

Announcements

ENDDOCUMENT - + $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); # does this user have privileges to post, etc? my $allowed=0; if ($ENV{'request.course.id'}) { @@ -190,8 +172,19 @@ ENDDOCUMENT 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 @@ -209,25 +202,7 @@ 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=(); @@ -245,7 +220,7 @@ ENDFORM 'Previous Month '. 'Next Month

'. ''. - ''); + ''); my $tk=&Apache::loncommon::maketime(%firstday); my $outp; @@ -270,8 +245,9 @@ ENDFORM $r->print(''); } # ------------------------------------------------------------------- End table - if ($allowed) { $r->print(''); } - $r->print('
SunMonTueWedThuFriSatTueWedThuFriSat

'. + $r->print(''); + if ($allowed) { $r->print(''); } + $r->print('

'. 'Previous Month '. 'Next Month

'. '');