Update 2 (#1029)

buihuyhoang1107 · web-flow · commit fd63748d49b3 · 2021-12-28T20:22:31.000+07:00
* Update

* Done hightlight

* Công khai tất cả buổi học

* Công khai tất cả bài tập

* Công khai tất cả tài liệu

* Công khai tất cả bài tập trắc nghiệm

* Thêm cột chưa làm/ đã làm bài tập

* hightlight bài tập chưa làm gần nhất

* Popup
diff --git a/packages/web/src/graphql/generated.tsx b/packages/web/src/graphql/generated.tsx
diff --git a/packages/web/src/modules/DetailCourse/DetailCourse.tsx b/packages/web/src/modules/DetailCourse/DetailCourse.tsx
@@ -274,7 +274,9 @@ const DetailCourse: FC<DetailCourseProps> = () => {
                 Thêm giảng viên
               </Button>
               <Popover
-                style={{ width: '89%' }}
+                style={{
+                  right: 50,
+                }}
                 id={idOpenLecturer}
                 open={openLec}
                 anchorEl={openLecturer}
@@ -348,7 +350,9 @@ const DetailCourse: FC<DetailCourseProps> = () => {
                 Thêm học viên
               </Button>
               <Popover
-                style={{ width: '89%' }}
+                style={{
+                  right: 50,
+                }}
                 id={idOpenStudent}
                 open={openStu}
                 anchorEl={openStudent}
diff --git a/packages/web/src/modules/StudyingCourse/Components/ClassworkLessons/ClassworkLessons.tsx b/packages/web/src/modules/StudyingCourse/Components/ClassworkLessons/ClassworkLessons.tsx
@@ -95,14 +95,7 @@ const ClassworkLessons: FC<ClassworkLessonsProps> = () => {
       </Grid>
     )
   }
-  // const checkTime = (time: Date) => {
-  //   const timeBefore = new Date(time)
-  //   const timeNow = new Date()
-  //   if (timeBefore < timeNow) {
-  //     return true
-  //   }
-  //   return false
-  // }
+
   return (
     <>
       <Grid container spacing={DASHBOARD_SPACING}>
diff --git a/packages/web/src/modules/StudyingCourse/Components/ListOfSubmittedAssignments/ListOfSubmittedAssignments.gql b/packages/web/src/modules/StudyingCourse/Components/ListOfSubmittedAssignments/ListOfSubmittedAssignments.gql
@@ -7,7 +7,6 @@ query ListClassworkAssignmentsByStudentIdInCourse(
       classworkAssignmentsTitle
       dueDate
       classworkSubmissionGrade
-      classworkSubmissionGrade
       classworkSubmissionUpdatedAt
       classworkSubmissionDescription
     }
diff --git a/packages/web/src/modules/StudyingCourse/Components/ListOfSubmittedAssignments/ListOfSubmittedAssignments.tsx b/packages/web/src/modules/StudyingCourse/Components/ListOfSubmittedAssignments/ListOfSubmittedAssignments.tsx
@@ -64,6 +64,34 @@ const ListOfSubmittedAssignments: FC<ListOfSubmittedAssignmentsProps> = (
       dataOfSubmitted?.listClassworkAssignmentsByStudentIdInCourse.list ?? [],
     [dataOfSubmitted?.listClassworkAssignmentsByStudentIdInCourse.list],
   )
+  const classworkSubmit: ANY[] = useMemo(
+    () =>
+      classworkOfSubmits.map((item: ANY) => {
+        const current = new Date()
+        const duaDateSubmit = new Date(item.dueDate)
+
+        if (
+          item.classworkSubmissionUpdatedAt === null &&
+          current.getMonth() === duaDateSubmit.getMonth() &&
+          current.getFullYear() === duaDateSubmit.getFullYear()
+        ) {
+          if (
+            current.getDate() === duaDateSubmit.getDate() ||
+            current.getDate() + 1 === duaDateSubmit.getDate()
+          ) {
+            return {
+              ...item,
+              isNext: true,
+            }
+          }
+        }
+        return {
+          ...item,
+          isNext: false,
+        }
+      }),
+    [classworkOfSubmits],
+  )
   const totalCount = useMemo(
     () =>
       dataOfSubmitted?.listClassworkAssignmentsByStudentIdInCourse.count ?? 0,
@@ -131,9 +159,9 @@ const ListOfSubmittedAssignments: FC<ListOfSubmittedAssignmentsProps> = (
         ]}
       >
         <CardContent>
-          {classworkOfSubmits.length ? (
+          {classworkSubmit.length ? (
             <DataTable
-              data={classworkOfSubmits}
+              data={classworkSubmit}
               rowKey="id"
               loading={loadingOfSubmitted}
               columns={[
@@ -143,15 +171,19 @@ const ListOfSubmittedAssignments: FC<ListOfSubmittedAssignmentsProps> = (
                   render: (classworkOfSubmit) => (
                     <>
                       <Link
+                        className={
+                          classworkOfSubmit.isNext ? 'title-hightlight' : ''
+                        }
                         to={buildPath(
                           STUDYING_COURSE_DETAIL_CONTENT_CLASSWORK_ASSIGNMENTS,
                           {
                             id: classworkOfSubmit.classworkAssignmentId as ANY,
                           },
                         )}
                       >
-                        <Typography variant="body1">
+                        <Typography variant="body1" fontWeight="bold">
                           {classworkOfSubmit.classworkAssignmentsTitle}
+                          {classworkOfSubmit.isNext ? ' (Bài tập cần làm)' : ''}
                         </Typography>
                       </Link>
                     </>
@@ -216,6 +248,35 @@ const ListOfSubmittedAssignments: FC<ListOfSubmittedAssignmentsProps> = (
                     </>
                   ),
                 },
+                {
+                  label: 'Trạng thái',
+                  align: 'right',
+                  skeleton: <Skeleton />,
+                  render: (classworkOfSubmit) => (
+                    <>
+                      <Typography>
+                        {classworkOfSubmit.classworkSubmissionUpdatedAt ===
+                        null ? (
+                          <>
+                            <Chip
+                              variant="outlined"
+                              color="default"
+                              label="Chưa nộp"
+                            />
+                          </>
+                        ) : (
+                          <>
+                            <Chip
+                              variant="outlined"
+                              color="primary"
+                              label="Đã nộp"
+                            />
+                          </>
+                        )}
+                      </Typography>
+                    </>
+                  ),
+                },
               ]}
               pagination={{
                 count: totalCount,
diff --git a/packages/web/src/modules/TeachingCourse/Components/ClassworkAssignments/ClassworkAssignments.gql b/packages/web/src/modules/TeachingCourse/Components/ClassworkAssignments/ClassworkAssignments.gql
@@ -1,5 +1,8 @@
 query ClassworkAssignmentList($skip: Int!, $limit: Int!, $courseId: ID!) {
-  classworkAssignments(pageOptions: { skip: $skip, limit: $limit },courseId: $courseId) {
+  classworkAssignments(
+    pageOptions: { skip: $skip, limit: $limit }
+    courseId: $courseId
+  ) {
     classworkAssignments {
       id
       orgId
@@ -14,3 +17,10 @@ query ClassworkAssignmentList($skip: Int!, $limit: Int!, $courseId: ID!) {
     count
   }
 }
+#Công khai tất cả các bài tập
+mutation PublishAllClassworkAssignmentsOfTheCourse($courseId: ID!) {
+  publishAllClassworkAssignmentsOfTheCourse(courseId: $courseId) {
+    id
+    courseId
+  }
+}
diff --git a/packages/web/src/modules/TeachingCourse/Components/ClassworkAssignments/ClassworkAssignments.tsx b/packages/web/src/modules/TeachingCourse/Components/ClassworkAssignments/ClassworkAssignments.tsx
@@ -1,8 +1,9 @@
-import { FC, useMemo } from 'react'
+import { FC, useMemo, useCallback } from 'react'
 
 import { CardContent, Grid, Skeleton, makeStyles } from '@material-ui/core'
 import PublicationChip from 'components/PublicationChip'
 import format from 'date-fns/format'
+import { useSnackbar } from 'notistack'
 import { FilePlus } from 'phosphor-react'
 import { useParams } from 'react-router-dom'
 
@@ -20,6 +21,8 @@ import {
 import {
   useCourseDetailQuery,
   useClassworkAssignmentListQuery,
+  ClassworkAssignmentListDocument,
+  usePublishAllClassworkAssignmentsOfTheCourseMutation,
 } from 'graphql/generated'
 import {
   buildPath,
@@ -57,6 +60,28 @@ const ClassworkAssignments: FC<ClassworkAssignmentsProps> = () => {
     () => dataClasswork?.classworkAssignments.count ?? 0,
     [dataClasswork?.classworkAssignments.count],
   )
+  // Công khai tất cả ----
+  const { enqueueSnackbar } = useSnackbar()
+  const [publishAll] = usePublishAllClassworkAssignmentsOfTheCourseMutation({
+    refetchQueries: [{ query: ClassworkAssignmentListDocument }],
+  })
+  const handlePublishAll = useCallback(async () => {
+    try {
+      await publishAll({
+        variables: {
+          courseId,
+        },
+      })
+      enqueueSnackbar(`Tất cả đã được công khai`, {
+        variant: 'success',
+      })
+    } catch (error) {
+      enqueueSnackbar(`Công khai thất bại`, {
+        variant: 'warning',
+      })
+    }
+  }, [courseId, publishAll, enqueueSnackbar])
+  // Công khai tất cả ----
 
   if (loadingCourse) {
     return (
@@ -87,15 +112,23 @@ const ClassworkAssignments: FC<ClassworkAssignmentsProps> = () => {
         title="Bài tập"
         gridItem={{ xs: 12 }}
         action={
-          <Button
-            className={classes.buttonTextColor}
-            startIcon={<FilePlus size={24} />}
-            link={buildPath(TEACHING_COURSE_CREATE_CLASSWORK_ASSIGNMENT, {
-              id: courseId,
-            })}
-          >
-            Thêm bài tập
-          </Button>
+          <>
+            <Button
+              onClick={handlePublishAll}
+              className={classes.buttonTextColor}
+            >
+              Công khai tất cả
+            </Button>
+            <Button
+              className={classes.buttonTextColor}
+              startIcon={<FilePlus size={24} />}
+              link={buildPath(TEACHING_COURSE_CREATE_CLASSWORK_ASSIGNMENT, {
+                id: courseId,
+              })}
+            >
+              Thêm bài tập
+            </Button>
+          </>
         }
       >
         <CardContent>
diff --git a/packages/web/src/modules/TeachingCourse/Components/ClassworkLessons/ClassworkLessions.gql b/packages/web/src/modules/TeachingCourse/Components/ClassworkLessons/ClassworkLessions.gql
@@ -88,3 +88,11 @@ mutation UpdateLesson(
     courseId
   }
 }
+
+#Công khai tất cả các buổi học
+mutation PublishAllLessonsOfTheCourse($courseId: ID!) {
+  publishAllLessonsOfTheCourse(courseId: $courseId) {
+    id
+    courseId
+  }
+}
diff --git a/packages/web/src/modules/TeachingCourse/Components/ClassworkLessons/ClassworkLessons.tsx b/packages/web/src/modules/TeachingCourse/Components/ClassworkLessons/ClassworkLessons.tsx
@@ -1,8 +1,9 @@
-import { FC, useMemo } from 'react'
+import { FC, useMemo, useCallback } from 'react'
 
 import { CardContent, Grid, Skeleton, makeStyles } from '@material-ui/core'
 import PublicationChip from 'components/PublicationChip'
 import format from 'date-fns/format'
+import { useSnackbar } from 'notistack'
 import { FilePlus } from 'phosphor-react'
 import { useParams } from 'react-router-dom'
 
@@ -23,6 +24,8 @@ import {
   Permission,
   useCourseDetailQuery,
   useListLessonsQuery,
+  usePublishAllLessonsOfTheCourseMutation,
+  ListLessonsDocument,
 } from 'graphql/generated'
 import {
   buildPath,
@@ -68,7 +71,28 @@ const ClassworkLesson: FC<ClassworkLessonProps> = () => {
     () => dataClasswork?.lessons.count ?? 0,
     [dataClasswork?.lessons.count],
   )
-
+  // Công khai tất cả ----
+  const { enqueueSnackbar } = useSnackbar()
+  const [publishAll] = usePublishAllLessonsOfTheCourseMutation({
+    refetchQueries: [{ query: ListLessonsDocument }],
+  })
+  const handlePublishAll = useCallback(async () => {
+    try {
+      await publishAll({
+        variables: {
+          courseId,
+        },
+      })
+      enqueueSnackbar(`Tất cả đã được công khai`, {
+        variant: 'success',
+      })
+    } catch (error) {
+      enqueueSnackbar(`Công khai thất bại`, {
+        variant: 'warning',
+      })
+    }
+  }, [courseId, publishAll, enqueueSnackbar])
+  // Công khai tất cả ----
   if (loadingCourse) {
     return (
       <Grid container spacing={DASHBOARD_SPACING}>
@@ -96,15 +120,23 @@ const ClassworkLesson: FC<ClassworkLessonProps> = () => {
         title="Lộ trình"
         gridItem={{ xs: 12 }}
         action={
-          <Button
-            className={classes.buttonTextColor}
-            startIcon={<FilePlus size={24} />}
-            link={buildPath(TEACHING_COURSE_CREATE_CLASSWORK_LESSON, {
-              id: courseId,
-            })}
-          >
-            Thêm buổi học
-          </Button>
+          <>
+            <Button
+              onClick={handlePublishAll}
+              className={classes.buttonTextColor}
+            >
+              Công khai tất cả
+            </Button>
+            <Button
+              className={classes.buttonTextColor}
+              startIcon={<FilePlus size={24} />}
+              link={buildPath(TEACHING_COURSE_CREATE_CLASSWORK_LESSON, {
+                id: courseId,
+              })}
+            >
+              Thêm buổi học
+            </Button>
+          </>
         }
       >
         <CardContent>
diff --git a/packages/web/src/modules/TeachingCourse/Components/ClassworkMaterials/ClassworkMaterials.gql b/packages/web/src/modules/TeachingCourse/Components/ClassworkMaterials/ClassworkMaterials.gql
@@ -148,3 +148,10 @@ mutation RemoveVideoFromClassworkMaterial(
     id
   }
 }
+#Công khai tất cả các tài liệu
+mutation PublishAllClassworkMaterialsOfTheCourse($courseId: ID!) {
+  publishAllClassworkMaterialsOfTheCourse(courseId: $courseId) {
+    id
+    courseId
+  }
+}
diff --git a/packages/web/src/modules/TeachingCourse/Components/ClassworkMaterials/ClassworkMaterials.tsx b/packages/web/src/modules/TeachingCourse/Components/ClassworkMaterials/ClassworkMaterials.tsx
diff --git a/packages/web/src/modules/TeachingCourse/Components/Quizzes/Quizzes.gql b/packages/web/src/modules/TeachingCourse/Components/Quizzes/Quizzes.gql
diff --git a/packages/web/src/modules/TeachingCourse/Components/Quizzes/Quizzes.tsx b/packages/web/src/modules/TeachingCourse/Components/Quizzes/Quizzes.tsx

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ query ListClassworkAssignmentsByStudentIdInCourse(`
`7`	`7`	`classworkAssignmentsTitle`
`8`	`8`	`dueDate`
`9`	`9`	`classworkSubmissionGrade`
`10`		`- classworkSubmissionGrade`
`11`	`10`	`classworkSubmissionUpdatedAt`
`12`	`11`	`classworkSubmissionDescription`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,3 +88,11 @@ mutation UpdateLesson(`
`88`	`88`	`courseId`
`89`	`89`	`}`
`90`	`90`	`}`
	`91`	`+`
	`92`	`+#Công khai tất cả các buổi học`
	`93`	`+mutation PublishAllLessonsOfTheCourse($courseId: ID!) {`
	`94`	`+ publishAllLessonsOfTheCourse(courseId: $courseId) {`
	`95`	`+ id`
	`96`	`+ courseId`
	`97`	`+ }`
	`98`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -148,3 +148,10 @@ mutation RemoveVideoFromClassworkMaterial(`
`148`	`148`	`id`
`149`	`149`	`}`
`150`	`150`	`}`
	`151`	`+#Công khai tất cả các tài liệu`
	`152`	`+mutation PublishAllClassworkMaterialsOfTheCourse($courseId: ID!) {`
	`153`	`+ publishAllClassworkMaterialsOfTheCourse(courseId: $courseId) {`
	`154`	`+ id`
	`155`	`+ courseId`
	`156`	`+ }`
	`157`	`+}`