[Bedework-commit] r403 - trunk/calendar3/webclient/src/org/bedework/webclient

[svnadmin at bedework.org]

Author: douglm
Date: 2006-04-20 16:54:36 -0400 (Thu, 20 Apr 2006)
New Revision: 403

Modified:
   trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java
Log:
Free busy tracks navigation

Modified: trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java
===================================================================
--- trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java	2006-04-20 20:00:56 UTC (rev 402)
+++ trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java	2006-04-20 20:54:36 UTC (rev 403)
@@ -56,6 +56,7 @@
 //import org.bedework.calfacade.BwDateTime;
 import org.bedework.appcommon.FormattedFreeBusy;
 import org.bedework.appcommon.MyCalendarVO;
+import org.bedework.appcommon.TimeView;
 import org.bedework.calfacade.BwDuration;
 import org.bedework.calfacade.BwFreeBusy;
 import org.bedework.calfacade.BwUser;
@@ -68,6 +69,8 @@
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Locale;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -116,16 +119,35 @@
       user = svci.getUser();
     }
 
-    MyCalendarVO today = form.getToday();
-    MyCalendarVO thisWeek = today.getFirstDayOfThisWeek();
-    Calendar start = thisWeek.getCalendar();
-    //BwDateTime startDt = form.getEventStartDate().getDateTime();
+    MyCalendarVO scal;
+    Calendar start;
+    Calendar end;
+    Calendar endDay;
 
-    Calendar end = thisWeek.getNextWeek().getCalendar();
-    //BwDateTime endDt = form.getEventEndDate().getDateTime();
+    String st = getReqPar(request, "start");
 
-    Calendar endDay = thisWeek.getTomorrow().getCalendar();
+    if (st == null) {
+      /* Set period and start from the current timeview */
+      TimeView tv = form.getCurTimeView();
 
+      scal = tv.getFirstDay();
+      start = scal.getCalendar();
+      end = tv.getLastDay().getTomorrow().getCalendar();
+    } else {
+      Locale loc = Locale.getDefault();  // XXX Locale
+
+      Date jdt = CalFacadeUtil.fromISODate(st);
+      scal = new MyCalendarVO(jdt, loc);
+
+      scal = scal.getFirstDayOfThisWeek();
+      start = scal.getCalendar();
+      //BwDateTime startDt = form.getEventStartDate().getDateTime();
+
+      end = scal.getNextWeek().getCalendar();
+    }
+
+    endDay = scal.getTomorrow().getCalendar();
+
     int interval = getIntReqPar(request, "interval", 1);
     if (interval <= 0) {
       form.getErr().emit("org.bedework.client.error.badinterval");