Changeset 403

Show
Ignore:
Timestamp:
04/20/06 16:54:36
Author:
douglm
Message:

Free busy tracks navigation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java

    r397 r403  
    5757import org.bedework.appcommon.FormattedFreeBusy; 
    5858import org.bedework.appcommon.MyCalendarVO; 
     59import org.bedework.appcommon.TimeView; 
    5960import org.bedework.calfacade.BwDuration; 
    6061import org.bedework.calfacade.BwFreeBusy; 
    …… 
    6970import java.util.Collection; 
    7071import java.util.Date; 
     72import java.util.Locale; 
     73 
    7174import javax.servlet.http.HttpServletRequest; 
    7275 
    …… 
    117120    } 
    118121 
    119     MyCalendarVO today = form.getToday(); 
    120     MyCalendarVO thisWeek = today.getFirstDayOfThisWeek(); 
    121     Calendar start = thisWeek.getCalendar(); 
    122     //BwDateTime startDt = form.getEventStartDate().getDateTime(); 
    123  
    124     Calendar end = thisWeek.getNextWeek().getCalendar(); 
    125     //BwDateTime endDt = form.getEventEndDate().getDateTime(); 
    126  
    127     Calendar endDay = thisWeek.getTomorrow().getCalendar(); 
     122    MyCalendarVO scal; 
     123    Calendar start; 
     124    Calendar end; 
     125    Calendar endDay; 
     126 
     127    String st = getReqPar(request, "start"); 
     128 
     129    if (st == null) { 
     130      /* Set period and start from the current timeview */ 
     131      TimeView tv = form.getCurTimeView(); 
     132 
     133      scal = tv.getFirstDay(); 
     134      start = scal.getCalendar(); 
     135      end = tv.getLastDay().getTomorrow().getCalendar(); 
     136    } else { 
     137      Locale loc = Locale.getDefault();  // XXX Locale 
     138 
     139      Date jdt = CalFacadeUtil.fromISODate(st); 
     140      scal = new MyCalendarVO(jdt, loc); 
     141 
     142      scal = scal.getFirstDayOfThisWeek(); 
     143      start = scal.getCalendar(); 
     144      //BwDateTime startDt = form.getEventStartDate().getDateTime(); 
     145 
     146      end = scal.getNextWeek().getCalendar(); 
     147    } 
     148 
     149    endDay = scal.getTomorrow().getCalendar(); 
    128150 
    129151    int interval = getIntReqPar(request, "interval", 1);