Revision: 4436
Author: solomax666
Date: Wed Oct 12 10:34:29 2011
Log: - Archived poll results are now visible
http://code.google.com/p/openmeetings/source/detail?r=4436
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/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/createPollWin.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/resultPollWin.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/remote/PollService.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Wed Oct 12 10:34:29
2011
@@ -4237,4 +4237,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Oct 12
10:34:29 2011
@@ -4235,4 +4235,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Tue Oct
11 12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed Oct
12 10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Tue
Oct 11 12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed
Oct 12 10:34:29 2011
@@ -4242,4 +4242,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Wed Oct 12 10:34:29
2011
@@ -4235,4 +4235,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Tue Oct
11 12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Oct
12 10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Wed Oct 12 10:34:29
2011
@@ -4232,4 +4232,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Wed Oct 12
10:34:29 2011
@@ -4235,4 +4235,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Wed Oct 12 10:34:29
2011
@@ -4309,4 +4309,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Tue Oct
11 12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Oct
12 10:34:29 2011
@@ -4242,4 +4242,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Wed Oct 12
10:34:29 2011
@@ -4242,4 +4242,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Wed Oct 12
10:34:29 2011
@@ -4244,4 +4244,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Tue Oct 11 12:07:21
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Wed Oct 12 10:34:29
2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Wed Oct 12
10:34:29 2011
@@ -4235,4 +4235,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Tue Oct 11
12:07:21 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Oct 12
10:34:29 2011
@@ -4236,4 +4236,13 @@
<string id="1410" name="poll_name">
<value>Poll Name</value>
</string>
+ <string id="1411" name="poll_name">
+ <value>You</value>
+ </string>
+ <string id="1412" name="archived_polls">
+ <value>Archieved Polls</value>
+ </string>
+ <string id="1413" name="active_poll">
+ <value>active</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Tue
Oct 11 12:07:21 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Wed
Oct 12 10:34:29 2011
@@ -432,25 +432,8 @@
<netRemoteCallHib name="getVotes" funcname="pollservice.getVotes"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
- <![CDATA[
- if (value!=null){
- new lz.resultPollWin(
- canvas.main_content._content.inner
- , {
- createdBy: value.createdBy.username
- , pollDate: value.created
- , pollQuestion: value.pollQuestion
- , pollTypeId: value.pollType.pollTypesId
- , roomPollAnswerList:
value.roomPollAnswerList
- , roomPollId: value.roomPollId
- , roomScopeName: value.roomScopeName
- }
- );
- } else {
- new
lz.messageWin(canvas.main_content._content.inner,{labeliderror:41});
- }
- ]]>
- </handler>
+ new lz.resultPollWin(canvas.main_content._content.inner,
{roomPoll: value});
+ </handler>
</netRemoteCallHib>
<netRemoteCallHib name="checkHasVoted"
funcname="pollservice.checkHasVoted" remotecontext="$once{ canvas.thishib
}" >
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/createPollWin.lzx
Tue Oct 11 12:07:21 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/createPollWin.lzx
Wed Oct 12 10:34:29 2011
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
-<class name="bigTextListItem" extends="textlistitem" fontsize="11" />
-
- <class name="createPollWin" extends="labelExplorerBox" labelid="18"
- docking="true" resizeable="false" closable="true" width="500" x="100"
height="240">
-
- <labelText fontstyle="bold" labelid="19" y="22" />
-
- <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 }" >
- <method name="setReferenceObj" args="obj">
- this.refObj = obj;
- </method>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("getPollTypeList : ",value)
- for (var i=0;i<value.length;i++){
-
this.parent._polltypes.addItem(canvas.getLabelName(value[i].label.fieldvalues_id),
value[i].pollTypesId);
- }
-
this.parent._polltypes.selectItem(value[0].pollTypesId);
- ]]>
- </handler>
- </netRemoteCallHib>
-
- <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);
- this.parent.getPollTypeList.doCall();
- ]]>
- </handler>
- </resetCombobox>
-
- <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">
- <![CDATA[
- //The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("createPoll : ",value);
- this.parent.close();
- ]]>
- </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>
+ <class name="bigTextListItem" extends="textlistitem" fontsize="11" />
+
+ <class name="createPollWin" extends="labelExplorerBox" labelid="18"
+ docking="true" resizeable="false" closable="true" width="500"
x="100"
+ height="240">
+
+ <labelText fontstyle="bold" labelid="19" y="22" />
+
+ <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 }">
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("getPollTypeList :
",value)
+ for (var i = 0; i < value.length; ++i) {
+
this.parent._polltypes.addItem(canvas.getLabelName(value[i].label.fieldvalues_id),
value[i].pollTypesId);
+ }
+
this.parent._polltypes.selectItem(value[0].pollTypesId);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <labelText labelid="21" y="142" />
+ <resetCombobox name="_polltypes" width="160" x="100" y="142"
+ editable="false" itemclassname="bigTextListItem">
+ <handler name="oninit">
+ this.parent.getPollTypeList.doCall();
+ </handler>
+ </resetCombobox>
+
+ <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">
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("createPoll : ",value);
+ this.parent.close();
+ </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>
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/resultPollWin.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/polls/resultPollWin.lzx
Wed Oct 12 10:34:29 2011
@@ -1,117 +1,127 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
-
-<class name="resultPollWin" extends="labelExplorerBox" labelid="37"
- docking="true" resizeable="false" closable="true" width="500" x="100"
height="390">
-
- <attribute name="createdBy" type="string" value="" />
- <attribute name="pollDate" type="string" value="" />
- <attribute name="pollQuestion" type="string" value="" />
- <attribute name="pollTypeId" type="string" value="" />
- <attribute name="roomPollAnswerList" value="null" />
- <attribute name="roomPollId" type="string" value="" />
- <attribute name="roomScopeName" type="string" value="" />
-
- <attribute name="totalVotes" value="0" type="number" />
-
- <attribute name="positives" value="0" type="number" />
- <attribute name="negatives" value="0" type="number" />
-
- <attribute name="vote1" value="0" type="number" />
- <attribute name="vote2" value="0" type="number" />
- <attribute name="vote3" value="0" type="number" />
- <attribute name="vote4" value="0" type="number" />
- <attribute name="vote5" value="0" type="number" />
- <attribute name="vote6" value="0" type="number" />
- <attribute name="vote7" value="0" type="number" />
- <attribute name="vote8" value="0" type="number" />
- <attribute name="vote9" value="0" type="number" />
- <attribute name="vote10" value="0" type="number" />
-
- <handler name="oninit">
+ <class name="resultPollWin" extends="labelExplorerBox" labelid="37"
+ docking="true" resizeable="false" closable="true" width="500"
x="100"
+ height="410">
+
+ <attribute name="roomPoll" value="null" />
+ <attribute name="archPolls" value="null" />
+ <attribute name="resultpollvotes" value="null" />
+
+ <handler name="oninit">
+ this.displayResults(roomPoll);
+ </handler>
+
+ <method name="displayResults" args="poll">
<![CDATA[
- //Debug.write("this.pollTypeId: ",this.pollTypeId);
- this.head.setAttribute('text',"You "+canvas.getLabelName(36));
- this.totalVotes = this.roomPollAnswerList.length;
- if (this.pollTypeId==1){
- //Debug.write("yes/no");
- for (var eg=0;eg<this.totalVotes;eg++){
-
//Debug.write("this.totalVotes: ",this.roomPollAnswerList[eg].answer,typeof
(this.roomPollAnswerList[eg].answer));
- if (this.roomPollAnswerList[eg].answer){
- this.positives++;
- } else {
- this.negatives++;
- }
- }
- } else if (this.pollTypeId==2){
- //Debug.write("numeric");
- for (var eg=0;eg<this.totalVotes;eg++){
-
//Debug.write("this.totalVotes: ",this.roomPollAnswerList[eg].pointList);
-
this['vote'+this.roomPollAnswerList[eg].pointList]++;
- }
- }
-
- //Debug.write("this.votes: ",this);
- this.voteResultNum.setAttribute('text',this.totalVotes);
-
- if (this.pollTypeId==1){
- if (this.positives==0) {
- var pos = 0;
- } else {
- var pos =
Math.round(((this.positives/this.totalVotes)*100));
- }
- new
lz.parentResultPollBalk(this._resultpollvotes,{newX:pos*2,newPercent:pos+'%',textA:'Yes'});
- if (this.negatives==0) {
- var neg = 0;
- } else {
- var neg =
Math.round(((this.negatives/this.totalVotes)*100));
- }
- new
lz.parentResultPollBalk(this._resultpollvotes,{newX:neg*2,newPercent:neg+'%',textA:'No'});
- }
- if (this.pollTypeId==2){
- for (var i=1;i<11;i++){
- if (this['vote'+i]==0) {
- var pos = 0;
- } else {
- var pos =
Math.round(((this['vote'+i]/this.totalVotes)*100));
- }
- new
lz.parentResultPollBalk(this._resultpollvotes,{newX:pos*2,newPercent:pos+'%',textA:i});
- }
- }
+ this.content.setAttribute("visible", poll != null);
+ if (poll == null) {
+ this.head.setAttribute('text',
canvas.getLabelName(41));
+ return;
+ }
+ this.head.setAttribute('text'
+ , (canvas.user_id == poll.createdBy.user_id ?
canvas.getLabelName(1411) : poll.createdBy.login)
+ + " " + canvas.getLabelName(36));
+
+ var totalVotes = poll.roomPollAnswerList.length;
+ this.content.question.setAttribute('text',
poll.pollQuestion);
+ this.content.voteResultNum.setAttribute('text',
totalVotes);
+
+ var isNumeric = poll.pollType.isNumericAnswer;
+ var resArray = new Array(isNumeric ? 10 : 2);
+ for (var i = 0; i < resArray.length; ++i) {
+ resArray[i] = 0;
+ }
+ for (var i = 0; i < totalVotes; ++i) {
+ var idx = isNumeric ? poll.roomPollAnswerList[i].pointList - 1 :
(poll.roomPollAnswerList[i].answer ? 0 : 1);
+ resArray[idx]++;
+ }
+ if (this.resultpollvotes != null) {
+ this.resultpollvotes.destroy();
+ }
+ this.resultpollvotes = new lz.view(this.content, {y:
142, x: 100});
+ new lz.simplelayout(this.resultpollvotes, {axis: 'y',
spacing: 2});
+ for (var i = 0; i < resArray.length; ++i) {
+ var pos = (totalVotes == 0) ? 0 : Math.round( 100 * resArray[i] /
totalVotes);
+ new lz.parentResultPollBalk(
+ this.resultpollvotes
+ ,{newX: pos * 2
+ , newPercent: pos + '%'
+ , textA: isNumeric ? i + 1 :
canvas.getLabelName(i == 0 ? 34 : 35)
+ }
+ );
+ }
]]>
- </handler>
-
- <labelText y="22" name="head" />
- <labelText text="$once{ parent.pollQuestion }" y="42" x="0" height="60"
- width="380" multiline="true" resize="false"/>
-
- <labelText y="102" labelid="39"/>
-
- <labelText y="102" x="100" name="voteResultNum" />
-
- <labelText y="122" labelid="40"/>
-
- <view name="_resultpollvotes" layout="axis:y;spacing:2" y="122" x="100"
/>
-
- <simpleLabelButton labelid="25" width="100" x="390" y="$once{
parent.height-22 }"
- onclick="this.parent.close();" />
-
-</class>
-
-<class name="parentResultPollBalk" extends="view">
- <attribute name="newX" value="0" type="number" />
- <attribute name="newPercent" value="0%" type="string" />
- <attribute name="answer" value="0" type="number" />
- <attribute name="textA" value="" type="string" />
- <text text="$once{ parent.textA }" resize="true" />
- <resultPollBalk x="40" />
-</class>
-
-<class name="resultPollBalk" extends="view" bgcolor="black" height="20"
width="0">
- <view bgcolor="red" width="${ parent.width-2 }" height="${
parent.height-2 }" x="1" y="1"/>
- <text text="$once{ parent.parent.newPercent }" resize="true" y="2" />
- <animator attribute="width" to="$once{ parent.parent.newX }"
duration="1000"/>
-</class>
+ </method>
+
+ <labelText y="22" name="head" />
+
+ <labelText y="42" name="archPollLbl" labelid="1412" />
+ <resetCombobox name="_archPolls" width="380" x="100" y="42"
+ editable="false" itemclassname="bigTextListItem">
+
+ <netRemoteCallHib name="getArchivedPollList"
+ funcname="pollservice.getArchivedPollList" remotecontext="$once{
canvas.thishib }">
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if (value == null) {
+
this.parent.setAttribute("visible", false);
+
this.parent.parent.archPollLbl.setAttribute("visible", false);
+ return;
+ }
+ this.parent.parent.archPolls = value;
+ if (this.parent.parent.roomPoll !=
null) {
+ this.parent.addItem(this.parent.parent.roomPoll.pollName + "(" +
canvas.getLabelName(1413) + ")", -1);
+ }
+ for (var i = 0; i < value.length; ++i) {
+
this.parent.addItem(value[i].pollName, i);
+ }
+
this.parent.selectItem(this.parent.parent.roomPoll == null ? 0 : -1);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+ <handler name="oninit">
+ this.getArchivedPollList.doCall();
+ </handler>
+ <handler name="onselect" args="sel">
+ if ($debug) Debug.write("onselect ", sel);
+ this.parent.displayResults(sel.value > -1 ?
+ this.parent.archPolls[sel.value] :
this.parent.roomPoll);
+ </handler>
+ </resetCombobox>
+
+ <view name="content">
+ <labelText name="question" y="62" x="0" height="60"
width="380"
+ multiline="true" resize="false" />
+
+ <labelText y="122" labelid="39" />
+
+ <labelText y="122" x="100" name="voteResultNum" />
+
+ <labelText y="142" labelid="40" />
+ </view>
+ <simpleLabelButton labelid="25" width="100" x="390"
+ y="$once{ parent.height-22 }"
onclick="this.parent.close();" />
+
+ </class>
+
+ <class name="parentResultPollBalk" extends="view">
+ <attribute name="newX" value="0" type="number" />
+ <attribute name="newPercent" value="0%" type="string" />
+ <attribute name="answer" value="0" type="number" />
+ <attribute name="textA" value="" type="string" />
+ <text text="$once{ parent.textA }" resize="true" />
+ <resultPollBalk x="40" />
+ </class>
+
+ <class name="resultPollBalk" extends="view" bgcolor="black"
+ height="20" width="0">
+ <view bgcolor="red" width="${ parent.width-2 }" height="${
parent.height-2 }"
+ x="1" y="1" />
+ <text text="$once{ parent.parent.newPercent }" resize="true" y="2"
/>
+ <animator attribute="width" to="$once{ parent.parent.newX }"
+ duration="1000" />
+ </class>
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/participantsPanel.lzx
Tue Oct 11 12:07:21 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/participantsPanel.lzx
Wed Oct 12 10:34:29 2011
@@ -105,26 +105,7 @@
</handler>
<netRemoteCallHib name="getVotes" funcname="pollservice.getVotes"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getVotes : ",value);
- if (value!=null){
- new lz.resultPollWin(
- canvas.main_content._content.inner
- , {
- createdBy: value.createdBy.username
- , pollDate: value.created
- , pollQuestion: value.pollQuestion
- , pollTypeId: value.pollType.pollTypesId
- , roomPollAnswerList: value.roomPollAnswerList
- , roomPollId: value.roomPollId
- , roomScopeName: value.roomScopeName
- }
- );
- } else {
- new
lz.messageWin(canvas.main_content._content.inner,{labeliderror:41});
- }
- ]]>
+ new lz.resultPollWin(canvas.main_content._content.inner,
{roomPoll: value});
</handler>
</netRemoteCallHib>
</simpleLabelButton>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Tue Oct 11 12:07:21 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Wed Oct 12 10:34:29 2011
@@ -97,6 +97,22 @@
} catch (Exception err) {
log.error("[getPoll]", err);
}
+ return null;
+ }
+
+ @SuppressWarnings("unchecked")
+ public List<RoomPoll> getArchivedPollList(Long room_id) {
+ try {
+ log.debug(" :: getPoll :: " + room_id);
+ Query q = em.createQuery("SELECT rp FROM RoomPoll rp WHERE
rp.room.rooms_id = :room_id AND rp.archived = :archived");
+ q.setParameter("room_id", room_id);
+ q.setParameter("archived", true);
+ return q.getResultList();
+ } catch (NoResultException nre) {
+ //expected
+ } catch (Exception err) {
+ log.error("[getPoll]", err);
+ }
return null;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Tue Oct 11 12:07:21 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Wed Oct 12 10:34:29 2011
@@ -197,4 +197,17 @@
return 0;
}
-}
+ public List<RoomPoll> getArchivedPollList() {
+ try {
+ IConnection current = Red5.getConnectionLocal();
+ RoomClient rc =
this.clientListManager.getClientByStreamId(current
+ .getClient().getId());
+
+ // get Poll
+ return
pollManagement.getArchivedPollList(rc.getRoom_id());
+ } catch (Exception err) {
+ log.error("[getArchivedPollList]", err);
+ }
+ return null;
+ }
+}
--
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.
