Fixed problem with calculating dates when client and server were on different time zones.

Fixed invalid rearanging causing invalid forward reference.

@@ -45,6 +45,37 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
 
 
     public static final String COMPONENT_TYPE = "org.richfaces.Schedule";
     public static final String COMPONENT_TYPE = "org.richfaces.Schedule";
 
 
+    /**
+     * Values of switchType attribute
+     */
+    public static final String SWITCH_TYPE_AJAX = "ajax";
+
+    public static final String SWITCH_TYPE_CLIENT = "client";
+
+    public static final String SWITCH_TYPE_SERVER = "server";
+
+    public static final String VIEW_AGENDA_DAY = "agendaDay";
+
+    public static final String VIEW_AGENDA_WEEK = "agendaWeek";
+
+    public static final String VIEW_BASIC_DAY = "basicDay";
+
+    public static final String VIEW_BASIC_WEEK = "basicWeek";
+
+    /**
+     * Values of view attribute.
+     */
+    public static final String VIEW_MONTH = "month";
+
+    /**
+     * Values of weekMode attribute.
+     */
+    public static final String WEEK_MODE_FIXED = "fixed";
+
+    public static final String WEEK_MODE_LIQUID = "liquid";
+
+    public static final String WEEK_MODE_VARIABLE = "variable";
+
     public static final boolean DEFAULT_ALL_DAY_DEFAULT = true;
     public static final boolean DEFAULT_ALL_DAY_DEFAULT = true;
 
 
     public static final boolean DEFAULT_ALL_DAY_SLOT = true;
     public static final boolean DEFAULT_ALL_DAY_SLOT = true;
@@ -93,37 +124,6 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
 
 
     public static final String DEFAULT_WEEK_MODE = WEEK_MODE_FIXED;
     public static final String DEFAULT_WEEK_MODE = WEEK_MODE_FIXED;
 
 
-    /**
-     * Values of switchType attribute
-     */
-    public static final String SWITCH_TYPE_AJAX = "ajax";
-
-    public static final String SWITCH_TYPE_CLIENT = "client";
-
-    public static final String SWITCH_TYPE_SERVER = "server";
-
-    public static final String VIEW_AGENDA_DAY = "agendaDay";
-
-    public static final String VIEW_AGENDA_WEEK = "agendaWeek";
-
-    public static final String VIEW_BASIC_DAY = "basicDay";
-
-    public static final String VIEW_BASIC_WEEK = "basicWeek";
-
-    /**
-     * Values of view attribute.
-     */
-    public static final String VIEW_MONTH = "month";
-
-    /**
-     * Values of weekMode attribute.
-     */
-    public static final String WEEK_MODE_FIXED = "fixed";
-
-    public static final String WEEK_MODE_LIQUID = "liquid";
-
-    public static final String WEEK_MODE_VARIABLE = "variable";
-
     private DataModel model;
     private DataModel model;
 
 
 // -------------------------- STATIC METHODS --------------------------
 // -------------------------- STATIC METHODS --------------------------

@@ -27,6 +27,9 @@ import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.context.ResponseWriter;
 import java.io.IOException;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Date;
@@ -71,6 +74,8 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
 
 
     private static final String VIEW_PARAM = "view";
     private static final String VIEW_PARAM = "view";
 
 
+    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
 // -------------------------- STATIC METHODS --------------------------
 // -------------------------- STATIC METHODS --------------------------
 
 
     /**
     /**
@@ -157,8 +162,8 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
 
 
             try {
             try {
                 if (DATE_RANGE_CHANGE_EVENT.equals(eventTypeParam)) {
                 if (DATE_RANGE_CHANGE_EVENT.equals(eventTypeParam)) {
-                    Date startDate = new Date(Long.parseLong(startDateParam) * 1000);
-                    Date endDate = new Date(Long.parseLong(endDateParam) * 1000);
+                    Date startDate = DATE_FORMAT.parse(startDateParam);
+                    Date endDate = DATE_FORMAT.parse(endDateParam);
                     new ScheduleDateRangeChangeEvent(component, startDate, endDate).queue();
                     new ScheduleDateRangeChangeEvent(component, startDate, endDate).queue();
                 } else if (ITEM_MOVE_EVENT.equals(eventTypeParam)) {
                 } else if (ITEM_MOVE_EVENT.equals(eventTypeParam)) {
                     int dayDelta = Integer.parseInt(dayDeltaParam);
                     int dayDelta = Integer.parseInt(dayDeltaParam);
@@ -174,16 +179,16 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
                 } else if (VIEW_CHANGE_EVENT.equals(eventTypeParam)) {
                 } else if (VIEW_CHANGE_EVENT.equals(eventTypeParam)) {
                     new ScheduleViewChangeEvent(component, viewParam).queue();
                     new ScheduleViewChangeEvent(component, viewParam).queue();
                 } else if (DATE_SELECT_EVENT.equals(eventTypeParam)) {
                 } else if (DATE_SELECT_EVENT.equals(eventTypeParam)) {
-                    Date startDate = new Date(Long.parseLong(startDateParam) * 1000);
+                    Date startDate = DATE_FORMAT.parse(startDateParam);
                     boolean allDay = Boolean.parseBoolean(allDayParam);
                     boolean allDay = Boolean.parseBoolean(allDayParam);
                     new ScheduleDateSelectEvent(component, startDate, allDay).queue();
                     new ScheduleDateSelectEvent(component, startDate, allDay).queue();
                 } else if (DATE_RANGE_SELECT_EVENT.equals(eventTypeParam)) {
                 } else if (DATE_RANGE_SELECT_EVENT.equals(eventTypeParam)) {
-                    Date startDate = new Date(Long.parseLong(startDateParam) * 1000);
-                    Date endDate = new Date(Long.parseLong(endDateParam) * 1000);
+                    Date startDate = DATE_FORMAT.parse(startDateParam);
+                    Date endDate = DATE_FORMAT.parse(endDateParam);
                     boolean allDay = Boolean.parseBoolean(allDayParam);
                     boolean allDay = Boolean.parseBoolean(allDayParam);
                     new ScheduleDateRangeSelectEvent(component, startDate, endDate, allDay).queue();
                     new ScheduleDateRangeSelectEvent(component, startDate, endDate, allDay).queue();
                 }
                 }
-            } catch (NumberFormatException ex) {
+            } catch (ParseException ex) {
                 throw new FacesException("Cannot convert request parmeters", ex);
                 throw new FacesException("Cannot convert request parmeters", ex);
             }
             }
         }
         }

@@ -23,7 +23,7 @@ RichFaces.Schedule = function(id, locale, options, dateRangeChangeEventName, ite
      * for new Date(long) - milliseconds since epoch.
      * for new Date(long) - milliseconds since epoch.
      */
      */
     var formatDateParam = function(date) {
     var formatDateParam = function(date) {
-        return Math.round(date.getTime() / 1000);
+        return jQuery.fullCalendar.formatDate(date, "yyyy-MM-dd HH:mm:ss");
     };
     };
     /**
     /**
      * Compares two dates with with an accuracy of a day.
      * Compares two dates with with an accuracy of a day.