svn commit: r1624978 - in /openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll: CreatePollDialog.java VoteDialog.java

[solomax]

Author: solomax
Date: Mon Sep 15 09:16:39 2014
New Revision: 1624978

URL: http://svn.apache.org/r1624978
Log:
[OPENMEETINGS-1081] poll creation/voting is tested

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1624978&r1=1624977&r2=1624978&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
 Mon Sep 15 09:16:39 2014
@@ -95,6 +95,7 @@ public class CreatePollDialog extends Ab
 
        @Override
        protected void onSubmit(AjaxRequestTarget target) {
+               getBean(PollDao.class).closePoll(roomId);
                getBean(PollDao.class).update(form.getModelObject());
                RoomPanel.broadcast(new RoomMessage(roomId, getUserId(), 
RoomMessage.Type.pollCreated));
        }

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1624978&r1=1624977&r2=1624978&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
 Mon Sep 15 09:16:39 2014
@@ -79,6 +79,9 @@ public class VoteDialog extends Abstract
                a.setVotedUser(u);
                user.setObject(getName(a.getRoomPoll().getCreator()));
                form.setModelObject(a);
+               boolean typeNum = a.getRoomPoll() != null && 
a.getRoomPoll().getType() != null && a.getRoomPoll().getType().isNumeric();
+               form.typeBool.setVisible(!typeNum);
+               form.typeInt.setVisible(typeNum);
                target.add(form);
        }
        
@@ -125,20 +128,19 @@ public class VoteDialog extends Abstract
        
        private class PollAnswerForm extends Form<RoomPollAnswer> {
                private static final long serialVersionUID = 1L;
+               private final WebMarkupContainer typeBool = new 
WebMarkupContainer("typeBool");
+               private final WebMarkupContainer typeInt = new 
WebMarkupContainer("typeInt");
 
                PollAnswerForm(String id, IModel<RoomPollAnswer> model) {
                        super(id, model);
                        add(feedback);
                        add(new Label("user", user));
                        add(new Label("roomPoll.question"));
-                       RoomPollAnswer a = getModelObject();
-                       boolean typeNum = a.getRoomPoll() != null && 
a.getRoomPoll().getType() != null && a.getRoomPoll().getType().isNumeric();
-                       add(new WebMarkupContainer("typeBool")
-                               .add(new 
RadioGroup<Boolean>("answer").setRequired(true)
+                       add(typeBool.add(new 
RadioGroup<Boolean>("answer").setRequired(true)
                                                .add(new Radio<Boolean>("true", 
Model.of(Boolean.TRUE))).add(new Radio<Boolean>("false", 
Model.of(Boolean.FALSE)))
-                               ).setVisible(!typeNum));
-                       add(new WebMarkupContainer("typeInt")
-                               .add(new DropDownChoice<Integer>("pointList", 
answers).setRequired(true)).setVisible(typeNum));
+                               
).setOutputMarkupPlaceholderTag(true).setVisible(false));
+                       add(typeInt.add(new 
DropDownChoice<Integer>("pointList", answers).setRequired(true))
+                                       
.setOutputMarkupPlaceholderTag(true).setVisible(false));
                }
        }
 }