Author: solomax
Date: Wed Apr 19 03:29:00 2017
New Revision: 1791851
URL: http://svn.apache.org/viewvc?rev=1791851&view=rev
Log:
[OPENMEETINGS-1631] polls seems to be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1791851&r1=1791850&r2=1791851&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Wed Apr 19 03:29:00 2017
@@ -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);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1791851&r1=1791850&r2=1791851&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Wed Apr 19 03:29:00 2017
@@ -101,8 +101,8 @@ public class PollResultsDialog extends A
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 A
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;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1791851&r1=1791850&r2=1791851&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Wed Apr 19 03:29:00 2017
@@ -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.us
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 Abstract
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
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1791851&r1=1791850&r2=1791851&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Wed Apr 19 03:29:00 2017
@@ -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);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1791851&r1=1791850&r2=1791851&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Wed Apr 19 03:29:00 2017
@@ -101,8 +101,8 @@ public class PollResultsDialog extends A
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 A
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;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1791851&r1=1791850&r2=1791851&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Wed Apr 19 03:29:00 2017
@@ -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.us
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 Abstract
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
