--- loncom/interface/lonannounce.pm	2002/08/21 17:18:08	1.6
+++ loncom/interface/lonannounce.pm	2003/05/21 16:26:46	1.9
@@ -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.9 2003/05/21 16:26:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::lonannounce;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
+use Apache::lonhtmlcommon();
 
 sub readcalendar {
     my $courseid=shift;
@@ -120,51 +121,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 +152,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,24 +182,23 @@ ENDDOCUMENT
         $tomorrowhash{'day'}++;
         my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);
         
+    # Deal with date forms
+	my $startdateform = &Apache::lonhtmlcommon::date_setter('anno',
+                                                            'startdate',
+                                                            $today);
+	my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
+                                                          'enddate',
+                                                          $tomorrow);
+    #
+
 	$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>
+<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">
 </textarea>
 <input type="button" onClick="trysubmit()" value="Post Announcement"><hr>
-<input type="button" onClick="removesub()" value="Remove Marked"><hr>
 ENDFORM
     }
 # ----------------------------------------------------- Summarize all calendars
@@ -243,7 +217,7 @@ ENDFORM
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next 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;
@@ -268,8 +242,9 @@ ENDFORM
         $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>'.
  '</body></html>');
