Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
advu committed Oct 17, 2024
1 parent a64bdc5 commit 3cc742d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 33 deletions.
2 changes: 1 addition & 1 deletion client/components/Tests/ReadingTest/ReadingTest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const ReadingTest = () => {

if (in_experimental_grp) {
if (countNotSelectedChoices >= currentReadingTestQuestion.choices.length) {
dispatch(updateTestFeedbacks(choice.option, ["Correct!"]))
dispatch(updateTestFeedbacks(choice.option, "correct-answer-to-question"))
} else {
if (question_concept_feedbacks && question_concept_feedbacks?.synthesis) {
dispatch(updateTestFeedbacks(choice.option, question_concept_feedbacks?.synthesis))
Expand Down
14 changes: 7 additions & 7 deletions client/components/Tests/ReadingTest/ReadingTestElicitationDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ const ReadingTestElicationDialog = ({ question, showElication, submitElication }
<h3 style={{ textAlign: 'left', margin: 0, paddingLeft: '10px' }}>
<FormattedHTMLMessage
id='experimental-elicitation-question'
values={{
b: (chunks) => <b>{chunks}</b>,
i: (chunks) => <i>{chunks}</i>,
br: () => <br />,
ul: (chunks) => <ul>{chunks}</ul>,
li: (chunks) => <li>{chunks}</li>
}}
// values={{
// b: (chunks) => <b>{chunks}</b>,
// i: (chunks) => <i>{chunks}</i>,
// // br: () => <br />,
// ul: (chunks) => <ul>{chunks}</ul>,
// li: (chunks) => <li>{chunks}</li>
// }}
/>
</h3>
</div>
Expand Down
29 changes: 11 additions & 18 deletions client/components/Tests/ReadingTest/ReadingTestFeedbacks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,22 @@ const ReadingTestFeedbacks = ({ showFeedbacks, closeFeedbacks }) => {
const bigScreen = useWindowDimensions().width >= 700;

useEffect(() => {
console.log(feedbacks)
const filteredSlidesArray = [];
feedbacks.forEach((slide, index) => {
if (slide != undefined) {
filteredSlidesArray.push(slide);
if (typeof slide === 'string') {
filteredSlidesArray.push(slide.replace(/<br\s*\/?>/g, '\n'));
} else {

console.warn('Expected slide to be a string but received:', slide);
}
}
});
setFilteredSlides(filteredSlidesArray);
setLength(filteredSlidesArray.length);
setCurrent(filteredSlidesArray.length - 1);
console.log("filteredSlidesArray", filteredSlidesArray)
}, [feedbacks]);

const nextSlide = () => {
Expand Down Expand Up @@ -82,6 +89,7 @@ const ReadingTestFeedbacks = ({ showFeedbacks, closeFeedbacks }) => {
overflowX: 'hidden',
paddingLeft: '1em',
paddingRight: '1em',
paddingTop: '1.5em',
width: '100%'
}
}>
Expand All @@ -94,31 +102,16 @@ const ReadingTestFeedbacks = ({ showFeedbacks, closeFeedbacks }) => {
}}
>
<div className='slide active' key={current}>
{current === 0 && filteredSlides[current][0] !== "Correct!" && (
{current === 0 && filteredSlides[current] !== "correct-answer-to-question" && (
<div style={{ marginBottom: "0.5em", fontStyle: "italic", color: "gray" }}>
<FormattedHTMLMessage
id="first-time-meta-help-message"
values={{
b: (chunks) => <b>{chunks}</b>,
i: (chunks) => <i>{chunks}</i>,
br: () => <br />,
ul: (chunks) => <ul>{chunks}</ul>,
li: (chunks) => <li>{chunks}</li>
}}
/>
<hr />
</div>
)}
<hr />
<FormattedHTMLMessage
id={filteredSlides[current]}
defaultMessage={filteredSlides[current]}
values={{
b: (chunks) => <b>{chunks}</b>,
i: (chunks) => <i>{chunks}</i>,
br: () => <br />,
ul: (chunks) => <ul>{chunks}</ul>,
li: (chunks) => <li>{chunks}</li>
}}
/>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions client/components/Tests/ReadingTest/ReadingTestNextSetDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ const ReadingTestNextSetDialog = ({ showNextSetDialog, confirmNextSet }) => {
<h4 style={{ textAlign: 'left', margin: 0 }}>
<FormattedHTMLMessage
id='move-to-next-set-of-reading-items'
values={{
b: (chunks) => <b>{chunks}</b>,
i: (chunks) => <i>{chunks}</i>,
br: () => <br />,
ul: (chunks) => <ul>{chunks}</ul>,
li: (chunks) => <li>{chunks}</li>
}}
// values={{
// b: (chunks) => <b>{chunks}</b>,
// i: (chunks) => <i>{chunks}</i>,
// // br: () => <br />,
// ul: (chunks) => <ul>{chunks}</ul>,
// li: (chunks) => <li>{chunks}</li>
// }}
/>
</h4>
<button
Expand Down

0 comments on commit 3cc742d

Please sign in to comment.