Skip to content

Commit

Permalink
changed style and text of AdaptivityElement Feedback and Hint
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdLer-Lukas
AdLer-Lukas committed Feb 20, 2024
1 parent 84092a6 commit 47126ec
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
14 changes: 8 additions & 6 deletions ...resentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementAnswerFeedback.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ export default function AdaptivityElementAnswerFeedback({
}, [currentQuestion, currentTask, isCorrect, translate]);

return (
<div className="flex flex-col w-full my-4 h-fit">
{currentQuestion.isRequired && isCorrect && (
<div>{translate("requiredQuestionSolvedCorrectly")}</div>
)}
{contentText && <div className="h-10">{contentText.current}</div>}
<div className="flex justify-end w-1/2">
<div className="flex flex-col my-4 pl-4 pr-2 h-fit gap-4">
<div className="flex flex-col items-start justify-start p-2 bg-buttonbgblue rounded-xl gap-2">
{currentQuestion.isRequired && isCorrect && (
<div className="">{translate("requiredQuestionSolvedCorrectly")}</div>
)}
{contentText && <div className="">{contentText.current}</div>}
</div>
<div className="flex justify-end w-full">
<StyledButton shape="freefloatcenter" onClick={closeFeedback}>
<p className="text-sm">{translate("nextButton")}</p>
</StyledButton>
Expand Down
6 changes: 3 additions & 3 deletions ...esentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export default function AdaptivityElementDialogContainer({

{/* Content */}
{currentTask === null && currentQuestion === null && (
<div className="flex items-center justify-center px-1 mb-4 h-fit rounded-lg font-regular !text-sm lg:m-4">
<div className="flex items-center justify-center px-1 mb-4 h-fit rounded-lg font-regular !text-sm lg:mx-4">
<AdaptivityElementTaskSelection
tasks={contentData.tasks}
setHeaderText={setHeaderText}
Expand All @@ -192,7 +192,7 @@ export default function AdaptivityElementDialogContainer({
</div>
)}
{currentTask !== null && currentQuestion === null && (
<div className="flex items-center justify-center px-1 mb-4 rounded-lg font-regular lg:m-4">
<div className="flex items-center justify-center px-1 mb-4 rounded-lg font-regular lg:mx-4">
<AdaptivityElementQuestionSelection
selectedTask={currentTask}
setHeaderText={setHeaderText}
Expand All @@ -206,7 +206,7 @@ export default function AdaptivityElementDialogContainer({
currentQuestion !== null &&
!showAnswerFeedback &&
selectedHint === null && (
<div className="flex items-center justify-center px-1 mb-4 rounded-lg font-regular h-fit lg:m-4">
<div className="flex items-center justify-center px-1 mb-4 rounded-lg font-regular h-fit lg:mx-4">
<AdaptivityElementAnswerSelection
question={currentQuestion}
setHeaderText={setHeaderText}
Expand Down
4 changes: 3 additions & 1 deletion ...nts/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementHint.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ export default function AdaptivityElementHint({
{hint.hintAction.hintActionType ===
AdaptivityElementActionTypes.CommentAction &&
hint.hintAction.textData !== undefined && (
<div className="pl-4 my-4 font-bold">{hint.hintAction.textData}</div>
<div className="pl-4 my-4 flex items-center justify-center p-2 bg-buttonbgblue rounded-xl">
{hint.hintAction.textData}
</div>
)}

{hint.hintAction.hintActionType ===
Expand Down
6 changes: 3 additions & 3 deletions ...Presentation/React/LearningSpaceDisplay/LearningSpaceGoalPanel/LearningSpaceGoalPanel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function LearningSpaceGoalPanel() {
if (!viewModel || !controller || goals?.length <= 0) return null;

return (
<>
<div>
<img
className="w-[48px] lg:w-[69px]"
src={GoalIcon}
Expand All @@ -34,7 +34,7 @@ export default function LearningSpaceGoalPanel() {
></img>

{isOpen && (
<StyledContainer className="fixed z-10 max-w-2xl p-2 overflow-hidden rounded-lg top-12 right-0 md:top-20 lg:right-40 bg-buttonbgblue">
<StyledContainer className="fixed z-10 max-w-2xl max-h-[90vh] p-2 overflow-auto rounded-lg top-12 right-0 md:top-20 lg:right-40 bg-buttonbgblue">
<div className="flex flex-col gap-4 m-2">
{goals && (
<div className="flex flex-row">
Expand Down Expand Up @@ -97,6 +97,6 @@ export default function LearningSpaceGoalPanel() {
</div>
</StyledContainer>
)}
</>
</div>
);
}
2 changes: 1 addition & 1 deletion ...aptivityElement/UIComponents/__snapshots__/AdaptivityElementDialogContainer.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ exports[`AdaptivityElementDialogContainer should render 1`] = `
</div>
</div>
<div
class="flex items-center justify-center px-1 mb-4 rounded-lg font-regular h-fit lg:m-4"
class="flex items-center justify-center px-1 mb-4 rounded-lg font-regular h-fit lg:mx-4"
>
<div
class="flex flex-col lg:justify-between lg:flex-row w-full p-2 m-auto"
Expand Down
2 changes: 1 addition & 1 deletion ...aptivity/AdaptivityElement/UIComponents/__snapshots__/AdaptivityElementHint.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`AdaptivityElementHint should render CommentAction 1`] = `
<div>
<div
class="pl-4 my-4 font-bold"
class="pl-4 my-4 flex items-center justify-center p-2 bg-buttonbgblue rounded-xl"
>
test
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/localize/de/learningElement.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"tooManyHints": "Der hier hinterlegte Hinweis ist nicht eindeutig zuordbar. Bitte fülle einen Bugreport aus.",
"wrongAnswer": "Schade, leider war deine Antwort falsch.",
"rightAnswer": "Glückwunsch! Diese Antwort war richtig!",
"requiredQuestionSolvedCorrectly": "Durch die Beantwortung dieser Frage wurde die Aufgabe abgeschlossen.",
"questionSolvedWithHigherDifficultyQuestionAvailable": "In der Fragenauswahl ist eine Frage mit höherer Schwierigkeit verfügbar.",
"questionSolvedWithLowerDifficultyQuestionAvailable": "In der Fragenauswahl ist eine Frage mit niedrigerer Schwierigkeit verfügbar.",
"requiredQuestionSolvedCorrectly": "Du hast die Aufgabe in der erforderlichen Schwierigkeit abgeschlossen.",
"questionSolvedWithHigherDifficultyQuestionAvailable": "Du kannst es noch in einer höheren Schwierigkeit versuchen.",
"questionSolvedWithLowerDifficultyQuestionAvailable": "Du kannst es erst Mal in einer niedrigeren Schwierigkeit versuchen.",
"nextButton": "Weiter",
"submitAnswer": "Antwort abgeben",
"submitAnswers": "Antworten abgeben",
Expand Down

0 comments on commit 47126ec

Please sign in to comment.