Author: sebawagner
Date: Sun Jul 21 02:50:37 2013
New Revision: 1505253
URL: http://svn.apache.org/r1505253
Log:
Some debug for OPENMEETINGS-708, but I could not really come to the bottom of
the issue
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1505253&r1=1505252&r2=1505253&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
Sun Jul 21 02:50:37 2013
@@ -399,5 +399,10 @@ public class Appointment implements Seri
public void setIsReminderEmailSend(Boolean isReminderEmailSend) {
this.isReminderEmailSend = isReminderEmailSend;
}
+
+ @Override
+ public String toString() {
+ return "" + super.toString() + " Appointment ID: " +
this.getAppointmentId();
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1505253&r1=1505252&r2=1505253&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Sun Jul 21 02:50:37 2013
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.calendar;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -59,11 +60,16 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class AppointmentDialog extends AbstractFormDialog<Appointment> {
+
+ private static final Logger log =
Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
+
private static final long serialVersionUID = 7553035786264113827L;
private AppointmentForm form;
private DialogButton save = new DialogButton(WebSession.getString(813));
@@ -86,6 +92,7 @@ public class AppointmentDialog extends A
public AppointmentDialog(String id, String title, CalendarPanel
calendar, IModel<Appointment> model) {
super(id, title, model, true);
+ log.debug(" -- AppointmentDialog -- Current model " +
getModel().getObject());
this.calendar = calendar;
setOutputMarkupId(true);
feedback = new FeedbackPanel("feedback");
@@ -97,6 +104,11 @@ public class AppointmentDialog extends A
@Override
protected List<DialogButton> getButtons() {
+ log.debug(" -- getButtons -- Current model " +
getModel().getObject());
+ if (getModel().getObject().getAppointmentId() != null) {
+ //TODO: This code does not work
+ return Arrays.asList(save, delete, cancel);
+ }
return Arrays.asList(save, delete, cancel);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1505253&r1=1505252&r2=1505253&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Sun Jul 21 02:50:37 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web.user.calendar;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
@@ -33,6 +35,8 @@ import org.apache.wicket.ajax.json.JSONE
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.util.time.Duration;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.calendar.Calendar;
@@ -40,6 +44,8 @@ import com.googlecode.wicket.jquery.ui.c
public class CalendarPanel extends UserPanel {
+ private static final Logger log =
Red5LoggerFactory.getLogger(CalendarPanel.class, webAppRootKey);
+
private static final long serialVersionUID = -6536379497642291437L;
private Calendar calendar;
@@ -218,6 +224,7 @@ public class CalendarPanel extends UserP
a.setRemind(getAppointmentReminderTypDao()
.getAppointmentReminderTypById(3L)); //TODO:
Make configurable
a.setAppointmentName(WebSession.getString(1444));
+ log.debug(" -- getDefault -- Current model " + a);
return a;
}
}
