Done tassk (#551)

Co-authored-by: Cảnh Huỳnh <61925916+canhuyh@users.noreply.github.com>
duongdev · Aug 7, 2021 · e29dba3 · e29dba3 · vercel · Aug 7, 2021
1 parent 9cabfc5
commit e29dba3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/packages/web/src/modules/ClassworkAssignmentDetail/ClassworkAssignmentDetail.tsx b/packages/web/src/modules/ClassworkAssignmentDetail/ClassworkAssignmentDetail.tsx
@@ -359,10 +359,19 @@ const ClassworkAssignmentDetail: FC<ClassworkAssignmentDetailProps> = () => {
           </SectionCard>
         </Grid>
         <SectionCard
-          maxContentHeight={false}
           gridItem={{ xs: 3 }}
-          title="Sinh viên đã nộp"
+          title="Học viên đã nộp"
           fullHeight={false}
+          action={[
+            <>
+              <InfoBlock label="Số lượng nộp:">
+                <Typography align="right">
+                  {' '}
+                  {classworkSubmissions?.length}
+                </Typography>
+              </InfoBlock>
+            </>,
+          ]}
         >
           <CardContent>
             {classworkSubmissions?.length ? (
@@ -385,6 +394,7 @@ const ClassworkAssignmentDetail: FC<ClassworkAssignmentDetailProps> = () => {
                     )}
                   >
                     <AccountDisplayName
+                      style={{ cursor: 'pointer' }}
                       accountId={classworkSubmission.createdByAccountId}
                     />
                   </Link>

diff --git a/...dules/StudyingCourse/Components/ClassworkAssignments/DetailContentClassworkAssignment.tsx b/...dules/StudyingCourse/Components/ClassworkAssignments/DetailContentClassworkAssignment.tsx
@@ -52,9 +52,10 @@ const DetailContentClassworkAssignment: FC<DetailContentClassworkAssignmentProps
 
     const classworkAssignment = useMemo(() => data?.classworkAssignment, [data])
 
-    const { data: submit } = useFindOneClassworkSubmissionQuery({
-      variables: { ClassworkAssignment: classworkAssignment?.id as ANY },
-    })
+    const { data: submit, loading: loadingSubmit } =
+      useFindOneClassworkSubmissionQuery({
+        variables: { ClassworkAssignment: classworkAssignment?.id as ANY },
+      })
 
     const classworkAssignmentSubmit = useMemo(
       () => submit?.findOneClassworkSubmission,
@@ -116,6 +117,9 @@ const DetailContentClassworkAssignment: FC<DetailContentClassworkAssignmentProps
     if (loading && !data) {
       return <PageContainerSkeleton maxWidth="md" />
     }
+    if (loadingSubmit) {
+      return <PageContainerSkeleton maxWidth="md" />
+    }
 
     if (!classworkAssignment) {
       return (