Author: solomax
Date: Tue Nov 11 08:53:32 2014
New Revision: 1638051
URL: http://svn.apache.org/r1638051
Log:
'Jump to next month on day click' is fixed in Calendar
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
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/AppointmentDialog.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
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/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1638051&r1=1638050&r2=1638051&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Tue Nov 11 08:53:32 2014
@@ -62,7 +62,7 @@
</tr>
<tr>
<td><wicket:ommessage key="1156" /></td>
- <td><span wicket:id="owner"></span></td>
+ <td><span
wicket:id="aowner"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="803" /></td>
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1638051&r1=1638050&r2=1638051&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Tue Nov 11 08:53:32 2014
@@ -222,7 +222,7 @@ public class AppointmentDialog extends A
private final DateTimeField start;
private final DateTimeField end;
private final PasswordTextField pwd = new
PasswordTextField("password");
- private final Label owner = new Label("owner");
+ private final Label owner = new Label("aowner", Model.of(""));
private final DropDownChoice<RoomType> roomType = new
RoomTypeDropDown("room.roomtype");
private final DropDownChoice<Room> room = new
DropDownChoice<Room>(
"room"
@@ -232,7 +232,7 @@ public class AppointmentDialog extends A
@Override
protected void onModelChanged() {
super.onModelChanged();
-
+
Appointment a = getModelObject();
List<AppointmentReminderTyps> remindTypes =
getRemindTypes();
if (a.getRemind() == null && !remindTypes.isEmpty()) {
@@ -326,7 +326,6 @@ public class AppointmentDialog extends A
add(new UserMultiChoice("attendees", attendeesModel));
add(owner);
-
}
private List<AppointmentReminderTyps> getRemindTypes() {
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=1638051&r1=1638050&r2=1638051&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
Tue Nov 11 08:53:32 2014
@@ -55,7 +55,12 @@ 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 SimpleDateFormat formatDateJava = new
SimpleDateFormat("MM/dd/yy");
+ 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;
@@ -191,7 +196,7 @@ public class CalendarPanel extends UserP
@Override
public void onSelect(AjaxRequestTarget target,
CalendarView view, Date start, Date end, boolean allDay) {
-
target.appendJavaScript("setDatepickerDate('datepicker','" +
formatDateJava.format(start) + "');");
+
target.appendJavaScript("setDatepickerDate('datepicker','" +
formatDateJava.get().format(start) + "');");
Appointment a = getDefault();
if (CalendarView.month == view &&
start.equals(end)) {
java.util.Calendar cNow =
java.util.Calendar.getInstance(getClientTimeZone());
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=1638051&r1=1638050&r2=1638051&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
Tue Nov 11 08:53:32 2014
@@ -50,11 +50,11 @@ function addCalButton(where, text, id) {
changeDay: true,
onChangeMonthYear: function(year, month, inst) {
var date = new Date();
- $('#${markupId}').fullCalendar('gotoDate', year, month-1,
date.getDate());
+ $('#${markupId}').fullCalendar('gotoDate', year + '-' +
(month-1) + '-' + date.getDate());
},
onSelect: function(dateText, inst) {
var date = new Date(dateText);
- $('#${markupId}').fullCalendar('gotoDate',
date.getFullYear(), date.getMonth(), date.getDate());
+ $('#${markupId}').fullCalendar('gotoDate',
date.getFullYear() + '-' + date.getMonth() + '-' + date.getDate());
}
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1638051&r1=1638050&r2=1638051&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Tue Nov 11 08:53:32 2014
@@ -62,7 +62,7 @@
</tr>
<tr>
<td><wicket:ommessage key="1156" /></td>
- <td><span wicket:id="owner"></span></td>
+ <td><span
wicket:id="aowner"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="803" /></td>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1638051&r1=1638050&r2=1638051&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Tue Nov 11 08:53:32 2014
@@ -221,7 +221,7 @@ public class AppointmentDialog extends A
private DateTimePicker start;
private DateTimePicker end;
private final PasswordTextField pwd = new
PasswordTextField("password");
- private final Label owner = new Label("owner");
+ private final Label owner = new Label("aowner", Model.of(""));
private final DropDownChoice<RoomType> roomType = new
RoomTypeDropDown("room.roomtype");
private final DropDownChoice<Room> room = new
DropDownChoice<Room>(
"room"
@@ -324,7 +324,6 @@ public class AppointmentDialog extends A
add(new UserMultiChoice("attendees", attendeesModel));
add(owner);
-
}
private List<AppointmentReminderType> getRemindTypes() {
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=1638051&r1=1638050&r2=1638051&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
Tue Nov 11 08:53:32 2014
@@ -55,7 +55,12 @@ 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 SimpleDateFormat formatDateJava = new
SimpleDateFormat("MM/dd/yy");
+ 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;
@@ -192,7 +197,7 @@ public class CalendarPanel extends UserP
@Override
public void onSelect(AjaxRequestTarget target,
CalendarView view, Date start, Date end, boolean allDay) {
-
target.appendJavaScript("setDatepickerDate('datepicker','" +
formatDateJava.format(start) + "');");
+
target.appendJavaScript("setDatepickerDate('datepicker','" +
formatDateJava.get().format(start) + "');");
Appointment a = getDefault();
if (CalendarView.month == view &&
start.equals(end)) {
java.util.Calendar cNow =
java.util.Calendar.getInstance(getClientTimeZone());
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=1638051&r1=1638050&r2=1638051&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
Tue Nov 11 08:53:32 2014
@@ -50,11 +50,11 @@ function addCalButton(where, text, id) {
changeDay: true,
onChangeMonthYear: function(year, month, inst) {
var date = new Date();
- $('#${markupId}').fullCalendar('gotoDate', year, month-1,
date.getDate());
+ $('#${markupId}').fullCalendar('gotoDate', year + '-' +
(month-1) + '-' + date.getDate());
},
onSelect: function(dateText, inst) {
var date = new Date(dateText);
- $('#${markupId}').fullCalendar('gotoDate',
date.getFullYear(), date.getMonth(), date.getDate());
+ $('#${markupId}').fullCalendar('gotoDate',
date.getFullYear() + '-' + date.getMonth() + '-' + date.getDate());
}
});
