Skip to content

Commit 1e0893a

Browse files
committed
fix(ui): Change grading view to a one column layout
1 parent 4e76abe commit 1e0893a

File tree

2 files changed

+25
-33
lines changed

2 files changed

+25
-33
lines changed

src/screens/edit-student-grade/components/EditStudentGradeLayout.tsx

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type editStudentGradeLayoutRequiredIds = {
1313
studentUUID: string;
1414
};
1515

16-
interface editStudentGradeLayoutProps {
16+
interface EditStudentGradeLayoutProps {
1717
ids: editStudentGradeLayoutRequiredIds;
1818
rubric: Rubric;
1919
studentGrade: studentGradeResponse;
@@ -25,7 +25,7 @@ export const EditStudentGradeLayout = ({
2525
rubric,
2626
studentGrade,
2727
selectedCriteriaByObjectiveMap
28-
}: editStudentGradeLayoutProps) => {
28+
}: EditStudentGradeLayoutProps) => {
2929
return (
3030
<main className="col-span-3 flex flex-col gap-4">
3131
<div className="w-full">
@@ -36,23 +36,19 @@ export const EditStudentGradeLayout = ({
3636
<ArrowLeftIcon size={24} className="mr-2" /> Go back
3737
</Link>
3838
</div>
39-
<div className="grid w-full gap-8 md:grid-cols-5">
40-
<div className="md:col-span-3">
41-
<HighlightableRubric
42-
rubric={rubric}
43-
studentUUID={studentUUID!}
44-
laboratoryUUID={laboratoryUUID!}
45-
selectedCriteriaByObjective={selectedCriteriaByObjectiveMap}
46-
/>
47-
</div>
48-
<div className="-order-1 md:order-1 md:col-span-2">
49-
<GradingSidebar
50-
laboratoryUUID={laboratoryUUID!}
51-
studentUUID={studentUUID!}
52-
studentGrade={studentGrade}
53-
/>
54-
</div>
39+
<div className="max-w-[18rem]">
40+
<GradingSidebar
41+
laboratoryUUID={laboratoryUUID}
42+
studentUUID={studentUUID}
43+
studentGrade={studentGrade}
44+
/>
5545
</div>
46+
<HighlightableRubric
47+
rubric={rubric}
48+
studentUUID={studentUUID}
49+
laboratoryUUID={laboratoryUUID}
50+
selectedCriteriaByObjective={selectedCriteriaByObjectiveMap}
51+
/>
5652
</main>
5753
);
5854
};

src/screens/my-grade/components/MyGradeLayout.tsx

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type myGradeLayoutRequiredIds = {
1313
studentUUID: string;
1414
};
1515

16-
interface myGradeLayoutProps {
16+
interface MyGradeLayoutProps {
1717
ids: myGradeLayoutRequiredIds;
1818
rubric: Rubric;
1919
studentGrade: studentGradeResponse;
@@ -25,7 +25,7 @@ export const MyGradeLayout = ({
2525
rubric,
2626
studentGrade,
2727
selectedCriteriaByObjectiveMap
28-
}: myGradeLayoutProps) => {
28+
}: MyGradeLayoutProps) => {
2929
return (
3030
<main className="col-span-3 flex flex-col gap-4">
3131
<div className="w-full">
@@ -36,20 +36,16 @@ export const MyGradeLayout = ({
3636
<ArrowLeftIcon size={24} className="mr-2" /> Go back
3737
</Link>
3838
</div>
39-
<div className="grid w-full gap-8 md:grid-cols-5">
40-
<div className="md:col-span-3">
41-
<HighlightableRubric
42-
rubric={rubric}
43-
isInteractive={false}
44-
studentUUID={studentUUID!}
45-
laboratoryUUID={laboratoryUUID!}
46-
selectedCriteriaByObjective={selectedCriteriaByObjectiveMap}
47-
/>
48-
</div>
49-
<div className="-order-1 md:order-1 md:col-span-2">
50-
<MyGradeForm studentGrade={studentGrade} />
51-
</div>
39+
<div className="max-w-[18rem]">
40+
<MyGradeForm studentGrade={studentGrade} />
5241
</div>
42+
<HighlightableRubric
43+
rubric={rubric}
44+
isInteractive={false}
45+
studentUUID={studentUUID}
46+
laboratoryUUID={laboratoryUUID}
47+
selectedCriteriaByObjective={selectedCriteriaByObjectiveMap}
48+
/>
5349
</main>
5450
);
5551
};

0 commit comments

Comments
 (0)