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

Merge pull request #4145 from ritzalam/display-time-remaining

Browse Source 
Display time remaining
This commit is contained in:
Richard Alam 2017-07-26 11:53:37 -04:00 committed by GitHub
commit bc584f79e8
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -784,6 +784,8 @@ bbb.lockSettings.feature=Feature
bbb.lockSettings.locked=Locked
bbb.lockSettings.lockOnJoin=Lock On Join
bbb.meeting.timeRemaining = Time remaining
bbb.users.breakout.breakoutRooms = Breakout Rooms
bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
bbb.users.breakout.timer = <b>{0}</b>

4
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -193,6 +193,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function handleRemainingTimeUpdate(e:BreakoutRoomEvent):void {
if (! timeRemaining.visible) {
timeRemaining.visible = true;
timeRemainingLabel.visible = true;
}
TimerUtil.setCountDownTimer(timeRemaining, e.durationInMinutes);
}
@ -542,6 +543,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VRule styleName="toolbarSeparator" height="10" />
<mx:Label id="meetingNameLbl" minWidth="1" styleName="meetingNameLabelStyle" />
<mx:HBox id="addedBtns" width="100%" horizontalAlign="center"/>
<mx:Label id="timeRemainingLabel" visible="false"
text="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}: "
toolTip="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}"/>
<mx:Label id="timeRemaining" visible="false"
text="{ResourceUtil.getInstance().getString('bbb.users.breakout.calculatingRemainingTime')}"
toolTip="{ResourceUtil.getInstance().getString('bbb.users.breakout.timer.toolTip')}"/>

16
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
View File

@ -115,16 +115,16 @@ package org.bigbluebutton.modules.users.services
case "MeetingEndingEvtMsg":
handleMeetingEnding(message);
break;
case "meetingMuted":
case "MeetingMutedEvtMsg":
handleMeetingMuted(message);
break;
case "meetingState":
handleMeetingState(message);
break;
case "inactivityWarning":
case "MeetingInactivityWarningEvtMsg":
handleInactivityWarning(message);
break;
case "meetingIsActive":
case "MeetingIsActiveEvtMsg":
handleMeetingIsActive(message);
break;
case "UserEmojiChangedEvtMsg":
@ -494,9 +494,9 @@ package org.bigbluebutton.modules.users.services
private function handleMeetingMuted(msg:Object):void {
var map:Object = JSON.parse(msg.msg);
if (map.hasOwnProperty("meetingMuted")) {
LiveMeeting.inst().meetingStatus.isMeetingMuted = map.meetingMuted;
var body:Object = msg.body as Object;
if (body.hasOwnProperty("muted")) {
LiveMeeting.inst().meetingStatus.isMeetingMuted = body.muted as Boolean;
dispatcher.dispatchEvent(new MeetingMutedEvent());
}
}
@ -515,10 +515,10 @@ package org.bigbluebutton.modules.users.services
}
private function handleInactivityWarning(msg:Object):void {
var map:Object = JSON.parse(msg.msg);
var body:Object = msg.body as Object;
var bbbEvent:BBBEvent = new BBBEvent(BBBEvent.INACTIVITY_WARNING_EVENT);
bbbEvent.payload.duration = map.duration;
bbbEvent.payload.duration = body.timeLeftInSec as Number;
globalDispatcher.dispatchEvent(bbbEvent);
}

4
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
View File

@ -252,9 +252,9 @@ package org.bigbluebutton.modules.users.services
public function activityResponse():void {
var message:Object = {
header: {name: "GetRecordingStatusReqMsg", meetingId: UsersUtil.getInternalMeetingID(),
header: {name: "MeetingActivityResponseCmdMsg", meetingId: UsersUtil.getInternalMeetingID(),
userId: UsersUtil.getMyUserID()},
body: {requestedBy: UsersUtil.getMyUserID()}
body: {respondedBy: UsersUtil.getMyUserID()}
};
var _nc:ConnectionManager = BBB.initConnectionManager();