--- loncom/interface/lonannounce.pm	2004/02/17 01:46:34	1.27
+++ loncom/interface/lonannounce.pm	2004/09/02 13:15:07	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.27 2004/02/17 01:46:34 www Exp $
+# $Id: lonannounce.pm,v 1.32 2004/09/02 13:15:07 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,9 +47,7 @@ sub editfield {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',
                                                           $end);
-    my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement').
-	&Apache::loncommon::help_open_faq(274).
-	&Apache::loncommon::help_open_bug('Communication Tools');
+    my $help=&Apache::loncommon::help_open_menu('','Calendar Add Announcement','Calendar_Add_Announcement','',274,'Communication Tools');
     $r->print(<<ENDFORM);
 $help
 <form name="anno" method="post">
@@ -81,6 +79,13 @@ sub readcalendar {
 		    ($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/^\[(.*)\]\.//;
 		}
@@ -92,9 +97,26 @@ sub readcalendar {
 		    $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
 		}
 		my $datetype='';
-		if ($name eq 'duedate') { $datetype=&mt('Due'); }
+		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') { $datetype=&mt('Answer Available'); }
+		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.')';
@@ -120,12 +142,12 @@ sub normalcell {
 		$msg=~s/INTERNAL\://gs;
 		$internalflag=1;
 	    }
-            my $fullmsg=$ENV{'course.'.$courseid.'.description'}.
-		', '.&Apache::lonlocal::locallocaltime($start);
+            my $fullmsg=&mt('Calendar Announcement for ').$ENV{'course.'.$courseid.'.description'}.
+		'\n'.&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {
 		$fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
 	    }
-	    $fullmsg.=': '.$msg;
+	    $fullmsg.=':\n'.$msg;
             if ($courseid eq $ENV{'request.course.id'}) {
               if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))
                && (!$showedcheck{$start.'_'.$end})
@@ -136,17 +158,18 @@ sub normalcell {
                $showedcheck{$start.'_'.$end}=1;
 	      }
 	    }
+	    $fullmsg=~s/[\n\r]/\\n/gs;
             $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
             $fullmsg=~s/&/\\&/g;
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
 	       substr($msg,0,20).'...</a><br />';
        }
     }
-    return '<td'.
+    return '<td valign="top"'.
 	((($day eq $todayhash{'day'}) &&
           ($month eq $todayhash{'month'}) &&
           ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
-           '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br>'.$output).'</td>';
+           '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br />'.$output).'</td>';
 }
 
 sub plaincell {
@@ -156,13 +179,14 @@ sub plaincell {
         if ($_) {
 	    my ($courseid,$start,$end,@msg)=split(/\@/,$_);
             my $msg=join('@',@msg);
-            my $fullmsg=$ENV{'course.'.$courseid.'.description'}.
-		', '.&Apache::lonlocal::locallocaltime($start);
+            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.=': '.$msg;
+	    $fullmsg.=':\n'.$msg;
+ 	    $fullmsg=~s/[\n\r]/\\n/gs;
             $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
             $fullmsg=~s/&/\\&/g;
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
@@ -298,7 +322,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