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

update smart slides to detect user response poll

Browse Source
This commit is contained in:
KDSBrowne 2022-10-11 19:11:04 +00:00
parent 7c91152427
commit 3e9c858717
5 changed files with 116 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx
View File

@ -34,6 +34,10 @@ const intlMessages = defineMessages({
id: 'app.poll.abstention',
description: 'Poll Abstention option value',
},
typedRespLabel: {
id: 'app.poll.userResponse.label',
description: 'quick poll typed response label',
}
});
const propTypes = {
@ -44,80 +48,7 @@ const propTypes = {
amIPresenter: PropTypes.bool.isRequired,
};
const handleClickQuickPoll = (layoutContextDispatch) => {
layoutContextDispatch({
type: ACTIONS.SET_SIDEBAR_CONTENT_IS_OPEN,
value: true,
});
layoutContextDispatch({
type: ACTIONS.SET_SIDEBAR_CONTENT_PANEL,
value: PANELS.POLL,
});
Session.set('forcePollOpen', true);
Session.set('pollInitiated', true);
};
const getAvailableQuickPolls = (
slideId, parsedSlides, startPoll, pollTypes, layoutContextDispatch,
) => {
const pollItemElements = parsedSlides.map((poll) => {
const { poll: label } = poll;
const { type } = poll;
let itemLabel = label;
const letterAnswers = [];
if (type !== pollTypes.YesNo
&& type !== pollTypes.YesNoAbstention
&& type !== pollTypes.TrueFalse) {
const { options } = itemLabel;
itemLabel = options.join('/').replace(/[\n.)]/g, '');
if (type === pollTypes.Custom) {
for (let i = 0; i < options.length; i += 1) {
const letterOption = options[i]?.replace(/[\r.)]/g, '').toUpperCase();
if (letterAnswers.length < MAX_CUSTOM_FIELDS) {
letterAnswers.push(letterOption);
} else {
break;
}
}
}
}
// removes any whitespace from the label
itemLabel = itemLabel?.replace(/\s+/g, '').toUpperCase();
const numChars = {
1: 'A', 2: 'B', 3: 'C', 4: 'D', 5: 'E',
};
itemLabel = itemLabel.split('').map((c) => {
if (numChars[c]) return numChars[c];
return c;
}).join('');
return (
<Dropdown.DropdownListItem
label={itemLabel}
key={_.uniqueId('quick-poll-item')}
onClick={() => {
handleClickQuickPoll(layoutContextDispatch);
startPoll(type, slideId, letterAnswers);
}}
answers={letterAnswers}
/>
);
});
const sizes = [];
return pollItemElements.filter((el) => {
const { label } = el.props;
if (label.length === sizes[sizes.length - 1]) return false;
sizes.push(label.length);
return el;
});
};
class QuickPollDropdown extends Component {
render() {
const QuickPollDropdown = (props) => {
const {
amIPresenter,
intl,
@ -128,7 +59,93 @@ class QuickPollDropdown extends Component {
className,
layoutContextDispatch,
pollTypes,
} = this.props;
} = props;
const handleClickQuickPoll = (layoutContextDispatch) => {
layoutContextDispatch({
type: ACTIONS.SET_SIDEBAR_CONTENT_IS_OPEN,
value: true,
});
layoutContextDispatch({
type: ACTIONS.SET_SIDEBAR_CONTENT_PANEL,
value: PANELS.POLL,
});
Session.set('forcePollOpen', true);
Session.set('pollInitiated', true);
};
const getAvailableQuickPolls = (
slideId, parsedSlides, startPoll, pollTypes, layoutContextDispatch,
) => {
const pollItemElements = parsedSlides.map((poll) => {
const { poll: label } = poll;
const { type, poll: pollData } = poll;
let itemLabel = label;
const letterAnswers = [];
if (type === 'R-') {
return (
<Dropdown.DropdownListItem
label={intl.formatMessage(intlMessages.typedRespLabel)}
key={_.uniqueId('quick-poll-item')}
onClick={() => {
handleClickQuickPoll(layoutContextDispatch);
startPoll(type, slideId, letterAnswers, pollData?.question);
}}
question={pollData?.question}
/>
);
}
if (type !== pollTypes.YesNo
&& type !== pollTypes.YesNoAbstention
&& type !== pollTypes.TrueFalse) {
const { options } = itemLabel;
itemLabel = options.join('/').replace(/[\n.)]/g, '');
if (type === pollTypes.Custom) {
for (let i = 0; i < options.length; i += 1) {
const letterOption = options[i]?.replace(/[\r.)]/g, '').toUpperCase();
if (letterAnswers.length < MAX_CUSTOM_FIELDS) {
letterAnswers.push(letterOption);
} else {
break;
}
}
}
}
// removes any whitespace from the label
itemLabel = itemLabel?.replace(/\s+/g, '').toUpperCase();
const numChars = {
1: 'A', 2: 'B', 3: 'C', 4: 'D', 5: 'E',
};
itemLabel = itemLabel.split('').map((c) => {
if (numChars[c]) return numChars[c];
return c;
}).join('');
return (
<Dropdown.DropdownListItem
label={itemLabel}
key={_.uniqueId('quick-poll-item')}
onClick={() => {
handleClickQuickPoll(layoutContextDispatch);
startPoll(type, slideId, letterAnswers);
}}
answers={letterAnswers}
/>
);
});
const sizes = [];
return pollItemElements.filter((el) => {
const { label } = el.props;
if (label.length === sizes[sizes.length - 1]) return false;
sizes.push(label.length);
return el;
});
};
const parsedSlide = parseCurrentSlideContent(
intl.formatMessage(intlMessages.yesOptionLabel),
@ -146,11 +163,14 @@ class QuickPollDropdown extends Component {
if (quickPollOptions.length === 0) return null;
let answers = null;
let question = '';
let quickPollLabel = '';
if (quickPolls.length > 0) {
const { props: pollProps } = quickPolls[0];
quickPollLabel = pollProps.label;
answers = pollProps.answers;
question = pollProps.question;
}
let singlePollType = null;
@ -166,7 +186,7 @@ class QuickPollDropdown extends Component {
tooltipLabel={intl.formatMessage(intlMessages.quickPollLabel)}
onClick={() => {
handleClickQuickPoll(layoutContextDispatch);
startPoll(singlePollType, currentSlide.id, answers);
startPoll(singlePollType, currentSlide.id, answers, question);
}}
size="lg"
disabled={!!activePoll}
@ -208,7 +228,6 @@ class QuickPollDropdown extends Component {
) : (
btn
);
}
}
QuickPollDropdown.propTypes = propTypes;

4
bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
View File

@ -81,7 +81,7 @@ class LiveResult extends PureComponent {
if (response) {
const formattedAnswers = [];
response.answerIds.forEach((answerId) => {
const formattedMessageIndex = answers[answerId].key.toLowerCase();
const formattedMessageIndex = answers[answerId]?.key?.toLowerCase();
const formattedAnswer = defaultPoll && pollAnswerIds[formattedMessageIndex]
? intl.formatMessage(pollAnswerIds[formattedMessageIndex])
: answers[answerId].key;
@ -115,7 +115,7 @@ class LiveResult extends PureComponent {
const pollStats = [];
answers.reduce(caseInsensitiveReducer, []).map((obj) => {
const formattedMessageIndex = obj.key.toLowerCase();
const formattedMessageIndex = obj?.key?.toLowerCase();
const pct = Math.round(obj.numVotes / numResponders * 100);
const pctFotmatted = `${Number.isNaN(pct) ? 0 : pct}%`;

4
bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx
View File

@ -43,12 +43,12 @@ export default withTracker((params) => {
presentationId,
} = params;
const startPoll = (type, id, answers) => {
const startPoll = (type, id, answers = [], question = '') => {
Session.set('openPanel', 'poll');
Session.set('forcePollOpen', true);
window.dispatchEvent(new Event('panelChanged'));
makeCall('startPoll', PollService.pollTypes, type, id, false, '', false, answers);
makeCall('startPoll', PollService.pollTypes, type, id, false, question, false, answers);
};
return {

15
bigbluebutton-html5/imports/ui/components/presentation/service.js
View File

@ -83,6 +83,12 @@ const parseCurrentSlideContent = (yesValue, noValue, abstentionValue, trueValue,
content,
} = currentSlide;
const questionRegex = /.*?\?$/gm;
let question = content.match(questionRegex) || '';
const doubleQuestionRegex = /\?{2}/gm;
let doubleQuestion = content.match(doubleQuestionRegex) || null;
const pollRegex = /[1-9A-Ia-i][.)].*/g;
let optionsPoll = content.match(pollRegex) || [];
if (optionsPoll) optionsPoll = optionsPoll.map((opt) => `\r${opt[0]}.`);
@ -139,6 +145,15 @@ const parseCurrentSlideContent = (yesValue, noValue, abstentionValue, trueValue,
}
});
if (question.length > 0 && optionsPoll.length === 0 && !doubleQuestion) {
quickPollOptions.push({
type: `R-`,
poll: {
question: question[0],
}
});
}
if (quickPollOptions.length > 0) {
content = content.replace(new RegExp(pollRegex), '');
}

2
bigbluebutton-html5/public/locales/en.json
View File

@ -311,7 +311,7 @@
"app.poll.clickHereToSelect": "Click here to select",
"app.poll.question.label" : "Write your question...",
"app.poll.optionalQuestion.label" : "Write your question (optional)...",
"app.poll.userResponse.label" : "User Response",
"app.poll.userResponse.label" : "Typed Response",
"app.poll.responseTypes.label" : "Response Types",
"app.poll.optionDelete.label" : "Delete",
"app.poll.responseChoices.label" : "Response Choices",