-
-
Notifications
You must be signed in to change notification settings - Fork 221
feat: add button 'Done Task' for auto-task #2813
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
aliakseitokarev
wants to merge
5
commits into
master
Choose a base branch
from
feat/add-auto-task-done-button
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5f552c1
feat: add UI button 'Done Task'
aliakseitokarev abe8b63
Merge branch 'master' into feat/add-auto-task-done-button
AlreadyBored 3e1580a
Merge branch 'master' into feat/add-auto-task-done-button
AlreadyBored 8def530
Merge branch 'master' into feat/add-auto-task-done-button
AlreadyBored 7a8cc67
Merge branch 'master' into feat/add-auto-task-done-button
AlreadyBored File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { Button, Card, Col, Divider, Row, Tag, Typography } from 'antd'; | ||
| import { Button, Card, Col, Divider, Row, Tag, Tooltip, Typography } from 'antd'; | ||
| import Link from 'next/link'; | ||
| import { getAutoTestTaskRoute } from 'services/routes'; | ||
| import { TaskCardColumn, TaskDeadlineDate } from '..'; | ||
|
|
@@ -11,6 +11,7 @@ const { Title, Paragraph } = Typography; | |
| export interface TaskCardProps { | ||
| courseTask: CourseTaskVerifications; | ||
| course: Course; | ||
| isAvailableTab: boolean; | ||
| } | ||
|
|
||
| function getStatusTag(state: CourseTaskState) { | ||
|
|
@@ -24,11 +25,14 @@ function getStatusTag(state: CourseTaskState) { | |
| } | ||
| } | ||
|
|
||
| function TaskCard({ courseTask, course }: TaskCardProps) { | ||
| const { id, name, studentStartDate, studentEndDate, verifications, state, descriptionUrl } = courseTask; | ||
| function TaskCard({ courseTask, course, isAvailableTab }: TaskCardProps) { | ||
| const { id, name, studentStartDate, studentEndDate, verifications, state, descriptionUrl, publicAttributes } = | ||
| courseTask; | ||
| const { attemptsCount, explanation } = useAttemptsMessage(courseTask); | ||
|
|
||
| const score = verifications?.[0]?.score ?? null; | ||
| const isMinimumScoreDone = score >= publicAttributes.tresholdPercentage; | ||
| console.log(isMinimumScoreDone); | ||
|
|
||
| const columns = [ | ||
| { | ||
|
|
@@ -77,10 +81,17 @@ function TaskCard({ courseTask, course }: TaskCardProps) { | |
| {explanation} | ||
| </Paragraph> | ||
| </Col> | ||
| <Col span={24}> | ||
| <Col span={24} style={{ display: 'flex', justifyContent: 'space-between' }}> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will |
||
| <Link href={getAutoTestTaskRoute(course.alias, id)} legacyBehavior> | ||
| <Button type="primary">Open Task</Button> | ||
| </Link> | ||
| {!isAvailableTab && ( | ||
| <Tooltip title="move to the 'Done' tab"> | ||
| <Button type="primary" onClick={() => console.log('moveToDone')} disabled={!isMinimumScoreDone}> | ||
| Done Task | ||
| </Button> | ||
| </Tooltip> | ||
| )} | ||
| </Col> | ||
| </Row> | ||
| <Divider /> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ function AutoTests() { | |
| const [activeTab, setActiveTab] = useState(CourseTaskStatus.Available); | ||
| const statuses = useMemo(() => tasks?.map(t => t.status) || [], [tasks]); | ||
| const filteredTasks = useMemo(() => tasks?.filter(t => t.status === activeTab) || [], [tasks, activeTab]); | ||
| const isAvailableTab = activeTab === CourseTaskStatus.Available ? false : true; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this naming is confusing, isAvailableTab = true when active tab != "Available" |
||
|
|
||
| return ( | ||
| <PageLayout loading={false} title="Auto-tests" withMargin={false} showCourseName> | ||
|
|
@@ -32,7 +33,7 @@ function AutoTests() { | |
| <Row gutter={[24, 24]} style={{ padding: '0 16px', marginRight: 0 }}> | ||
| {filteredTasks.map(courseTask => ( | ||
| <Col {...RESPONSIVE_COLUMNS} key={courseTask.id}> | ||
| <TaskCard courseTask={courseTask} course={course} /> | ||
| <TaskCard courseTask={courseTask} course={course} isAvailableTab={isAvailableTab} /> | ||
| </Col> | ||
| ))} | ||
| </Row> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove this