fix: Update variable name in StudentStatsCard and StudentStatsModal c…

…omponents
rolling-scopes · Sep 15, 2024 · 793465d · 793465d
1 parent 650eef1
commit 793465d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/client/src/components/Profile/__test__/StudentStatsCard.test.tsx b/client/src/components/Profile/__test__/StudentStatsCard.test.tsx
@@ -26,7 +26,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 1',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 120,
           comment: 'test',
         },
@@ -35,7 +35,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 2',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 20,
           comment: 'test',
         },
@@ -44,7 +44,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 3',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 90,
           comment: 'test',
         },
@@ -70,7 +70,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 1',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 20,
           comment: 'test',
         },
@@ -79,7 +79,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 2',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: null,
           comment: null,
         },
@@ -88,7 +88,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 3',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 10,
           comment: 'test',
         },
@@ -97,7 +97,7 @@ describe('StudentStatsCard', () => {
           scoreWeight: 1,
           name: 'Task 4',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: null,
           comment: null,
         },

diff --git a/client/src/components/Profile/__test__/StudentStatsModal.test.tsx b/client/src/components/Profile/__test__/StudentStatsModal.test.tsx
@@ -27,7 +27,7 @@ describe('StudentStatsModal', () => {
           scoreWeight: 1,
           name: 'Task 1',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 120,
           comment: 'test',
         },
@@ -36,7 +36,7 @@ describe('StudentStatsModal', () => {
           scoreWeight: 1,
           name: 'Task 2',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 20,
           comment: 'test',
         },
@@ -45,7 +45,7 @@ describe('StudentStatsModal', () => {
           scoreWeight: 1,
           name: 'Task 3',
           descriptionUri: 'https://description.com',
-          taskGithubPrUris: 'https://description.com',
+          githubPrUri: 'https://description.com',
           score: 90,
           comment: 'test',
         },

diff --git a/client/src/modules/StudentDashboard/components/TasksStatsModal.tsx b/client/src/modules/StudentDashboard/components/TasksStatsModal.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Modal, Table, Typography } from 'antd';
 import { dateTimeRenderer, dateRenderer } from 'components/Table';
 import { TaskStat } from './TasksStatsCard';
@@ -14,26 +13,25 @@ type Props = {
 };
 
 export function TasksStatsModal(props: Props) {
-  const { tableName, tasks, courseName } = props;
-  const courseTasks = tasks.map((task, idx) => ({ key: `student-stats-modal-task-${idx}`, ...task }));
+  const { tableName, tasks, courseName, isVisible, onHide } = props;
   const columnWidth = 150;
   // where 500 is approximate sum of columns
   const tableWidth = 2 * columnWidth + 500;
 
   return (
     <Modal
       title={`${courseName} statistics`}
-      open={props.isVisible}
-      onCancel={props.onHide}
+      open={isVisible}
+      onCancel={onHide}
       footer={null}
       width={'90%'}
       style={{ top: 30 }}
     >
       <p style={{ textAlign: 'center', fontWeight: 700 }}>{tableName.toUpperCase()}</p>
       <Table
-        dataSource={courseTasks}
+        dataSource={tasks}
         size="small"
-        rowKey="key"
+        rowKey="id"
         scroll={{ x: tableWidth, y: 'calc(100vh - 250px)' }}
         pagination={false}
         columns={[
@@ -52,7 +50,7 @@ export function TasksStatsModal(props: Props) {
           },
           {
             title: 'Score / Max',
-            width: 70,
+            width: 120,
             dataIndex: 'score',
             render: (score: string, { maxScore }: any) => (
               <>
@@ -61,12 +59,12 @@ export function TasksStatsModal(props: Props) {
             ),
           },
           {
-            title: '*Weight',
-            width: 70,
+            title: 'Weight',
+            width: 140,
             dataIndex: 'scoreWeight',
             render: (scoreWeight: number, { score }: any) => (
               <Text>
-                *{scoreWeight}
+                {Number(score)} * {scoreWeight}
                 {score ? (
                   <Text>
                     {' '}
@@ -79,13 +77,13 @@ export function TasksStatsModal(props: Props) {
             ),
           },
           {
-            title: '*Start date',
+            title: 'Start date',
             width: 140,
             dataIndex: 'startDate',
             render: (startDate: string) => <Text>{dateRenderer(startDate)}</Text>,
           },
           {
-            title: '*Deadline',
+            title: 'Deadline',
             width: 140,
             dataIndex: 'endDate',
             render: (endDate: string) => <Text>{dateTimeRenderer(endDate)}</Text>,
@@ -96,10 +94,11 @@ export function TasksStatsModal(props: Props) {
             ellipsis: false,
           },
           {
-            title: 'Github PR Uri',
+            title: 'Github PR Url',
             dataIndex: 'githubPrUri',
             render: (uri: string) => (uri ? <a href={uri}>PR</a> : uri),
             ellipsis: true,
+            width: 120,
           },
         ]}
       />

diff --git a/client/src/pages/course/student/dashboard.tsx b/client/src/pages/course/student/dashboard.tsx
@@ -98,9 +98,10 @@ function Page() {
             scheduleItems
               .filter(scheduleItem => scheduleItem.type === CourseScheduleItemDtoTypeEnum.CourseTask)
               .map(task => {
-                const { comment, taskGithubPrUris } =
+                const { comment, githubPrUri } =
                   tasksDetailCurrentCourse.find(taskDetail => taskDetail.name === task.name) ?? {};
-                return { ...task, comment, githubPrUri: taskGithubPrUris };
+
+                return { ...task, comment, githubPrUri };
               }),
             'status',
           ),

diff --git a/common/models/profile.ts b/common/models/profile.ts
@@ -103,7 +103,7 @@ export interface StudentTasksDetail {
   scoreWeight: number;
   name: string;
   descriptionUri: string;
-  taskGithubPrUris: string;
+  githubPrUri: string;
   score: number;
   comment: string;
   interviewDate?: string;