Author: solomax
Date: Fri Aug 2 04:11:16 2013
New Revision: 1509530
URL: http://svn.apache.org/r1509530
Log:
[OPENMEETINGS-726] connected Appointment are now displayed in the invitee's
calendar;
code clean-up
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1509530&r1=1509529&r2=1509530&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
Fri Aug 2 04:11:16 2013
@@ -279,22 +279,12 @@ public class AppointmentDao {
}
// update meeting members
List<MeetingMember> mmList = a.getMeetingMember();
- if ( mmList != null){
+ if (mmList != null){
for (MeetingMember mm : mmList){
- Long usrId = mm.getUserid().getUser_id();
- if (usrId == null){
- usrId =
userManager.addUser(mm.getUserid());
- }
- //TODO base url should be changed
- String urlPostfix = "";
- if (mm.getUserid().getType() == Type.contact) {
- urlPostfix = "swf";
- } else {
- urlPostfix = "#room/" + r.getRooms_id();
- }
+ String urlPostfix = (mm.getUserid().getType()
== Type.contact) ? "" : "#room/" + r.getRooms_id();
meetingMemberLogic.addMeetingMemberInvitation(mm, a,
- WebSession.get().getBaseUrl() +
urlPostfix, u);
+ WebSession.get().getBaseUrl() +
urlPostfix, u);
}
}
return a;
@@ -474,7 +464,7 @@ public class AppointmentDao {
!ap.getAppointmentEndtime().equals(appointmentend);
// change connected events of other participants
- if (ap.getIsConnectedEvent() != null &&
ap.getIsConnectedEvent()) {
+ if (ap.getIsConnectedEvent()) {
this.updateConnectedEvents(ap, appointmentName,
appointmentDescription,
appointmentstart,
appointmentend, isDaily,
isWeekly, isMonthly, isYearly,
@@ -682,7 +672,7 @@ public class AppointmentDao {
!ap.getAppointmentEndtime().equals(appointmentend)) {
// change connected events of other participants
- if (ap.getIsConnectedEvent() != null &&
ap.getIsConnectedEvent()) {
+ if (ap.getIsConnectedEvent()) {
this.updateConnectedEventsTimeOnly(ap,
appointmentstart,
appointmentend);
}
@@ -750,16 +740,14 @@ public class AppointmentDao {
return null;
}
- public List<Appointment> getAppointmentsByRange(Long userId,
- Date starttime, Date endtime) {
+ public List<Appointment> getAppointmentsByRange(Long userId, Date
start, Date end) {
try {
-
Calendar calstart = Calendar.getInstance();
- calstart.setTime(starttime);
+ calstart.setTime(start);
calstart.set(Calendar.HOUR, 0);
Calendar calend = Calendar.getInstance();
- calend.setTime(endtime);
+ calend.setTime(end);
calend.set(Calendar.HOUR, 23);
calend.set(Calendar.MINUTE, 59);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1509530&r1=1509529&r2=1509530&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
Fri Aug 2 04:11:16 2013
@@ -319,7 +319,6 @@ public class AppointmentLogic {
log.debug("deleteAppointment : " + appointmentId);
try {
-
Appointment point = getAppointMentById(appointmentId);
if (point == null) {
@@ -327,39 +326,29 @@ public class AppointmentLogic {
return null;
}
- if (point.getIsConnectedEvent() != null
- && point.getIsConnectedEvent()) {
- List<Appointment> appointments = appointmentDao
-
.getAppointmentsByRoomId(point.getRoom().getRooms_id());
+ if (point.getIsConnectedEvent()) {
+ List<Appointment> appointments =
appointmentDao.getAppointmentsByRoomId(point.getRoom().getRooms_id());
for (Appointment appointment : appointments) {
-
if
(!appointment.getAppointmentId().equals(appointmentId)) {
-
-
appointmentDao.deleteAppointement(appointment
-
.getAppointmentId());
-
+
appointmentDao.deleteAppointement(appointment.getAppointmentId());
}
-
}
-
}
Room room = point.getRoom();
// Deleting/Notifing Meetingmembers
- List<MeetingMember> members = meetingMemberDao
-
.getMeetingMemberByAppointmentId(appointmentId);
+ List<MeetingMember> members =
meetingMemberDao.getMeetingMemberByAppointmentId(appointmentId);
- if (members == null)
- log.debug("Appointment " +
point.getAppointmentName()
- + " has no meeting members");
+ if (members == null) {
+ log.debug("Appointment " +
point.getAppointmentName() + " has no meeting members");
+ }
if (members != null) {
for (int i = 0; i < members.size(); i++) {
log.debug("deleting member " +
members.get(i).getEmail());
-
meetingMemberLogic.deleteMeetingMember(members.get(i)
- .getMeetingMemberId(),
users_id, language_id);
+
meetingMemberLogic.deleteMeetingMember(members.get(i).getMeetingMemberId(),
users_id, language_id);
}
}
@@ -373,13 +362,10 @@ public class AppointmentLogic {
}
return appointmentId;
-
} catch (Exception err) {
log.error("[deleteAppointment]", err);
}
-
return null;
-
}
//
-------------------------------------------------------------------------------------
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=1509530&r1=1509529&r2=1509530&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
Fri Aug 2 04:11:16 2013
@@ -192,7 +192,7 @@ public class Appointment implements Seri
private String password;
@Column(name = "is_connected_event")
- private Boolean isConnectedEvent;
+ private boolean isConnectedEvent;
@Column(name = "is_reminder_email_send")
private Boolean isReminderEmailSend = false; //default to false
@@ -385,11 +385,11 @@ public class Appointment implements Seri
this.password = password;
}
- public Boolean getIsConnectedEvent() {
+ public boolean getIsConnectedEvent() {
return isConnectedEvent;
}
- public void setIsConnectedEvent(Boolean isConnectedEvent) {
+ public void setIsConnectedEvent(boolean isConnectedEvent) {
this.isConnectedEvent = isConnectedEvent;
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java?rev=1509530&r1=1509529&r2=1509530&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
Fri Aug 2 04:11:16 2013
@@ -39,7 +39,6 @@ import org.apache.openmeetings.persisten
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
-
@Entity
@Table(name = "meeting_members")
@Root(name="meetingmember")
@@ -98,7 +97,7 @@ public class MeetingMember implements Se
@Column(name="invitor")
@Element(data=true)
- private Boolean invitor;
+ private boolean invitor;
@ManyToOne(fetch = FetchType.EAGER)
@@ -111,7 +110,7 @@ public class MeetingMember implements Se
private OmTimeZone omTimeZone;
@Column(name="is_connected_event")
- private Boolean isConnectedEvent;
+ private boolean isConnectedEvent;
public Long getMeetingMemberId() {
return meetingMemberId;
@@ -205,10 +204,10 @@ public class MeetingMember implements Se
this.deleted = deleted;
}
- public Boolean getInvitor() {
+ public boolean getInvitor() {
return invitor;
}
- public void setInvitor(Boolean invitor) {
+ public void setInvitor(boolean invitor) {
this.invitor = invitor;
}
@@ -219,12 +218,10 @@ public class MeetingMember implements Se
this.omTimeZone = omTimeZone;
}
- public Boolean getIsConnectedEvent() {
+ public boolean getIsConnectedEvent() {
return isConnectedEvent;
}
- public void setIsConnectedEvent(Boolean isConnectedEvent) {
+ public void setIsConnectedEvent(boolean isConnectedEvent) {
this.isConnectedEvent = isConnectedEvent;
}
-
-
}
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=1509530&r1=1509529&r2=1509530&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
Fri Aug 2 04:11:16 2013
@@ -43,11 +43,8 @@ import com.googlecode.wicket.jquery.ui.c
import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
public class CalendarPanel extends UserPanel {
-
private static final Logger log =
Red5LoggerFactory.getLogger(CalendarPanel.class, webAppRootKey);
-
- private static final long serialVersionUID = -6536379497642291437L;
-
+ private static final long serialVersionUID = 1L;
private Calendar calendar;
@Override
@@ -107,8 +104,7 @@ public class CalendarPanel extends UserP
}
}
} catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("Unexpected error while creating label
lists", e);
}
options.set("monthNames", monthes.toString());
options.set("monthNamesShort", shortMonthes.toString());
@@ -175,7 +171,6 @@ public class CalendarPanel extends UserP
dialog.setModelObjectWithAjaxTarget(a, target);
dialog.open(target);
-
}
@Override
