Skip to content

Commit

Permalink
Remove grading summary (#2790)
Browse files Browse the repository at this point in the history 
* Remove grading summary card

* Remove grading summary component

* Refactor grading component

Move menu options outside component, preventing unnecessary object
recreations.
  • Loading branch information
@RichDom2185
RichDom2185 authored Feb 20, 2024
1 parent 9c9abdd commit 4143b87
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 190 deletions.
128 changes: 49 additions & 79 deletions src/pages/academy/grading/Grading.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import '@tremor/react/dist/esm/tremor.css';

import { Icon as BpIcon, NonIdealState, Position, Spinner, SpinnerSize } from '@blueprintjs/core';
import { IconNames } from '@blueprintjs/icons';
import { Button, Card, Col, ColGrid, Flex, Text, Title } from '@tremor/react';
import { Button, Card, Flex, Text, Title } from '@tremor/react';
import React, { useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
import { Navigate, useParams } from 'react-router';
import { fetchGradingOverviews } from 'src/commons/application/actions/SessionActions';
import { Role } from 'src/commons/application/ApplicationTypes';
import { GradingStatuses } from 'src/commons/assessment/AssessmentTypes';
import SimpleDropdown from 'src/commons/SimpleDropdown';
import { useSession } from 'src/commons/utils/Hooks';
import { numberRegExp } from 'src/features/academy/AcademyTypes';
Expand All @@ -17,39 +16,31 @@ import { exportGradingCSV, isSubmissionUngraded } from 'src/features/grading/Gra
import ContentDisplay from '../../../commons/ContentDisplay';
import { convertParamToInt } from '../../../commons/utils/ParamParseHelper';
import GradingSubmissionsTable from './subcomponents/GradingSubmissionsTable';
import GradingSummary from './subcomponents/GradingSummary';
import GradingWorkspace from './subcomponents/GradingWorkspace';

const groupOptions = [
{ value: false, label: 'my groups' },
{ value: true, label: 'all groups' }
];

const showOptions = [
{ value: false, label: 'ungraded' },
{ value: true, label: 'all' }
];

const Grading: React.FC = () => {
const {
courseId,
gradingOverviews,
role,
group,
assessmentOverviews: assessments = []
} = useSession();
const params = useParams<{
submissionId: string;
questionId: string;
}>();
const { courseId, gradingOverviews, role, group } = useSession();
const params = useParams<{ submissionId: string; questionId: string }>();

const isAdmin = role === Role.Admin;
const [showAllGroups, setShowAllGroups] = useState(isAdmin || group === null);
const groupOptions = [
{ value: false, label: 'my groups' },
{ value: true, label: 'all groups' }
];

const dispatch = useDispatch();
useEffect(() => {
dispatch(fetchGradingOverviews(!showAllGroups));
}, [dispatch, role, showAllGroups]);

const [showAllSubmissions, setShowAllSubmissions] = useState(false);
const showOptions = [
{ value: false, label: 'ungraded' },
{ value: true, label: 'all' }
];

// If submissionId or questionId is defined but not numeric, redirect back to the Grading overviews page
if (
Expand Down Expand Up @@ -88,63 +79,42 @@ const Grading: React.FC = () => {
gradingOverviews === undefined ? (
loadingDisplay
) : (
<ColGrid numColsLg={8} gapX="gap-x-4" gapY="gap-y-2">
<Col numColSpanLg={6}>
<Card>
<Flex justifyContent="justify-between">
<Flex justifyContent="justify-start" spaceX="space-x-6">
<Title>Submissions</Title>
<Button
variant="light"
size="xs"
icon={() => (
<BpIcon icon={IconNames.EXPORT} style={{ marginRight: '0.5rem' }} />
)}
onClick={() => exportGradingCSV(gradingOverviews)}
>
Export to CSV
</Button>
</Flex>
</Flex>
<Flex justifyContent="justify-start" marginTop="mt-2" spaceX="space-x-2">
<Text>Viewing</Text>
<SimpleDropdown
options={showOptions}
selectedValue={showAllSubmissions}
onClick={setShowAllSubmissions}
popoverProps={{ position: Position.BOTTOM }}
buttonProps={{ minimal: true, rightIcon: 'caret-down' }}
/>
<Text>submissions from</Text>
<SimpleDropdown
options={groupOptions}
selectedValue={showAllGroups}
onClick={setShowAllGroups}
popoverProps={{ position: Position.BOTTOM }}
buttonProps={{ minimal: true, rightIcon: 'caret-down' }}
/>
</Flex>
<GradingSubmissionsTable
submissions={submissions.filter(
s => showAllSubmissions || isSubmissionUngraded(s)
)}
/>
</Card>
</Col>

<Col numColSpanLg={2}>
<Card hFull>
<GradingSummary
// Only include submissions from the same group in the summary
submissions={submissions.filter(
({ groupName, gradingStatus }) =>
groupName === group && gradingStatus !== GradingStatuses.excluded
)}
assessments={assessments}
/>
</Card>
</Col>
</ColGrid>
<Card>
<Flex justifyContent="justify-between">
<Flex justifyContent="justify-start" spaceX="space-x-6">
<Title>Submissions</Title>
<Button
variant="light"
size="xs"
icon={() => <BpIcon icon={IconNames.EXPORT} style={{ marginRight: '0.5rem' }} />}
onClick={() => exportGradingCSV(gradingOverviews)}
>
Export to CSV
</Button>
</Flex>
</Flex>
<Flex justifyContent="justify-start" marginTop="mt-2" spaceX="space-x-2">
<Text>Viewing</Text>
<SimpleDropdown
options={showOptions}
selectedValue={showAllSubmissions}
onClick={setShowAllSubmissions}
popoverProps={{ position: Position.BOTTOM }}
buttonProps={{ minimal: true, rightIcon: 'caret-down' }}
/>
<Text>submissions from</Text>
<SimpleDropdown
options={groupOptions}
selectedValue={showAllGroups}
onClick={setShowAllGroups}
popoverProps={{ position: Position.BOTTOM }}
buttonProps={{ minimal: true, rightIcon: 'caret-down' }}
/>
</Flex>
<GradingSubmissionsTable
submissions={submissions.filter(s => showAllSubmissions || isSubmissionUngraded(s))}
/>
</Card>
)
}
fullWidth={true}
Expand Down
111 changes: 0 additions & 111 deletions src/pages/academy/grading/subcomponents/GradingSummary.tsx
View file

This file was deleted.

0 comments on commit 4143b87

Please sign in to comment.