Changeset 456

Timestamp:

05/05/06 11:43:09

Author:

douglm

Message:

--

Files:

• trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwPreferences.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java (modified) (1 diff)

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

@@ -103 +103 @@
-   */
-  public static final int advancedMode = 2;
+
+  /** Max mode value
+   */
+  public static final int maxMode = 2;
-
-  private int userMode;

trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java

@@ -167 +167 @@
-    */
-
+    /* user mode */
+
+    int mode = getIntReqPar(request, "userMode", -1);
+
+    if (mode != -1) {
+      if ((mode < 0) || (mode > BwPreferences.maxMode)) {
+        form.getErr().emit("org.bedework.client.error.badPref", "userMode");
+        return "badPref";
+      }
+
+      prefs.setUserMode(mode);
+    }
+
+    /* workdays */
+
+    int minutes = getIntReqPar(request, "workDayStart", -1);
+
+    if (minutes != -1) {
+      if ((minutes < 0) || (minutes > 24 * 60 - 1)) {
+        form.getErr().emit("org.bedework.client.error.badPref", "workDayStart");
+        return "badPref";
+      }
+
+      prefs.setWorkdayStart(minutes);
+    }
+
+    minutes = getIntReqPar(request, "workDayEnd", -1);
+
+    if (minutes != -1) {
+      if ((minutes < 0) || (minutes > 24 * 60 - 1)) {
+        form.getErr().emit("org.bedework.client.error.badPref", "workDayEnd");
+        return "badPref";
+      }
+
+      prefs.setWorkdayEnd(minutes);
+    }
+
+    if (prefs.getWorkdayStart() > prefs.getWorkdayEnd()) {
+      form.getErr().emit("org.bedework.client.error.badPref",
+                         "workDayStart > workDayEnd");
+      return "badPref";
+    }
+
+    /*     <li>"preferredEndType" For adding events:
+    */
+    str = getReqPar(request, "preferredEndType");
+    if (str != null) {
+      if ("duration".equals(str) || "date".equals(str)) {
+        prefs.setPreferredEndType(str);
+      } else {
+        form.getErr().emit("org.bedework.client.error.badPref", "preferredEndType");
+        return "badPref";
+      }
+    }
+
-    svc.updateUserPrefs(prefs);
-    form.getMsg().emit("org.bedework.client.message.prefs.updated");