Skip to content

Commit

Permalink
Support view grade for student in space content list
Browse files Browse the repository at this point in the history
  • Loading branch information
cptrodgers committed Aug 10, 2024
1 parent 76c7aaf commit 1d13ba5
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { DataList, Text } from "@radix-ui/themes";
import { DataList, Text, Link } from "@radix-ui/themes";
import { t, Trans } from "@lingui/macro";
import React from "react";
import NextLink from "next/link";

import TestDurationAttribute from "./TestDurationAttribute";
import {
DocumentActionPermission,
DocumentVisibility,
Role,
UpdateAssignmentData,
} from "graphql/types";
import AttemptAttribute from "./AttemptAttribute";
Expand All @@ -17,6 +19,8 @@ import useDocumentStore from "store/DocumentStore";
import useUpdateDocument from "hook/UseUpdateDocument";
import VisibilityAttribute from "./VisibilityAttribute";
import TagAttribute from "./TagAttribute";
import useAuthUserStore from "store/AuthStore";
import { formatDocumentRoute } from "../../../../../../config/Routes";

export type AssignmentAttributesProps = {
data: UpdateAssignmentData;
Expand All @@ -29,6 +33,7 @@ const AssignmentAttributes = ({
onChange,
canEdit,
}: AssignmentAttributesProps) => {
const isStudent = useAuthUserStore((state) => state.role === Role.STUDENT);
const allow = usePermission();
const { orderedQuizzes } = useOrderedQuizzes();
const totalQuizAssignment = useDocumentStore(
Expand All @@ -37,6 +42,7 @@ const AssignmentAttributes = ({
const visibility = useDocumentStore(
(state) => state.activeDocument?.visibility,
);
const submissions = useDocumentStore((state) => state.submissions);
const updateDocument = useUpdateDocument();

const onChangeInnerAssignment = (
Expand All @@ -56,8 +62,32 @@ const AssignmentAttributes = ({
? orderedQuizzes.length
: totalQuizAssignment;

const lastSubmission = isStudent
? submissions.sort(
(submissionA, submissionB) =>
submissionB.attemptNumber - submissionA.attemptNumber,
)[0]
: undefined;

return (
<DataList.Root>
{isStudent && lastSubmission && (
<DataList.Item>
<DataList.Label minWidth="88px" color="indigo">
<Trans>Your Grade</Trans>
</DataList.Label>
<DataList.Value>
<NextLink
href={formatDocumentRoute(lastSubmission.documentId)}
passHref
>
<Link weight="bold" color="indigo" target="_blank">
{(lastSubmission.finalGrade || 0).toFixed(2)}
</Link>
</NextLink>
</DataList.Value>
</DataList.Item>
)}
<DataList.Item align="center">
<DataList.Label minWidth="88px">Test Duration</DataList.Label>
<DataList.Value>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import { Trans } from "@lingui/macro";
import styled from "styled-components";
import { Button, Heading, Separator } from "@radix-ui/themes";
import { Pencil2Icon } from "@radix-ui/react-icons";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,18 @@ const LessonItemRightInformation = (props: LessonItemRightInformationProps) => {
}

const totalAttempt = props.item?.assignment?.submissions?.length || 0;
const lastSubmission = (props.item?.assignment?.submissions || []).sort(
(a, b) => b.attemptNumber - a.attemptNumber,
)[0];
return (
<div style={{ paddingRight: 10 }}>
<div
style={{
paddingRight: 10,
display: "flex",
gap: 4,
alignItems: "center",
}}
>
{props.item.tags.map((tag) => (
<Badge key={tag.tag} color="gold" style={{ marginRight: 4 }}>
{tag.tag}
Expand All @@ -53,6 +63,15 @@ const LessonItemRightInformation = (props: LessonItemRightInformationProps) => {
</Text>
</Badge>
)}
{lastSubmission && (
<>
<Separator orientation="vertical" />
<Text color={"gray"}>
<Trans>Score:</Trans>
</Text>
<Text weight="medium">{lastSubmission.finalGrade?.toFixed(2)}</Text>
</>
)}
</div>
);
};
Expand Down
2 changes: 1 addition & 1 deletion apps/ikigai/locales/en/messages.js

Large diffs are not rendered by default.

36 changes: 22 additions & 14 deletions apps/ikigai/locales/en/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgstr "{0} focus mode"
msgid "{0} students"
msgstr "{0} students"

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:83
#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:102
msgid "{0} students do assignments"
msgstr "{0} students do assignments"

Expand All @@ -45,7 +45,7 @@ msgstr "{contentLength}B"
msgid "{spaceName} Settings"
msgstr "{spaceName} Settings"

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:41
#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:51
msgid "{totalAttempt} attempts"
msgstr "{totalAttempt} attempts"

Expand All @@ -61,7 +61,7 @@ msgstr "<0>{0}%</0> of grade"
msgid "🪄Generate Quiz by Ikigai AI🪄"
msgstr "🪄Generate Quiz by Ikigai AI🪄"

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:110
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:140
msgid "Access visibility"
msgstr "Access visibility"

Expand All @@ -71,7 +71,7 @@ msgstr "Access visibility"
#~ msgstr "Add content"

#: components/Document/DocumentBody/CoverPage/FolderCoverPageBody.tsx:49
#: components/Document/LeftSide/LeftSecondarySide/SpaceDocumentList.tsx:39
#: components/Document/LeftSide/LeftSecondarySide/SpaceDocumentList.tsx:38
msgid "Add Content"
msgstr "Add Content"

Expand Down Expand Up @@ -129,7 +129,7 @@ msgid "Are you sure? This rubric will no longer be accessible."
msgstr "Are you sure? This rubric will no longer be accessible."

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssigneesAttribute.tsx:128
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:124
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:154
msgid "Assign"
msgstr "Assign"

Expand All @@ -153,7 +153,7 @@ msgstr "Assigned!"
#~ msgid "Assignees"
#~ msgstr "Assignees"

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:108
#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:127
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/VisibilityAttribute.tsx:33
msgid "Assignees only"
msgstr "Assignees only"
Expand Down Expand Up @@ -246,7 +246,7 @@ msgstr "Code"
msgid "Community & Help"
msgstr "Community & Help"

#: components/Document/LeftSide/LeftSecondarySide/SpaceDocumentList.tsx:33
#: components/Document/LeftSide/LeftSecondarySide/SpaceDocumentList.tsx:32
msgid "Content"
msgstr "Content"

Expand Down Expand Up @@ -751,7 +751,7 @@ msgstr "No grade"
#~ msgid "No Grade"
#~ msgstr "No Grade"

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:52
#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:62
msgid "Not attempted"
msgstr "Not attempted"

Expand Down Expand Up @@ -826,7 +826,7 @@ msgstr "Powered by ikigai"
msgid "Privacy Policy"
msgstr "Privacy Policy"

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:102
#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:121
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/VisibilityAttribute.tsx:30
msgid "Private"
msgstr "Private"
Expand All @@ -839,7 +839,7 @@ msgstr "Private"
msgid "Profile"
msgstr "Profile"

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:114
#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:133
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/VisibilityAttribute.tsx:27
msgid "Public"
msgstr "Public"
Expand All @@ -848,19 +848,19 @@ msgstr "Public"
msgid "Question"
msgstr "Question"

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:103
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:133
msgid "quiz"
msgstr "quiz"

#: components/Document/DocumentBody/ContentPage/ContentToolbar.tsx:573
msgid "Quiz Generator (AI)"
msgstr "Quiz Generator (AI)"

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:103
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:133
msgid "quizzes"
msgstr "quizzes"

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:99
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:129
msgid "Quizzes"
msgstr "Quizzes"

Expand Down Expand Up @@ -969,6 +969,10 @@ msgstr "Saved!"
msgid "Saving..."
msgstr "Saving..."

#: components/common/LearningModuleDnd/LessonItemRightInformation.tsx:70
msgid "Score:"
msgstr "Score:"

#: components/QuizGenerator/ReviewGeneratedQuizzes.tsx:40
msgid "Select all"
msgstr "Select all"
Expand Down Expand Up @@ -1121,7 +1125,7 @@ msgstr "Successfully!"
#~ msgid "Switch"
#~ msgstr "Switch"

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:133
#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:163
msgid "Tags"
msgstr "Tags"

Expand Down Expand Up @@ -1439,6 +1443,10 @@ msgstr "You've joined. We've sent a magic email to <0>{email}</0>. Open the link
msgid "You've reached maximum usage of Ikigai AI today (max {maxAiUsage} requests per day)."
msgstr "You've reached maximum usage of Ikigai AI today (max {maxAiUsage} requests per day)."

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/AssignmentAttributes.tsx:77
msgid "Your Grade"
msgstr "Your Grade"

#: components/Document/DocumentBody/CoverPage/AssignmentCoverPageBody/GeneralInformation/StudentGeneralInformation.tsx:93
#~ msgid "Your Grade:"
#~ msgstr "Your Grade:"
Expand Down

0 comments on commit 1d13ba5

Please sign in to comment.