Author: solomax
Date: Wed Nov 19 15:39:48 2014
New Revision: 1640574
URL: http://svn.apache.org/r1640574
Log:
[OPENMEETINGS-1124] bad date issue in calendar is fixed
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1640574&r1=1640573&r2=1640574&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Wed Nov 19 15:39:48 2014
@@ -24,7 +24,6 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getClientTimeZone;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -55,12 +54,6 @@ public class CalendarPanel extends UserP
private static final long serialVersionUID = 1L;
private static final String javaScriptMarkup = "setCalendarHeight();";
private static final String javaScriptAddDatepicker =
"addCalButton('left', 'Datepicker', 'datepicker');";
- private static final ThreadLocal<SimpleDateFormat> formatDateJava = new
ThreadLocal<SimpleDateFormat>() {
- @Override
- protected SimpleDateFormat initialValue() {
- return new SimpleDateFormat("MM/dd/yy");
- }
- };
private final AbstractAjaxTimerBehavior refreshTimer = new
AbstractAjaxTimerBehavior(Duration.seconds(10)) {
private static final long serialVersionUID = 1L;
@@ -196,12 +189,12 @@ public class CalendarPanel extends UserP
@Override
public void onSelect(AjaxRequestTarget target,
CalendarView view, Date start, Date end, boolean allDay) {
-
target.appendJavaScript("setDatepickerDate('datepicker','" +
formatDateJava.get().format(start) + "');");
+ java.util.Calendar cStart =
java.util.Calendar.getInstance(getClientTimeZone());
+ cStart.setTime(start);
+
target.appendJavaScript(String.format("setDatepickerDate('datepicker', new
Date(%s,%s,%s));", cStart.get(java.util.Calendar.YEAR),
cStart.get(java.util.Calendar.MONTH), cStart.get(java.util.Calendar.DATE)));
Appointment a = getDefault();
if (CalendarView.month == view &&
start.equals(end)) {
java.util.Calendar cNow =
java.util.Calendar.getInstance(getClientTimeZone());
- java.util.Calendar cStart =
java.util.Calendar.getInstance(getClientTimeZone());
- cStart.setTime(start);
cStart.set(java.util.Calendar.HOUR_OF_DAY,
cNow.get(java.util.Calendar.HOUR_OF_DAY));
cStart.set(java.util.Calendar.MINUTE,
cNow.get(java.util.Calendar.MINUTE));
cStart.set(java.util.Calendar.SECOND,
0);
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1640574&r1=1640573&r2=1640574&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Wed Nov 19 15:39:48 2014
@@ -49,8 +49,8 @@ function addCalButton(where, text, id) {
changeYear: true,
changeDay: true,
onChangeMonthYear: function(year, month, inst) {
- var date = new Date();
- $('#${markupId}').fullCalendar('gotoDate', year + '-' +
(month-1) + '-' + date.getDate());
+ //v2 version $('#${markupId}').fullCalendar('gotoDate',
$.fullCalendar.moment(year + '-' + (month-1) + '-' + inst.currentDay));
+ $('#${markupId}').fullCalendar('gotoDate', year, month
- 1, inst.currentDay);
},
onSelect: function(dateText, inst) {
var date = new Date(dateText);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1640574&r1=1640573&r2=1640574&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Wed Nov 19 15:39:48 2014
@@ -55,12 +55,6 @@ public class CalendarPanel extends UserP
private static final long serialVersionUID = 1L;
private static final String javaScriptMarkup = "setCalendarHeight();";
private static final String javaScriptAddDatepicker =
"addCalButton('left', 'Datepicker', 'datepicker');";
- private static final ThreadLocal<SimpleDateFormat> formatDateJava = new
ThreadLocal<SimpleDateFormat>() {
- @Override
- protected SimpleDateFormat initialValue() {
- return new SimpleDateFormat("MM/dd/yy");
- }
- };
private final AbstractAjaxTimerBehavior refreshTimer = new
AbstractAjaxTimerBehavior(Duration.seconds(10)) {
private static final long serialVersionUID = 1L;
@@ -197,12 +191,12 @@ public class CalendarPanel extends UserP
@Override
public void onSelect(AjaxRequestTarget target,
CalendarView view, Date start, Date end, boolean allDay) {
-
target.appendJavaScript("setDatepickerDate('datepicker','" +
formatDateJava.get().format(start) + "');");
+ java.util.Calendar cStart =
java.util.Calendar.getInstance(getClientTimeZone());
+ cStart.setTime(start);
+
target.appendJavaScript(String.format("setDatepickerDate('datepicker', new
Date(%s,%s,%s));", cStart.get(java.util.Calendar.YEAR),
cStart.get(java.util.Calendar.MONTH), cStart.get(java.util.Calendar.DATE)));
Appointment a = getDefault();
if (CalendarView.month == view &&
start.equals(end)) {
java.util.Calendar cNow =
java.util.Calendar.getInstance(getClientTimeZone());
- java.util.Calendar cStart =
java.util.Calendar.getInstance(getClientTimeZone());
- cStart.setTime(start);
cStart.set(java.util.Calendar.HOUR_OF_DAY,
cNow.get(java.util.Calendar.HOUR_OF_DAY));
cStart.set(java.util.Calendar.MINUTE,
cNow.get(java.util.Calendar.MINUTE));
cStart.set(java.util.Calendar.SECOND,
0);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1640574&r1=1640573&r2=1640574&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Wed Nov 19 15:39:48 2014
@@ -49,8 +49,8 @@ function addCalButton(where, text, id) {
changeYear: true,
changeDay: true,
onChangeMonthYear: function(year, month, inst) {
- var date = new Date();
- $('#${markupId}').fullCalendar('gotoDate', year + '-' +
(month-1) + '-' + date.getDate());
+ //v2 version $('#${markupId}').fullCalendar('gotoDate',
$.fullCalendar.moment(year + '-' + (month-1) + '-' + inst.currentDay));
+ $('#${markupId}').fullCalendar('gotoDate', year, month
- 1, inst.currentDay);
},
onSelect: function(dateText, inst) {
var date = new Date(dateText);
