Revision: 4435
Author: solomax666
Date: Tue Oct 11 12:07:21 2011
Log: Poll improvements:
1) Ok Cancel buttons are arranged as expected
2) Poll name field is added
3) RoomPoll and PollRoomAnswer rely on user instead of RoomClient to avoid
duplicate votes
http://code.google.com/p/openmeetings/source/detail?r=4435
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/answerPoll.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/createPollWin.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/participantsPanel.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/poll/RoomPoll.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/poll/RoomPollAnswers.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Tue Oct 11 12:07:21
2011
@@ -4234,4 +4234,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Tue Oct 11
12:07:21 2011
@@ -4232,4 +4232,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Mon Sep
26 09:24:15 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Tue Oct
11 12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sun
Sep 25 02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Tue
Oct 11 12:07:21 2011
@@ -4239,4 +4239,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Tue Oct 11 12:07:21
2011
@@ -4232,4 +4232,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sun Sep
25 02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Tue Oct
11 12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Tue Oct 11 12:07:21
2011
@@ -4229,4 +4229,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Tue Oct 11
12:07:21 2011
@@ -4232,4 +4232,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Tue Oct 11 12:07:21
2011
@@ -4306,4 +4306,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sun Sep
25 02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Tue Oct
11 12:07:21 2011
@@ -4239,4 +4239,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Tue Oct 11
12:07:21 2011
@@ -4239,4 +4239,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Tue Oct 11
12:07:21 2011
@@ -4241,4 +4241,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Sun Sep 25 02:55:37
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Tue Oct 11 12:07:21
2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Tue Oct 11
12:07:21 2011
@@ -4232,4 +4232,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Sun Sep 25
02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Tue Oct 11
12:07:21 2011
@@ -4233,4 +4233,7 @@
<string id="1409" name="mute moderator message">
<value>Only moderators can mute or unmute an user globally! To mute
your own microphone: Please use the microphone icon in your video
pod!</value>
</string>
+ <string id="1410" name="poll_name">
+ <value>Poll Name</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Tue Oct 11 12:07:21 2011
@@ -1837,11 +1837,11 @@
<![CDATA[
//The onResult-Handler will be called by the rtmpconnection
//Debug.write("newPoll : ",value);
- if(canvas.streamid!=value.createdBy.streamid)
+ if(canvas.user_id!=value.createdBy.user_id)
new lz.answerPoll(
canvas.main_content._content.inner
, {
- createdBy: value.createdBy.username
+ createdBy: value.createdBy.login
, pollDate: value.created
, pollQuestion: value.pollQuestion
, pollTypeId: value.pollType.pollTypesId
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Sat
Oct 1 11:15:55 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Tue
Oct 11 12:07:21 2011
@@ -475,7 +475,7 @@
new lz.answerPoll(
canvas.main_content._content.inner
, {
- createdBy: value.createdBy.username
+ createdBy: value.createdBy.login
, pollDate: value.created
, pollQuestion: value.pollQuestion
, pollTypeId: value.pollType.pollTypesId
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/answerPoll.lzx
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/answerPoll.lzx
Tue Oct 11 12:07:21 2011
@@ -45,10 +45,7 @@
</handler>
</resetCombobox>
- <simpleLabelButton labelid="25" width="200" x="80" y="218"
- onclick="this.parent.close();" />
-
- <simpleLabelButton labelid="32" width="200" x="290" y="218">
+ <simpleLabelButton labelid="32" width="200" x="80" y="218">
<handler name="onclick">
if (parent.pollTypeId==1){
this.parent.vote.pollvalue =
Number(parent.pollboolean.getValue());
@@ -61,6 +58,9 @@
</handler>
</simpleLabelButton>
+ <simpleLabelButton labelid="25" width="200" x="290" y="218"
+ onclick="this.parent.close();" />
+
<netRemoteCallHib name="vote" funcname="pollservice.vote"
remotecontext="$once{ canvas.thishib }" >
<attribute name="pollvalue" type="number" value="0" />
<attribute name="pollTypesId" type="number" value="0" />
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/createPollWin.lzx
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/createPollWin.lzx
Tue Oct 11 12:07:21 2011
@@ -8,8 +8,11 @@
<labelText fontstyle="bold" labelid="19" y="22" />
- <labelText labelid="20" y="42" />
- <customEdittext name="_question" multiline="true" width="390" x="100"
y="42" height="60" />
+ <labelText labelid="1410" y="42" />
+ <customEdittext name="_name" multiline="false" width="390" x="100"
y="42" />
+
+ <labelText labelid="20" y="67" />
+ <customEdittext name="_question" multiline="true" width="390" x="100"
y="67" height="60" />
<netRemoteCallHib name="getPollTypeList"
funcname="pollservice.getPollTypeList"
remotecontext="$once{ canvas.thishib }" >
@@ -28,8 +31,8 @@
</handler>
</netRemoteCallHib>
- <labelText labelid="21" y="122" />
- <resetCombobox name="_polltypes" width="160" x="100" y="122"
editable="false" itemclassname="bigTextListItem" >
+ <labelText labelid="21" y="142" />
+ <resetCombobox name="_polltypes" width="160" x="100" y="142"
editable="false" itemclassname="bigTextListItem" >
<handler name="oninit">
<![CDATA[
this.parent.getPollTypeList.setReferenceObj(this);
@@ -38,25 +41,14 @@
</handler>
</resetCombobox>
- <simpleLabelButton labelid="25" width="100" x="280" y="218"
- onclick="this.parent.close();" />
-
- <simpleLabelButton labelid="22" width="100" x="390" y="218">
- <handler name="onclick">
- this.parent.createPoll.pollquestion =
this.parent._question.getText();
- this.parent.createPoll.polltypesid =
this.parent._polltypes.getValue();
-
//Debug.write("this.parent.createPoll.createPoll: ",this.parent.createPoll.createPoll);
- this.parent.createPoll.doCall();
-
- </handler>
- </simpleLabelButton>
-
- <labelText fgcolor="red" labelid="23" y="170" width="480"
multiline="true" resize="false"/>
+ <labelText fgcolor="red" labelid="23" y="175" width="480"
multiline="true" resize="false"/>
<netRemoteCallHib name="createPoll"
funcname="pollservice.createPoll"
remotecontext="$once{ canvas.thishib }" >
+ <attribute name="pollname" value="" type="string" />
<attribute name="pollquestion" value="" type="string" />
<attribute name="polltypesid" value="0" type="number" />
+ <netparam><method name="getValue">return
parent.pollname;</method></netparam>
<netparam><method name="getValue">return
parent.pollquestion;</method></netparam>
<netparam><method name="getValue">return
parent.polltypesid;</method></netparam>
<handler name="ondata" args="value">
@@ -68,6 +60,20 @@
</handler>
</netRemoteCallHib>
+ <simpleLabelButton labelid="22" width="100" x="280" y="218">
+ <handler name="onclick">
+ this.parent.createPoll.pollname = this.parent._name.getText();
+ this.parent.createPoll.pollquestion =
this.parent._question.getText();
+ this.parent.createPoll.polltypesid =
this.parent._polltypes.getValue();
+
//Debug.write("this.parent.createPoll.createPoll: ",this.parent.createPoll.createPoll);
+ this.parent.createPoll.doCall();
+
+ </handler>
+ </simpleLabelButton>
+
+ <simpleLabelButton labelid="25" width="100" x="390" y="218"
+ onclick="this.parent.close();" />
+
</class>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/participantsPanel.lzx
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/participantsPanel.lzx
Tue Oct 11 12:07:21 2011
@@ -161,7 +161,7 @@
new lz.answerPoll(
canvas.main_content._content.inner
, {
- createdBy: value.createdBy.username
+ createdBy: value.createdBy.login
, pollDate: value.created
, pollQuestion: value.pollQuestion
, pollTypeId: value.pollType.pollTypesId
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Wed Oct 5 10:48:31 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Tue Oct 11 12:07:21 2011
@@ -9,6 +9,7 @@
import javax.persistence.Query;
import org.openmeetings.app.data.basic.Fieldmanagment;
+import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.poll.PollType;
import org.openmeetings.app.persistence.beans.poll.RoomPoll;
import org.openmeetings.app.persistence.beans.recording.RoomClient;
@@ -27,6 +28,8 @@
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
+ private Usermanagement usermanagement;
+ @Autowired
private Roommanagement roommanagement;
public Long addPollType(Long labelId, Boolean isNumeric) {
@@ -52,11 +55,12 @@
return (PollType)q.getSingleResult();
}
- public RoomPoll createPoll(RoomClient rc, String pollQuestion, Long
pollTypeId) {
+ public RoomPoll createPoll(RoomClient rc, String pollName, String
pollQuestion, Long pollTypeId) {
RoomPoll roomP = new RoomPoll();
- roomP.setCreatedBy(rc);
+ roomP.setCreatedBy(usermanagement.getUserById(rc.getUser_id()));
roomP.setCreated(new Date());
+ roomP.setPollName(pollName);
roomP.setPollQuestion(pollQuestion);
roomP.setPollType(getPollType(pollTypeId));
roomP.setRoom(roommanagement.getRoomById(rc.getRoom_id()));
@@ -111,13 +115,13 @@
return false;
}
- public boolean hasVoted(Long room_id, String streamid) {
+ public boolean hasVoted(Long room_id, Long userid) {
try {
- log.debug(" :: hasVoted :: " + room_id + ", " +
streamid);
+ log.debug(" :: hasVoted :: " + room_id + ", " + userid);
Query q = em.createQuery("SELECT rpa FROM RoomPollAnswers
rpa "
- + "WHERE rpa.roomPoll.room.rooms_id = :room_id AND
rpa.votedClient.streamid = :streamid AND rpa.roomPoll.archived
= :archived");
+ + "WHERE rpa.roomPoll.room.rooms_id = :room_id AND
rpa.votedUser.user_id = :userid AND rpa.roomPoll.archived = :archived");
q.setParameter("room_id", room_id);
- q.setParameter("streamid", streamid);
+ q.setParameter("userid", userid);
q.setParameter("archived", false);
q.getSingleResult();
return true;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Fri Sep 30 11:48:06 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Tue Oct 11 12:07:21 2011
@@ -1510,7 +1510,7 @@
* Find User by Id
*/
//
-----------------------------------------------------------------------------------------------------
- public Users getUserById(Long id) throws Exception {
+ public Users getUserById(Long id) {
log.debug("Usermanagement.getUserById");
if (id == 0) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/poll/RoomPoll.java
Wed Oct 5 10:48:31 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/poll/RoomPoll.java
Tue Oct 11 12:07:21 2011
@@ -16,8 +16,8 @@
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
+import org.openmeetings.app.persistence.beans.user.Users;
@Entity
@Table(name = "room_polls")
@@ -26,6 +26,8 @@
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "room_poll_id")
private Long roomPollId;
+ @Column(name = "poll_name")
+ private String pollName;
@Column(name = "poll_question")
private String pollQuestion;
@Column(name = "created")
@@ -36,8 +38,8 @@
@JoinColumn(name = "poll_type_id")
private PollType pollType;
@OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "roomclient_id")
- private RoomClient createdBy;
+ @JoinColumn(name = "users_id")
+ private Users createdBy;
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "rooms_id")
private Rooms room;
@@ -48,7 +50,7 @@
/**
* @return the createdBy
*/
- public RoomClient getCreatedBy() {
+ public Users getCreatedBy() {
return createdBy;
}
@@ -56,7 +58,7 @@
* @param createdBy
* the createdBy to set
*/
- public void setCreatedBy(RoomClient createdBy) {
+ public void setCreatedBy(Users createdBy) {
this.createdBy = createdBy;
}
@@ -94,7 +96,10 @@
* @return the roomPollAnswerList
*/
public List<RoomPollAnswers> getRoomPollAnswerList() {
- return (roomPollAnswerList == null) ? new
LinkedList<RoomPollAnswers>() : roomPollAnswerList;
+ if (roomPollAnswerList == null) {
+ roomPollAnswerList = new LinkedList<RoomPollAnswers>();
+ }
+ return roomPollAnswerList;
}
/**
@@ -152,5 +157,19 @@
public void setArchived(boolean archived) {
this.archived = archived;
}
+
+ /**
+ * @return the pollName
+ */
+ public String getPollName() {
+ return pollName;
+ }
+
+ /**
+ * @param pollName the pollName to set
+ */
+ public void setPollName(String pollName) {
+ this.pollName = pollName;
+ }
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/poll/RoomPollAnswers.java
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/poll/RoomPollAnswers.java
Tue Oct 11 12:07:21 2011
@@ -9,14 +9,14 @@
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import org.openmeetings.app.persistence.beans.recording.RoomClient;
+import org.openmeetings.app.persistence.beans.user.Users;
@Entity
@Table(name = "room_poll_answers")
public class RoomPollAnswers {
@OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "roomclient_id")
- private RoomClient votedClient;
+ @JoinColumn(name = "users_id")
+ private Users votedUser;
@Column(name = "answer")
private Boolean answer;
@Column(name = "pointList")
@@ -75,16 +75,16 @@
/**
* @return the votedClient
*/
- public RoomClient getVotedClient() {
- return votedClient;
+ public Users getVotedUser() {
+ return votedUser;
}
/**
* @param votedClient
* the votedClient to set
*/
- public void setVotedClient(RoomClient votedClient) {
- this.votedClient = votedClient;
+ public void setVotedUser(Users votedUser) {
+ this.votedUser = votedUser;
}
public RoomPoll getRoomPoll() {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Wed Oct 5 10:48:31 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Tue Oct 11 12:07:21 2011
@@ -6,6 +6,7 @@
import java.util.Set;
import org.openmeetings.app.data.conference.PollManagement;
+import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.poll.PollType;
import org.openmeetings.app.persistence.beans.poll.RoomPoll;
import org.openmeetings.app.persistence.beans.poll.RoomPollAnswers;
@@ -32,11 +33,13 @@
@Autowired
private ClientListManager clientListManager;
@Autowired
+ private Usermanagement usermanagement;
+ @Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
private PollManagement pollManagement;
- public String createPoll(String pollQuestion, int pollTypeId) {
+ public String createPoll(String pollName, String pollQuestion, int
pollTypeId) {
String returnValue = "";
try {
log.debug("createPoll: " + pollQuestion);
@@ -54,7 +57,7 @@
sendNotification(currentcon, "newPoll",
new Object[] {
pollManagement.createPoll(rc,
- pollQuestion,
(long) pollTypeId) });
+ pollName,
pollQuestion, (long) pollTypeId) });
returnValue = "200";
} else {
returnValue = "202";
@@ -125,7 +128,7 @@
log.error("POLL IS NULL for RoomId: " +
rc.getRoom_id());
return -1;
}
- if (pollManagement.hasVoted(roomId, streamid)) {
+ if (pollManagement.hasVoted(roomId, rc.getUser_id())) {
log.debug("hasVoted: true");
return -1;
}
@@ -145,8 +148,9 @@
// Is boolean Question
rpA.setAnswer(new Boolean(pollvalue == 1));
}
- rpA.setVotedClient(rc);
+
rpA.setVotedUser(usermanagement.getUserById(rc.getUser_id()));
rpA.setVoteDate(new Date());
+ rpA.setRoomPoll(roomP);
roomP.getRoomPollAnswerList().add(rpA);
pollManagement.updatePoll(roomP);
return 1;
@@ -183,7 +187,7 @@
long roomId = rc.getRoom_id();
if (pollManagement.hasPoll(roomId)) {
- return pollManagement.hasVoted(roomId,
streamid) ? -1 : 1;
+ return pollManagement.hasVoted(roomId,
rc.getUser_id()) ? -1 : 1;
} else {
return -2;
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
