svn commit: r1704220 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java

[solomax]

Author: solomax
Date: Mon Sep 21 06:03:22 2015
New Revision: 1704220

URL: http://svn.apache.org/viewvc?rev=1704220&view=rev
Log:
start/end in appointment and message are unified

Modified:
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1704220&r1=1704219&r2=1704220&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
 Mon Sep 21 06:03:22 2015
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.db
 import static 
org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
 import static org.apache.openmeetings.web.app.Application.getBean;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.util.CalendarWebHelper.getZoneId;
 import static org.apache.openmeetings.web.util.RoomTypeDropDown.getRoomTypes;
 
 import java.util.ArrayList;
@@ -64,6 +65,8 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.util.CollectionModel;
 import org.threeten.bp.LocalDateTime;
+import org.threeten.bp.ZonedDateTime;
+import org.threeten.bp.temporal.ChronoUnit;
 
 import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
@@ -97,8 +100,10 @@ public class MessageDialog extends Abstr
        }
        
        public MessageDialog reset(boolean isPrivate) {
-               start.setModelObject(LocalDateTime.now());
-               end.setModelObject(LocalDateTime.now()); //TODO should we add 1 
hour or generalize with Calendar???
+               //TODO should be 'in sync' with appointment
+               LocalDateTime now = 
ZonedDateTime.now(getZoneId()).toLocalDateTime();
+               start.setModelObject(now);
+               end.setModelObject(now.plus(1, ChronoUnit.HOURS));
                modelTo.setObject(new ArrayList<User>());
                PrivateMessage p = new PrivateMessage();
                p.setFrom(getBean(UserDao.class).get(getUserId()));

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1704220&r1=1704219&r2=1704220&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
 Mon Sep 21 06:03:22 2015
@@ -24,6 +24,7 @@ import static org.apache.openmeetings.we
 import static org.apache.openmeetings.web.app.Application.getContactsLink;
 import static org.apache.openmeetings.web.app.Application.getInvitationLink;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.util.CalendarWebHelper.getZoneId;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -64,6 +65,8 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.util.CollectionModel;
 import org.threeten.bp.LocalDateTime;
+import org.threeten.bp.ZonedDateTime;
+import org.threeten.bp.temporal.ChronoUnit;
 
 import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
@@ -97,8 +100,10 @@ public class MessageDialog extends Abstr
        }
        
        public MessageDialog reset(boolean isPrivate) {
-               start.setModelObject(LocalDateTime.now());
-               end.setModelObject(LocalDateTime.now()); //TODO should we add 1 
hour or generalize with Calendar???
+               //TODO should be 'in sync' with appointment
+               LocalDateTime now = 
ZonedDateTime.now(getZoneId()).toLocalDateTime();
+               start.setModelObject(now);
+               end.setModelObject(now.plus(1, ChronoUnit.HOURS));
                modelTo.setObject(new ArrayList<User>());
                PrivateMessage p = new PrivateMessage();
                p.setFrom(getBean(UserDao.class).get(getUserId()));