Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Textbox between answers in Quizzes #812

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Textbox between answers in Quizzes #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e983ae6
add prefaceTitle to quizItem
iPegii Jul 29, 2021
bbdeb3c
add reducer and change type to string | null
iPegii Jul 30, 2021
4134021
change prefaceTItle type
iPegii Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/backendv2/src/models/quiz_item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class QuizItem extends mixin(BaseModel, [
allAnswersCorrect!: string
deleted!: boolean
direction!: "row" | "column"
prefaceText!: string

static get tableName() {
return "quiz_item"
Expand Down
18 changes: 18 additions & 0 deletions packages/backendv2/tests/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const input = {
failureMessage: "boo!",
sharedOptionFeedbackMessage: null,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
options: [
{
order: 1,
Expand All @@ -51,6 +52,7 @@ export const input = {
allAnswersCorrect: false,
sharedOptionFeedbackMessage: null,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
},
],
peerReviewCollections: [
Expand Down Expand Up @@ -102,6 +104,7 @@ export const input = {
failureMessage: "boo!",
sharedOptionFeedbackMessage: null,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
},
{
id: "707195a3-aafe-4c06-bf23-854e54e084db",
Expand All @@ -116,6 +119,7 @@ export const input = {
failureMessage: "boo!",
sharedOptionFeedbackMessage: null,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
},
],
peerReviewCollections: [
Expand Down Expand Up @@ -283,6 +287,7 @@ export const validation = {
usesSharedOptionFeedbackMessage: false,
title: "multiple-choice",
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
body: "item",
successMessage: "yay!",
failureMessage: "boo!",
Expand Down Expand Up @@ -320,6 +325,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "essay",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -396,6 +402,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "essay",
body: "item",
successMessage: "yay!",
Expand All @@ -421,6 +428,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "open",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -496,6 +504,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "multiple-choice",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -534,6 +543,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "essay",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -610,6 +620,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
options: [],
title: "open",
body: "item",
Expand All @@ -635,6 +646,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "open",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -684,6 +696,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "essay",
body: "item",
successMessage: "yay!",
Expand All @@ -709,6 +722,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "open",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -758,6 +772,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "essay",
body: "item",
successMessage: "yay!",
Expand All @@ -783,6 +798,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
title: "open",
body: "item",
successMessage: "yay!",
Expand Down Expand Up @@ -1292,6 +1308,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
createdAt: expect.stringMatching(dateTime),
updatedAt: expect.stringMatching(dateTime),
options: [],
Expand All @@ -1317,6 +1334,7 @@ export const validation = {
maxValue: null,
usesSharedOptionFeedbackMessage: false,
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceText: "prefaceText",
createdAt: expect.stringMatching(dateTime),
updatedAt: expect.stringMatching(dateTime),
allAnswersCorrect: false,
Expand Down
13 changes: 11 additions & 2 deletions packages/moocfi-quizzes/src/components/MultipleChoice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ const LeftAlignedMarkdownText = styled(MarkdownText)`

const justADiv = styled.div``

const PrefaceMarkdown = styled(MarkdownText)`
padding-top: 1em;
padding-bottom: 1em;
`

type MultipleChoiceProps = {
item: QuizItem
}
Expand All @@ -108,11 +113,10 @@ const MultipleChoice: React.FunctionComponent<MultipleChoiceProps> = ({
const quizDisabled = useTypedSelector(state => state.quizAnswer.quizDisabled)
const answer = useTypedSelector(state => state.quizAnswer.quizAnswer)
const options = item.options

// preface_text
if (!quiz) {
return <div />
}

const itemAnswer = answer.itemAnswers.find(ia => ia.quizItemId === item.id)
if (!itemAnswer && !quizDisabled) {
return <LaterQuizItemAddition item={item} />
Expand All @@ -130,6 +134,11 @@ const MultipleChoice: React.FunctionComponent<MultipleChoiceProps> = ({

return (
<div role="group" aria-label={item.title}>
{item.prefaceText.length > 1 ? (
<PrefaceMarkdown Component={justADiv} removeParagraphs>
{item.prefaceText}
</PrefaceMarkdown>
) : null}
<ItemContent
direction={direction}
providedStyles={themeProvider.multipleChoiceItemContentStyles}
Expand Down
1 change: 0 additions & 1 deletion packages/moocfi-quizzes/src/components/QuizImpl/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ const FuncQuizImpl: React.FunctionComponent<QuizProps> = ({
})

if (fatal) {
console.log("quiz")
courseStatusProvider.notifyError &&
courseStatusProvider.notifyError(messageState.message)
return (
Expand Down
1 change: 1 addition & 0 deletions packages/moocfi-quizzes/src/modelTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export type QuizItem = {
sharedOptionFeedbackMessage?: string
direction: QuizItemDirection
feedbackDisplayPolicy: QuizItemFeedbackDisplayPolicy
prefaceText: string
}

export type PeerReviewQuestion = {
Expand Down
12 changes: 12 additions & 0 deletions ...izEditForms/QuizItem/MultipleChoiceDropdownContent/MultipleChoiceDropdownModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
editedSharedOptionsFeedbackMessage,
editedItemSuccessMessage,
editedItemFailureMessage,
editedQuizItemPrefaceTitle,
} from "../../../../store/editor/items/itemAction"
import { useTypedSelector } from "../../../../store/store"
import { useDispatch } from "react-redux"
Expand Down Expand Up @@ -159,6 +160,17 @@ export const MultipleChoiceModalContent = ({ item }: EditorModalProps) => {
</ModalContent>
</>
)}
<ModalContent>
<MarkdownEditor
label="prefaceTitle"
text={storeItem.prefaceTitle ?? ""}
onChange={event =>
dispatch(
editedQuizItemPrefaceTitle(event.target.value, storeItem.id),
)
}
/>
</ModalContent>
</>
)
}
Expand Down
6 changes: 6 additions & 0 deletions packages/quizzes-dashboard/store/editor/items/itemAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ export const editedQuizItemFeedbackDisplayPolicy = createAction(
newPolicy: "DisplayFeedbackOnQuizItem" | "DisplayFeedbackOnAllOptions"
}>()

export const editedQuizItemPrefaceTitle = createAction(
"EDITED_QUIZ_ITEM_PREFACE_TITLE",
(itemId: string, newPrefaceTitle: string) => ({ itemId, newPrefaceTitle }),
)<{ itemId: string; newPrefaceTitle: string }>()

export const itemActions = [
editedQuizItemBody,
editedQuizItemTitle,
Expand All @@ -167,6 +172,7 @@ export const itemActions = [
toggledAllAnswersCorrect,
editedItemDirection,
editedQuizItemFeedbackDisplayPolicy,
editedQuizItemPrefaceTitle,
]

export default itemActions
9 changes: 9 additions & 0 deletions packages/quizzes-dashboard/store/editor/items/itemReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
toggledAllAnswersCorrect,
editedItemDirection,
editedQuizItemFeedbackDisplayPolicy,
editedQuizItemPrefaceTitle,
} from "./itemAction"
import {
initializedEditor,
Expand Down Expand Up @@ -132,6 +133,13 @@ export const itemReducer = createReducer<
})
})

.handleAction(editedQuizItemPrefaceTitle, (state, action) => {
return produce(state, draftState => {
draftState[action.payload.itemId].prefaceTitle =
action.payload.newPrefaceTitle
})
})

.handleAction(createdNewItem, (state, action) => {
return produce(state, draftState => {
const newItem: NormalizedItem = {
Expand All @@ -158,6 +166,7 @@ export const itemReducer = createReducer<
allAnswersCorrect: false,
direction: "row",
feedbackDisplayPolicy: "DisplayFeedbackOnQuizItem",
prefaceTitle: null,
}
draftState[action.payload.itemId] = newItem
})
Expand Down
1 change: 1 addition & 0 deletions packages/quizzes-dashboard/types/NormalizedQuiz.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export interface NormalizedItem {
feedbackDisplayPolicy:
| "DisplayFeedbackOnQuizItem"
| "DisplayFeedbackOnAllOptions"
prefaceTitle: string | null
}

export interface NormalizedOption {
Expand Down
1 change: 1 addition & 0 deletions packages/quizzes-dashboard/types/Quiz.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export interface Item {
feedbackDisplayPolicy:
| "DisplayFeedbackOnQuizItem"
| "DisplayFeedbackOnAllOptions"
prefaceTitle: null
}

export interface Option {
Expand Down