Author: sebawagner
Date: Sat Aug 10 23:43:23 2013
New Revision: 1512839

URL: http://svn.apache.org/r1512839
Log:
Fixes OPENMEETINGS-748 (but still lots of issues, those are captured in 
OPENMEETINGS-757)
Remove showing the Appointment Form start and end date in the time zone of the 
user profile (all to browser defaults)

Removed:
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/web/util/ui/
Modified:
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/axis/services/RoomWebService.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/InvitationManager.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
    
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/axis/services/RoomWebService.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/axis/services/RoomWebService.java
 Sat Aug 10 23:43:23 2013
@@ -2360,7 +2360,7 @@ public class RoomWebService {
                                Long memberId = 
meetingMemberLogic.addMeetingMember(firstname,
                                                lastname, "0", "0", 
appointment.getAppointmentId(),
                                                null, email, null, baseUrl, 
null, new Boolean(false),
-                                               language_id, false, "", null, 
null, "");
+                                               language_id, false, "", null, 
"");
 
                                return memberId;
 
@@ -2424,7 +2424,7 @@ public class RoomWebService {
                                Long memberId = 
meetingMemberLogic.addMeetingMember(firstname,
                                                lastname, "0", "0", 
appointment.getAppointmentId(),
                                                null, email, "", baseUrl, null, 
new Boolean(false),
-                                               language_id, false, "", null, 
null, invitorName);
+                                               language_id, false, "", null, 
invitorName);
 
                                return memberId;
 

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java
 Sat Aug 10 23:43:23 2013
@@ -40,8 +40,7 @@ public class MeetingMemberDTO {
                lastname = meetingMemberItem.getLastname();
                userid = (meetingMemberItem.getUserid() != null) ? 
meetingMemberItem
                                .getUserid().getUser_id() : 0;
-               jNameTimeZone = (meetingMemberItem.getOmTimeZone() != null) ? 
meetingMemberItem
-                               .getOmTimeZone().getJname() : "";
+               jNameTimeZone = meetingMemberItem.getTimeZoneId();
        }
 
        public long getMeetingMemberId() {

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
 Sat Aug 10 23:43:23 2013
@@ -45,7 +45,6 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.UserManager;
 import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
 import 
org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
@@ -283,6 +282,9 @@ public class AppointmentDao {
                // update meeting members
                List<MeetingMember> mmList = a.getMeetingMember();
                if (mmList != null){
+                       
+                       
+                       
                        for (MeetingMember mm : mmList){
                                String urlPostfix = (mm.getUserid().getType() 
== Type.contact) ? "" : "#room/" + r.getRooms_id();
                                        
@@ -592,7 +594,6 @@ public class AppointmentDao {
                                                // and Java around 600++
                                                Long sendToUserId = 0L;
                                                TimeZone timezoneMember = null;
-                                               OmTimeZone omTimeZone = null;
                                                if (clientMember.get("userId") 
!= null) {
                                                        sendToUserId = 
Long.valueOf(
                                                                        
clientMember.get("userId").toString())
@@ -608,7 +609,6 @@ public class AppointmentDao {
                                                                        
.getUserById(sendToUserId);
                                                        timezoneMember = 
timezoneUtil
                                                                        
.getTimezoneByUser(interalUser);
-                                                       omTimeZone = 
interalUser.getOmTimeZone();
                                                        phone = 
interalUser.getPhoneForSMS();
                                                } else {
                                                        // Get the 
internal-name of the timezone set in the
@@ -618,21 +618,19 @@ public class AppointmentDao {
                                                                
log.error("jNameTimeZone not set in user object variable");
                                                                jName = "";
                                                        }
-                                                       omTimeZone = 
omTimeZoneDaoImpl.getOmTimeZone(jName
-                                                                       
.toString());
                                                        timezoneMember = 
timezoneUtil
                                                                        
.getTimezoneByInternalJName(jName
                                                                                
        .toString());
                                                }
 
-                                               // Not In Remote List available 
- intern OR extern user
+                                               // Not In Remote List available 
- intern OR external user
                                                
meetingMemberLogic.addMeetingMember(
                                                                
clientMember.get("firstname") == null ?
                                                                                
clientMember.get("firstname").toString() : "",
                                                                
clientMember.get("lastname") == null ? 
                                                                                
clientMember.get("lastname").toString() : "",
                                                                "0", // member 
- Status
-                                                               "0", // 
appointement - Status
+                                                               "0", // 
appointment - Status
                                                                appointmentId,
                                                                null, // UserId
                                                                
clientMember.get("email").toString(), // Email
@@ -647,7 +645,8 @@ public class AppointmentDao {
                                                                language_id, 
                                                                
isPasswordProtected, 
                                                                password,
-                                                               timezoneMember, 
omTimeZone, invitorName);
+                                                               timezoneMember, 
+                                                               invitorName);
 
                                        }
 

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
 Sat Aug 10 23:43:23 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.data.cal
 
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
@@ -28,7 +29,6 @@ import javax.persistence.TypedQuery;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -177,7 +177,7 @@ public class MeetingMemberDao {
 
        public Long addMeetingMember(String firstname, String lastname,
                        String memberStatus, String appointmentStatus, Long 
appointmentId,
-                       Long userid, String email, String phone, Boolean 
moderator, OmTimeZone omTimeZone,
+                       Long userid, String email, String phone, Boolean 
moderator, TimeZone timeZone,
                        Boolean isConnectedEvent) {
                try {
 
@@ -197,7 +197,7 @@ public class MeetingMemberDao {
                        gm.setInvitor(moderator);
                        gm.setIsConnectedEvent(isConnectedEvent);
                        
-                       gm.setOmTimeZone(omTimeZone);
+                       gm.setTimeZoneId(timeZone.getID());
 
                        gm = em.merge(gm);
                        Long group_member_id = gm.getMeetingMemberId();

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
 Sat Aug 10 23:43:23 2013
@@ -35,7 +35,6 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.conference.dao.InvitationDao;
 import org.apache.openmeetings.data.conference.dao.RoomDao;
 import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
@@ -222,7 +221,7 @@ public class AppointmentLogic {
                        
meetingMemberLogic.addMeetingMember(user.getFirstname(), user
                                        .getLastname(), "", "", appointmentId, 
userId, user
                                        .getAdresses().getEmail(), 
user.getPhoneForSMS(), baseUrl, userId, true,
-                                       language_id, isPasswordProtected, 
password, timezone, user.getOmTimeZone(),
+                                       language_id, isPasswordProtected, 
password, timezone,
                                        invitorName);
 
                        // iterate through all members of this meeting and add 
them to the
@@ -250,7 +249,6 @@ public class AppointmentLogic {
                                        // and Java around 600++
                                        Long sendToUserId = 0L;
                                        TimeZone timezoneMember = null;
-                                       OmTimeZone omTimeZone = null;
                                        if (clientMember.get("userId") != null) 
{
                                                sendToUserId = Long.valueOf(
                                                                
clientMember.get("userId").toString())
@@ -267,7 +265,6 @@ public class AppointmentLogic {
                                                phone = 
interalUser.getPhoneForSMS();
                                                timezoneMember = timezoneUtil
                                                                
.getTimezoneByUser(interalUser);
-                                               omTimeZone = 
interalUser.getOmTimeZone();
                                        } else {
                                                // Get the internal-name of the 
timezone set in the
                                                // client object and convert it 
to a real one
@@ -276,8 +273,6 @@ public class AppointmentLogic {
                                                        
log.error("jNameTimeZone not set in user object variable");
                                                        jName = "";
                                                }
-                                               omTimeZone = 
omTimeZoneDaoImpl.getOmTimeZone(jName
-                                                               .toString());
                                                timezoneMember = timezoneUtil
                                                                
.getTimezoneByInternalJName(jName.toString());
                                        }
@@ -299,7 +294,7 @@ public class AppointmentLogic {
                                                        language_id, 
//language_id
                                                        isPasswordProtected, // 
isPasswordProtected
                                                        password, // password
-                                                       timezoneMember, 
omTimeZone, invitorName);
+                                                       timezoneMember, 
invitorName);
 
                                }
                        }
@@ -475,14 +470,7 @@ public class AppointmentLogic {
                                                continue;
                                        }
 
-                                       TimeZone tZone = null;
-
-                                       if (mm.getOmTimeZone() != null) {
-                                               tZone = 
timezoneUtil.getTimezoneByOmTimeZoneId(mm
-                                                               
.getOmTimeZone().getOmtimezoneId());
-                                       } else {
-                                               tZone = TimeZone.getDefault();
-                                       }
+                                       TimeZone tZone = 
timezoneUtil.getTimeZone(mm.getTimeZoneId());
 
                                        String subject = 
generateSubject(labelid1158, ment, tZone);
                                        String smsSubject = 
generateSMSSubject(labelid1158, ment);

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
 Sat Aug 10 23:43:23 2013
@@ -26,7 +26,6 @@ import org.apache.openmeetings.data.cale
 import org.apache.openmeetings.data.conference.InvitationManager;
 import org.apache.openmeetings.data.conference.dao.InvitationDao;
 import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
@@ -61,10 +60,8 @@ public class MeetingMemberLogic {
         * This can be either an internal or an external user, internal users 
have a
         * user id != null && > 0
         * 
-        * jNameInternalTimeZone is needed for the mapping of the timezones
-        * available
-        * 
         * @author obecherer,seba.wagner
+        * 
         * @param firstname
         * @param lastname
         * @param memberStatus
@@ -79,7 +76,6 @@ public class MeetingMemberLogic {
         * @param isPasswordProtected
         * @param password
         * @param timezone
-        * @param jNameInternalTimeZone
         * @param invitorName
         *            can be different from the current firstname/lastname of 
course
         * @return
@@ -88,13 +84,14 @@ public class MeetingMemberLogic {
                        String memberStatus, String appointmentStatus, Long 
appointmentId,
                        Long userid, String email, String phone, String 
baseUrl, Long meeting_organizer,
                        Boolean invitor, Long language_id, Boolean 
isPasswordProtected,
-                       String password, TimeZone timezone, OmTimeZone 
omTimeZone,
+                       String password, TimeZone timezone,
                        String invitorName) {
 
                try {
+                       
                        Long memberId = 
meetingMemberDao.addMeetingMember(firstname,
                                        lastname, memberStatus, 
appointmentStatus, appointmentId,
-                                       userid, email, phone, invitor, 
omTimeZone, false);
+                                       userid, email, phone, invitor, 
timezone, false); 
 
                        // DefaultInvitation
                        Appointment point = appointmentLogic
@@ -146,7 +143,7 @@ public class MeetingMemberLogic {
                                                                
point.getAppointmentEndtime(),
                                                                
point.getAppointmentId(),
                                                                invitorName,
-                                                               
timezoneUtil.getTimezoneByInternalJName(omTimeZone.getJname())
+                                                               timezone
                                                                );
 
                                invitationId = invitation.getInvitations_id();

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/InvitationManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/InvitationManager.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/conference/InvitationManager.java
 Sat Aug 10 23:43:23 2013
@@ -335,8 +335,7 @@ public class InvitationManager {
                if (us != null) {
                        timezone = timezoneUtil.getTimezoneByUser(us);
                } else {
-                       timezone = 
timezoneUtil.getTimezoneByInternalJName(member
-                                       .getOmTimeZone().getJname());
+                       timezone = 
timezoneUtil.getTimeZone(member.getTimeZoneId());
                }
 
                String subject = formatCancelSubject(language_id, appointment, 
user,
@@ -479,8 +478,7 @@ public class InvitationManager {
                if (us != null) {
                        timezone = timezoneUtil.getTimezoneByUser(us);
                } else {
-                       timezone = 
timezoneUtil.getTimezoneByInternalJName(member
-                                       .getOmTimeZone().getJname());
+                       timezone = 
timezoneUtil.getTimeZone(member.getTimeZoneId());
                }
 
                // Get text messages

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
 Sat Aug 10 23:43:23 2013
@@ -33,7 +33,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
 import org.apache.openmeetings.persistence.beans.invitation.Invitations;
 import org.apache.openmeetings.persistence.beans.user.User;
 import org.simpleframework.xml.Element;
@@ -104,10 +103,12 @@ public class MeetingMember implements Se
        @JoinColumn(name="invitation", nullable=true, insertable=false)
        @ForeignKey(enabled = true)
        private Invitations invitation;
-       @ManyToOne(fetch = FetchType.EAGER)
-       @JoinColumn(name="omtimezoneId", nullable=true, insertable=true)
-       @ForeignKey(enabled = true)
-       private OmTimeZone omTimeZone;
+       
+       /**
+        * java.util.TimeZone Id
+        */
+       @Column(name = "time_zone_id")
+       private String timeZoneId;
        
        @Column(name="is_connected_event")
        private boolean isConnectedEvent;
@@ -211,17 +212,18 @@ public class MeetingMember implements Se
                this.invitor = invitor;
        }
 
-       public OmTimeZone getOmTimeZone() {
-               return omTimeZone;
-       }
-       public void setOmTimeZone(OmTimeZone omTimeZone) {
-               this.omTimeZone = omTimeZone;
-       }
-       
        public boolean getIsConnectedEvent() {
                return isConnectedEvent;
        }
        public void setIsConnectedEvent(boolean isConnectedEvent) {
                this.isConnectedEvent = isConnectedEvent;
        }
+       
+       public String getTimeZoneId() {
+               return timeZoneId;
+       }
+       public void setTimeZoneId(String timeZoneId) {
+               this.timeZoneId = timeZoneId;
+       }
+       
 }

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
 Sat Aug 10 23:43:23 2013
@@ -1211,13 +1211,13 @@ public class UserService {
                                meetingMemberDao.addMeetingMember(firstname, 
lastname, "0",
                                                "0", appointmentId, 
meetingMember.getUser_id(), email,
                                                meetingMember.getPhoneForSMS(), 
invitor,
-                                               meetingMember.getOmTimeZone(), 
isConnectedEvent);
+                                               
timezoneUtil.getTimezoneByUser(meetingMember), isConnectedEvent);
 
                        } else {
 
                                meetingMemberDao.addMeetingMember("", "", "0", 
"0",
                                                appointmentId, null, email, "", 
invitor,
-                                               
omTimeZoneDaoImpl.getOmTimeZone(sendJNameTimeZone),
+                                               
timezoneUtil.getTimezoneByInternalJName(sendJNameTimeZone),
                                                isConnectedEvent);
 
                        }

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/utils/math/TimezoneUtil.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
 Sat Aug 10 23:43:23 2013
@@ -61,6 +61,10 @@ public class TimezoneUtil {
        
        public TimeZone getTimeZone(String timeZoneId) {
                
+               if (timeZoneId == null || timeZoneId.equals("")) {
+                       return getDefaultTimeZone();
+               }
+               
                //see TODO in comments
                
                return TimeZone.getTimeZone(timeZoneId);

Modified: 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1512839&r1=1512838&r2=1512839&view=diff
==============================================================================
--- 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
 (original)
+++ 
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
 Sat Aug 10 23:43:23 2013
@@ -41,11 +41,11 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.util.RoomTypeDropDown;
-import org.apache.openmeetings.web.util.ui.CustomTimeZoneDateTimeField;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.yui.calendar.DateTimeField;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
@@ -215,8 +215,8 @@ public class AppointmentDialog extends A
                        //add(new WysiwygEditor("appointmentDescription"));
                        add(new TextArea<String>("appointmentDescription"));
                        add(new TextField<String>("appointmentLocation"));
-                       add(new 
CustomTimeZoneDateTimeField("appointmentStarttime", 
WebSession.getUserTimeZone()));
-                       add(new 
CustomTimeZoneDateTimeField("appointmentEndtime", 
WebSession.getUserTimeZone()));
+                       add(new DateTimeField("appointmentStarttime"));
+                       add(new DateTimeField("appointmentEndtime"));
                        final PasswordTextField pwd = new 
PasswordTextField("password");
                        pwd.setEnabled(isPwdProtected());
                        pwd.setOutputMarkupId(true);


Reply via email to