diff --git a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx index 448dc4e4e3..44521be3d9 100644 --- a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx @@ -2,11 +2,11 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import _ from 'lodash'; import { defineMessages, injectIntl } from 'react-intl'; -import Button from '/imports/ui/components/button/component'; import caseInsensitiveReducer from '/imports/utils/caseInsensitiveReducer'; import { Session } from 'meteor/session'; -import { styles } from './styles'; +import Styled from './styles'; import Service from './service'; +import Settings from '/imports/ui/services/settings'; const intlMessages = defineMessages({ usersTitle: { @@ -99,14 +99,14 @@ class LiveResult extends PureComponent { ...acc, ( - {user.name} - + {user.name} + { defaultPoll && pollAnswerIds[formattedMessageIndex] ? intl.formatMessage(pollAnswerIds[formattedMessageIndex]) : user.answer } - + ), ]); @@ -124,22 +124,22 @@ class LiveResult extends PureComponent { }; return pollStats.push( -
-
+ + { defaultPoll && pollAnswerIds[formattedMessageIndex] ? intl.formatMessage(pollAnswerIds[formattedMessageIndex]) : obj.key } -
-
-
-
{obj.numVotes || 0}
-
-
+ + + + {obj.numVotes || 0} + + {pctFotmatted} -
-
, + + , ); }); @@ -170,6 +170,7 @@ class LiveResult extends PureComponent { } = this.props; const { userAnswers, pollStats, currentPollQuestion } = this.state; + const { animations } = Settings.application; let waiting; let userCount = 0; @@ -189,9 +190,9 @@ class LiveResult extends PureComponent { return (
-
- {currentPollQuestion ? {currentPollQuestion} : null} -
+ + {currentPollQuestion ? {currentPollQuestion} : null} + {waiting ? ( @@ -203,14 +204,14 @@ class LiveResult extends PureComponent { ) : {intl.formatMessage(intlMessages.doneLabel)}} {waiting - ? : null} -
+ ? : null} + {pollStats} -
+ {currentPoll && currentPoll.answers.length > 0 ? ( -
-
+ ) : ( -