Changeset 375

Timestamp:

04/13/06 23:18:13

Author:

douglm

Message:

Free busy

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/FormattedFreeBusy.java (added)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDateTime.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwPreferences.java (modified) (3 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwActionForm.java (modified) (4 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java (modified) (5 diffs)
• trunk/calendar3/webclient/war/docs/freeBusy.jsp (modified) (1 diff)

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDateTime.java

@@ -370 +370 @@
-  }
-
+  /**
+   * @param val
+   * @param timezones
+   * @throws CalFacadeException
+   */
+  public void initFromDateTime(Date val, CalTimezones timezones) throws CalFacadeException {
+    boolean dateOnly = true;
+    String tzid = null;
+
+    if (val instanceof DateTime) {
+      DateTime dt = (DateTime)val;
+
+      dateOnly = false;
+      tzid = dt.getTimeZone().getID();
+    }
+
+    init(dateOnly, val.toString(), tzid, timezones);
+  }
+
-  /** Set utc time
-   *

trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java

@@ -690 +690 @@
-    return al;
-  }
+
+  /**Turn the int minutes into a 4 digit String hours and minutes value
+   *
+   * @param  int minutes
+   * @return String time
+   */
+  public static String getTimeFromMinutes(int minutes) {
+    return pad2(minutes / 60) + pad2(minutes % 60);
+  }
+
+  /** Return String value of par padded to 2 digits.
+   * @param val
+   * @return
+   */
+  public static String pad2(int val) {
+    if (val > 9) {
+      return String.valueOf(val);
+    }
+
+    return "0" + String.valueOf(val);
+  }
-}
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwPreferences.java

@@ -32 +32 @@
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.CalFacadeException;
+import org.bedework.calfacade.CalFacadeUtil;
-
-import java.util.Collection;
@@ -344 +345 @@
-  }
-
-
-
-
-
+
-   *
-   * @param val  String time value
-   */
-  public void setWorkdayStart(String val) throws CalFacadeException{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* ====================================================================
@@ -448 +442 @@
-    return sb.toString();
-  }
+
+  /* ====================================================================
+   *                   private methods
+   * ==================================================================== */
+
+  /** Turn a String time value e.g. 1030 into a numeric minutes value and set
+   * the numeric value in the prefeences.
+   *
+   * <p>Ignores anything after the first four characters which must all be digits.
+   *
+   * @param val  String time value
+   */
+  private int makeMinutesFromTime(String val) throws CalFacadeException{
+    boolean badval = false;
+    int minutes = 0;
+
+    try {
+      int hours = Integer.parseInt(val.substring(0, 2));
+      minutes = Integer.parseInt(val.substring(2, 4));
+      if ((hours < 0) || (hours > 24)) {
+        badval = true;
+      } else if ((minutes < 0) || (minutes > 59)) {
+        badval = true;
+      } else {
+        minutes *= (hours * 60);
+      }
+    } catch (Throwable t) {
+      badval = true;
+    }
+
+    if (badval) {
+      throw new CalFacadeException("org.bedework.prefs.badvalue", val);
+    }
+
+    return minutes;
+  }
-}

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -1107 +1107 @@
-            fbc = new BwFreeBusyComponent();
-            fb.addTime(fbc);
-
-
+
+
+
+
+
+
+
-            if (periodEvents.size() == 0) {
-              fbc.setType(BwFreeBusyComponent.typeFree);
@@ -1115 +1120 @@
-            // Some events fall in the period. Add an entry.
-
-
-
+
+
+
+
+
+
-          }
-        }

trunk/calendar3/webclient/src/org/bedework/webclient/BwActionForm.java

@@ -55 +55 @@
-package org.bedework.webclient;
-
+import java.util.ArrayList;
+import java.util.Collection;
-import java.util.Date;
-import java.util.Locale;
@@ -62 +64 @@
-import org.bedework.appcommon.MyCalendarVO;
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwFreeBusy;
-import org.bedework.webcommon.DurationBean;
-import org.bedework.webcommon.BwActionFormBase;
@@ -130 +131 @@
-  private boolean alarmTriggerByDate;
-
-BwFreeBusy
+Collection
-
-  /* ====================================================================
@@ -308 +309 @@
-   * @param val
-   */
-BwFreeBusy
+Collection
-    freeBusy = val;
-  }
-
-  /**
-
-
-
+
+
+
+
+
+
-    return freeBusy;
-  }

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

@@ -52 +52 @@
-    to the maximum extent the law permits.
-*/
-
-package org.bedework.webclient;
-
-//import org.bedework.calfacade.BwDateTime;
+import org.bedework.appcommon.FormattedFreeBusy;
-import org.bedework.appcommon.MyCalendarVO;
-import org.bedework.calfacade.BwDuration;
@@ -64 +64 @@
-import org.bedework.calsvci.CalSvcI;
-
+import java.util.ArrayList;
-import java.util.Calendar;
+import java.util.Collection;
-import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
@@ -90 +92 @@
- * <p>If no period is given return this week. If no interval and intunit is
- * supplied default to 1 hour intervals during the workday.
+ *
+ * @author Mike Douglass douglm @ rpi.edu
- */
-public class BwFreeBusyAction extends BwCalAbstractAction {
@@ -118 +122 @@
-    Calendar end = thisWeek.getNextWeek().getCalendar();
-    //BwDateTime endDt = form.getEventEndDate().getDateTime();
+
+    Calendar endDay = thisWeek.getTomorrow().getCalendar();
-
-    int interval = getIntReqPar(request, "interval", 1);
@@ -148 +154 @@
-    CalTimezones tzs = svci.getTimezones();
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    BwFreeBusy fb = svci.getFreeBusy(null, user,
-                                     CalFacadeUtil.getDateTime(sdt, false, false, tzs),
-                                     CalFacadeUtil.getDateTime(edt, false, false, tzs),
-                                     dur, true);
-
-b
+reeBusy
-
-    return "success";

trunk/calendar3/webclient/war/docs/freeBusy.jsp

@@ -12 +12 @@
-<page>freeBusy</page>
-
-<bean:define id="freeBusyObj"
-             name="calForm"
-             property="freeBusy"
-             toScope="request"/>
-
-<freebusy>
-  <bw:emitText name="freeBusyObj" property="who.account" tagName="who" /
-bw:emitText name="freeBusyObj" property="start.dtval" tagName="start" /
-<bw:emitText name="freeBusyObj" property="end.dtval" tagName="end
-<logic:iterate id="freeBusyComponent"  name="freeBusyObj" property="times" 
-freeBusyComponent
-  <fbtype><bean:write name="freeBusyComponent" property="type" /></fbtype
-  <logic:iterate id="period"  name="freeBusyComponent" property="periods" 
-  <period
-    <start><bean:write name="period" property="start
-    <end><bean:write name="period" property="end" /></end
-    
-  
-  </freeBusyComponent
-  
+<logic:iterate id="freeBusyObj" name="calForm" property="freeBusy" 
+day
+  <bw:emitText name="freeBusyObj" property="who.account" tagName="who
+  <bw:emitText name="freeBusyObj" property="start.dtval" tagName="start" /
+bw:emitText name="freeBusyObj" property="end.dtval" tagName="end" /
+<logic:iterate id="fbperiod"  name="freeBusyObj" property="times" 
+<period
+<fbtype><bean:write name="fbperiod" property="type" /></fbtype
+<start><bean:write name="fbperiod" property="startTime
+<length><bean:write name="fbperiod" property="minutesLength" /></length
+
+
+</day
+
-</freebusy>
-