BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Overhauling PollingStatsWindow, nearly got it fixed

Browse Source
This commit is contained in:
jtrobinson 2012-10-29 21:08:45 +00:00
parent 0c6e5a0632
commit 172c19c714
7 changed files with 233 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bigbluebutton-client/src/org/bigbluebutton/modules/polling/model/AnswerObject.as Executable file
View File

@ -0,0 +1,13 @@
package org.bigbluebutton.modules.polling.model
{
import mx.collections.ArrayCollection;
import org.bigbluebutton.common.LogUtil;
[Bindable]
public class AnswerObject
{
public var answer:String;
public var votes:String;
public var percent:String;
}
}

31
bigbluebutton-client/src/org/bigbluebutton/modules/polling/model/PollObject.as Normal file → Executable file
View File

@ -2,6 +2,7 @@ package org.bigbluebutton.modules.polling.model
{
import mx.collections.ArrayCollection;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.modules.polling.model.PollStatLineObject;
/*
* This class has been setted his attributes to public, for serialize with the model of the bigbluebutton-apps, in order
@ -58,5 +59,35 @@ package org.bigbluebutton.modules.polling.model
LogUtil.error(LOGNAME + "This PollObject is NULL.");
}
}
public function generateStats():ArrayCollection{
var returnCollection:ArrayCollection = new ArrayCollection;
for (var i:int = 0; i < answers.length; i++){
var pso:PollStatLineObject = new PollStatLineObject;
pso.answer = answers[i].toString();
pso.votes = votes[i].toString();
//pso.percentage =
if (totalVotes == 0){
pso.percentage = "";
}
else{
pso.percentage = Math.round(100*(votes[i]/totalVotes)) + "%";
}
returnCollection.addItem(pso);
}
return returnCollection;
}
public function generateTestStats():ArrayCollection{
var returnCollection:ArrayCollection = new ArrayCollection;
for (var i:int = 0; i < 6; i++){
var pso:PollStatLineObject = new PollStatLineObject;
pso.answer = "Test answer " + i;
pso.votes = "Test votes " + i;
pso.percentage = "Test percent " + i;
returnCollection.addItem(pso);
}
return returnCollection;
}
}
}

12
bigbluebutton-client/src/org/bigbluebutton/modules/polling/model/PollStatLineObject.as Executable file
View File

@ -0,0 +1,12 @@
package org.bigbluebutton.modules.polling.model
{
import mx.collections.ArrayCollection;
import org.bigbluebutton.common.LogUtil;
[Bindable]
public class PollStatLineObject
{
public var answer:String;
public var votes:String;
public var percentage:String;
}
}

31
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/AnswerItemRenderer.mxml Executable file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org
Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below).
BigBlueButton is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2.1 of the License, or (at your option) any later
version.
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
$Id: $
-->
<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml"
verticalScrollPolicy="off" horizontalScrollPolicy="off">
<mx:Script>
<![CDATA[
import org.bigbluebutton.util.i18n.ResourceUtil;
]]>
</mx:Script>
<mx:Label id="answerLabel" textAlign="left" text="{data.answer}"/>
</mx:HBox>

31
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PercentageItemRenderer.mxml Executable file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org
Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below).
BigBlueButton is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2.1 of the License, or (at your option) any later
version.
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
$Id: $
-->
<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml"
verticalScrollPolicy="off" horizontalScrollPolicy="off">
<mx:Script>
<![CDATA[
import org.bigbluebutton.util.i18n.ResourceUtil;
]]>
</mx:Script>
<mx:Label id="percentLabel" textAlign="left" text="{data.percentage}"/>
</mx:HBox>

89
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
View File

@ -51,6 +51,8 @@
import org.bigbluebutton.modules.chat.events.SendPublicChatMessageEvent;
import org.bigbluebutton.modules.polling.model.PollObject;
import org.bigbluebutton.modules.polling.model.PollStatLineObject;
import org.bigbluebutton.modules.polling.model.AnswerObject;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.model.users.Conference
@ -74,7 +76,9 @@
public static const LOGNAME:String = "[PollingStatsWindow] ";
[Bindable] public var question:String;
[Bindable] public var answers:Array;
[Bindable] public var trackingPoll:PollObject;
[Bindable] public var webPollUrl:String;
public var viewingClosedPoll:Boolean = false;
public var moduleAttributes:Object;
@ -86,6 +90,7 @@
private var webClosed:Boolean;
private var notified:Boolean;
private var refreshTimer:Timer = new Timer(1000);
private var answersAC:ArrayCollection = new ArrayCollection();
private function init():void{
conference = UserManager.getInstance().getConference();
@ -101,6 +106,7 @@
}
refreshTimer.addEventListener(TimerEvent.TIMER, autoRefresh);
refreshTimer.start();
answersAC = trackingPoll.generateStats();
notified = false;
}
@ -244,7 +250,7 @@
}
// function receives Array.length and ArrayCollection
private function createResultsTable(amount:uint, content:Array):void{
/*private function createResultsTable(amount:uint, content:Array):void{
var _tx: Text;
var _votes: Text;
var _percent: Text;
@ -295,9 +301,56 @@
didNotVote();
invalidateDisplayList();
resultBox.validateNow();
} // end of function createResultsTable */
private function createResultsTable(amount:uint, content:Array):void{
// DEBUG AREA to test PollObject.generateStats()
/*LogUtil.debug("Testing PollObject.generateStats()");
var ac:ArrayCollection = trackingPoll.generateStats();
for (var i:int = 0; i < ac.length; i++){
var pso:PollStatLineObject = ac.getItemAt(i) as PollStatLineObject;
LogUtil.debug("PSO: " + pso.answer + " " + pso.votes + " " + pso.percentage);
}*/
answersAC = trackingPoll.generateStats();
var totalVotes:int = 0;
for (var n:int = 0; n < trackingPoll.votes.length; n++){
totalVotes+= int(trackingPoll.votes[n]);
}
// delete existing rows
answersAC.removeAll();
resultsGrid.removeChildren();
// creating rows one by one
for (var i:int = 0; i < amount; i++) {
var newAnswer:AnswerObject = new AnswerObject();
newAnswer.answer = content[i].toString();
newAnswer.votes = trackingPoll.votes[i];
// Percentage is in terms of how many votes each option has in terms of total votes
if (totalVotes > 0){
newAnswer.percent = Math.round(100*(trackingPoll.votes[i]/totalVotes)) + "%";
}else{
// Prevents percentages from displaying misleading results before any votes come in, and from dividing by zero
newAnswer.percent = " ";
}
answersAC.addItem(newAnswer);
} // end of loop
didNotVote();
resultsGrid.invalidateDisplayList();
//resultBox.validateNow();
} // end of function createResultsTable
private function didNotVote():void{
var dnvAnswer:AnswerObject = new AnswerObject();
dnvAnswer.answer = ResourceUtil.getInstance().getString('bbb.polling.stats.didNotVote');
dnvAnswer.votes = trackingPoll.didNotVote.toString();
dnvAnswer.percent = " ";
answersAC.addItem(dnvAnswer);
}
/*private function didNotVote():void{
var _tx:Text = new Text();
var _votes:Text= new Text;
var _hb:HBox = new HBox();
@ -315,7 +368,7 @@
_hb.focusEnabled="true";
_hb.accessibilityDescription='bbb.polling.stats.didNotVote' + _votes.text + " votes.";
}
}*/
]]>
</mx:Script>
<!-- Prototype of Polling Statistics View Design -->
@ -348,11 +401,33 @@
paddingTop="15" paddingBottom="10"
fontWeight="bold" textAlign="center"
text="{question}"/>
<mx:Box id="resultBox"
width="90%"
height="90%"
focusEnabled="true"
accessibilityDescription="Delta"/>
<mx:DataGrid id="resultsGrid" editable="false" dataProvider="{trackingPoll.generateTestStats()}" width="100%">
<mx:columns>
<mx:DataGridColumn dataField="answer"
headerText="Answers"
editable="false"
width="90"
sortable="false"
itemRenderer="org.bigbluebutton.modules.polling.views.AnswerItemRenderer"
/>
<mx:DataGridColumn dataField="votes"
headerText="Total Votes"
editable="false"
width="90"
sortable="false"
itemRenderer="org.bigbluebutton.modules.polling.views.VotesItemRenderer"
/>
<mx:DataGridColumn dataField="percentage"
headerText="Percentage"
editable="false"
width="90"
sortable="false"
itemRenderer="org.bigbluebutton.modules.polling.views.PercentageItemRenderer"
/>
</mx:columns>
</mx:DataGrid>
</mx:VBox>
<mx:ControlBar width="100%" height="10%">
<mx:Spacer width="100%"/>

31
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/VotesItemRenderer.mxml Executable file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org
Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below).
BigBlueButton is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2.1 of the License, or (at your option) any later
version.
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
$Id: $
-->
<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml"
verticalScrollPolicy="off" horizontalScrollPolicy="off">
<mx:Script>
<![CDATA[
import org.bigbluebutton.util.i18n.ResourceUtil;
]]>
</mx:Script>
<mx:Label id="votesLabel" textAlign="left" text="{data.votes}"/>
</mx:HBox>