--- loncom/interface/lonannounce.pm	2002/08/21 17:18:08	1.6
+++ loncom/interface/lonannounce.pm	2003/05/23 16:14:33	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.6 2002/08/21 17:18:08 www Exp $
+# $Id: lonannounce.pm,v 1.12 2003/05/23 16:14:33 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,29 @@ package Apache::lonannounce;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
+use Apache::lonhtmlcommon();
+
+my %todayhash;
+
+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(<<ENDFORM);
+<form name="anno" method="post">
+<input type="hidden" value=''          name="action"      >
+<table><tr><td>Starting date:</td><td>$startdateform</td></tr>
+<tr><td>Ending date:</td><td>$enddateform</td></tr></table>
+<textarea name="msg" rows="4" cols="60">$text</textarea>
+<input type="button" onClick="trysubmit()" value="Post Announcement"><hr>
+ENDFORM
+}
 
 sub readcalendar {
     my $courseid=shift;
@@ -51,13 +74,14 @@ sub emptycell {
 }
 
 sub normalcell {
-    my ($day,$text)=@_;
+    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'}.': '.$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'})) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.
@@ -65,10 +89,45 @@ sub normalcell {
 	      }
 	    }
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
-	       substr($msg,0,20).'...</a><br>';
+	       substr($msg,0,20).'...</a><br />';
+       }
+    }
+    return '<td'.
+	((($day eq $todayhash{'day'}) &&
+          ($month eq $todayhash{'month'}) &&
+          ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
+           '><b>'.$day.'</b><br>'.$output.'</td>';
+}
+
+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;
+            $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
+	       substr($msg,0,40).'...</a><br />';
+       }
+    }
+    return $output;
+}
+
+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).':<br /><b>'.
+               $msg.'</b>';
+            $output.='<li>'.$fullmsg.'</li>';
        }
     }
-    return '<td><b>'.$day.'</b><br>'.$output.'</td>';
+    return $output;
 }
 
 sub nextday {
@@ -78,7 +137,7 @@ sub nextday {
 }
 
 sub showday {
-    my ($tk,%allcal)=@_;
+    my ($tk,$mode,%allcal)=@_;
     my %th=&Apache::loncommon::timehash($tk);
     my ($nextday,$nextmonth)=&nextday(%th);
     my $outp='';
@@ -90,7 +149,18 @@ sub showday {
             $allcal{$_};
         }
     }
-    return ($nextday,$nextmonth,&normalcell($th{'day'},$outp));
+    unless ($mode) {
+       return ($nextday,$nextmonth,&normalcell(
+               $th{'day'},$th{'month'},$th{'year'},$outp));
+   } elsif ($outp) {
+       if ($mode==1) {
+          return '<br />'.&plaincell($outp);
+      } else {
+          return '<ul>'.&listcell($outp).'</ul>';
+      }
+   } else {
+       return '';
+   }
 }
 
 sub handler {
@@ -101,7 +171,7 @@ sub handler {
 
 # ---------------------------------------------------------- Get time right now
     my $today=time;
-    my %todayhash=&Apache::loncommon::timehash($today);
+    %todayhash=&Apache::loncommon::timehash($today);
 
 # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
@@ -120,51 +190,14 @@ sub handler {
                                      'dlsav' => $todayhash{'dlsav'} ));
     my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen
+
     $r->print(<<ENDDOCUMENT);
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script>
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
-    function pjump(type,dis,value,marker,ret,call) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
-                 +"&value="+escape(value)+"&marker="+escape(marker)
-                 +"&return="+escape(ret)
-                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-
-    }
-
-    function dateset() {
-        if (document.anno.pres_marker.value=='end') {
-           document.anno.enddate.value=
-	       document.anno.pres_value.value;
-        }
-        if (document.anno.pres_marker.value=='start') {
-           document.anno.startdate.value=
-	       document.anno.pres_value.value;
-        }
-        pclose();
-    }
 
     function trysubmit() {
-        if (document.anno.startdate.value=='') {
-	    alert("Announcements must have a starting date");
-            return '';
-        }
-        if (document.anno.enddate.value=='') {
-	    alert("Announcements must have a starting date");
-            return '';
-        }
-        if (document.anno.startdate.value>document.anno.enddate.value) {
-	    alert("Starting date is later than ending date");
-            return '';
-        }
         document.anno.action.value="new";
 	document.anno.submit();
     }
@@ -188,8 +221,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
@@ -207,25 +251,7 @@ ENDDOCUMENT
         $tomorrowhash{'day'}++;
         my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);
         
-	$r->print(<<ENDFORM);
-<form name="anno" method="post">
-<input type="hidden" value=''          name="action"      >
-<input type="hidden" value=''          name="pres_value"  >
-<input type="hidden" value=''          name="pres_type"   >
-<input type="hidden" value=''          name="pres_marker" >
-<input type="hidden" value='$today'    name="startdate"   >
-<input type="hidden" value='$tomorrow' name="enddate"     >
-<a 
- href="javascript:pjump('date_start','Starting Date',document.anno.startdate.value,'start','anno.pres','dateset');"
->Set Starting Date</a>
-<a 
- href="javascript:pjump('date_end','Ending Date',document.anno.enddate.value,'end','anno.pres','dateset');"
->Set Ending Date</a><p>
-<textarea name="msg" rows="4" cols="60">
-</textarea>
-<input type="button" onClick="trysubmit()" value="Post Announcement"><hr>
-<input type="button" onClick="removesub()" value="Remove Marked"><hr>
-ENDFORM
+        &editfield($r,$today,$tomorrow,'');
     }
 # ----------------------------------------------------- Summarize all calendars
     my %allcal=();
@@ -241,9 +267,11 @@ ENDFORM
 		      'June','July','August','September','October',
                       'November','December')[$month].' '.$year.'</h1>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.
+ '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.
+ '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.'">Current Month</a><p>'.
         '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.
-        '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th>');
+        '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');
 
     my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
@@ -253,7 +281,7 @@ ENDFORM
     $r->print('<tr>');
     for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); }
     for (my $i=$weekday;$i<=6;$i++) { 
-        ($tk,$nm,$outp)=&showday($tk,%allcal);
+        ($tk,$nm,$outp)=&showday($tk,0,%allcal);
         $r->print($outp);
     }
     $r->print('</tr>');
@@ -261,17 +289,20 @@ ENDFORM
     for (my $k=0;$k<=3;$k++) {
         $r->print('<tr>');
         for (my $i=0;$i<=6;$i++) {
-            ($tk,$nm,$outp)=&showday($tk,%allcal);
+            ($tk,$nm,$outp)=&showday($tk,0,%allcal);
             if ($month!=$nm) { $outp=&emptycell; }
             $r->print($outp);
         }
         $r->print('</tr>');
     }
 # ------------------------------------------------------------------- End table
-    if ($allowed) { $r->print('</form>'); }
-    $r->print('</table><p>'.
+    $r->print('</table>');
+    if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }
+    $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.
+ '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.
+ '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.'">Current Month</a></p>'.
  '</body></html>');
     return OK;
 }