You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/04/30 17:29:49 UTC
[37/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1631] polls
seems to be fixed
[OPENMEETINGS-1631] polls seems to be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ccca6bdb
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ccca6bdb
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ccca6bdb
Branch: refs/heads/master
Commit: ccca6bdb3dbf812f6bd23a2ea764e05073a78ebb
Parents: ac232ec
Author: Maxim Solodovnik <so...@apache.org>
Authored: Wed Apr 19 03:29:00 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Wed Apr 19 03:29:00 2017 +0000
----------------------------------------------------------------------
.../org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 2 ++
.../apache/openmeetings/web/room/poll/PollResultsDialog.java | 8 ++------
.../org/apache/openmeetings/web/room/poll/VoteDialog.java | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ccca6bdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 86fa8f0..37d7115 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -325,6 +325,8 @@ public class RoomMenuPanel extends Panel {
RoomPoll rp = getBean(PollDao.class).getByRoom(room.getRoom().getId());
if (rp != null) {
vote.updateModel(handler, rp);
+ } else {
+ vote.close(handler, null);
}
if (createdBy != null && !getUserId().equals(createdBy)) {
vote.open(handler);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ccca6bdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 866b6b6..3f3b210 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -101,8 +101,8 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
RoomPoll p = getBean(PollDao.class).get(id);
selForm.select.setModelObject(p);
- dispForm.updateModel(p, false, handler);
- //TODO result dialogs of other users should also be updated
+ dispForm.updateModel(p, true, handler);
+ sendRoom(new RoomMessage(roomId, getUserId(), RoomMessage.Type.pollUpdated));
}
}
});
@@ -278,10 +278,6 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
ChartConfiguration<Long> cfg = barChart.getChartConfiguration();
cfg.setLegend(null).setHighlighter(h);
cfg.axesInstance().setXaxis(null);
- /*
- * cfg.axesInstance().xAxisInstance().setRenderer(JqPlotResources.
- * AxisTickRenderer);
- */
cfg.axesInstance().yAxisInstance().setTicks(ticks).setRenderer(JqPlotResources.CategoryAxisRenderer);
return barChart;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ccca6bdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
index 4b7ad40..f3d350e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room.poll;
+import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -30,6 +31,7 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -121,6 +123,7 @@ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
a.setVoteDate(new Date());
a.getRoomPoll().getAnswers().add(a);
getBean(PollDao.class).update(a.getRoomPoll());
+ sendRoom(new RoomMessage(a.getRoomPoll().getRoom().getId(), getUserId(), RoomMessage.Type.pollUpdated));
}
@Override