Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cvat-core/src/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: MIT

(() => {
const store = require('store');
const PluginRegistry = require('./plugins');
const loggerStorage = require('./logger-storage');
const serverProxy = require('./server-proxy');
Expand Down Expand Up @@ -932,6 +931,7 @@
const data = {
id: undefined,
name: undefined,
description: undefined,
project_id: undefined,
status: undefined,
size: undefined,
Expand Down Expand Up @@ -1039,6 +1039,16 @@
data.name = value;
},
},
/**
* @name description
* @type {string}
* @memberof module:API.cvat.classes.Task
* @instance
* @throws {module:API.cvat.exceptions.ArgumentError}
*/
description: {
get: () => data.description,
},
/**
* @name projectId
* @type {integer|null}
Expand Down
22 changes: 21 additions & 1 deletion cvat-ui/src/components/task-page/details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import Text from 'antd/lib/typography/Text';
import Title from 'antd/lib/typography/Title';
import moment from 'moment';

import Descriptions from 'antd/lib/descriptions';
import getCore from 'cvat-core-wrapper';
import { getReposData, syncRepos } from 'utils/git-utils';
import { ActiveInference } from 'reducers/interfaces';
import AutomaticAnnotationProgress from 'components/tasks-page/automatic-annotation-progress';
import Descriptions from 'antd/lib/descriptions';
import UserSelector, { User } from './user-selector';
import BugTrackerEditor from './bug-tracker-editor';
import LabelsEditorComponent from '../labels-editor/labels-editor';
Expand Down Expand Up @@ -323,6 +323,21 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
);
}

private renderTaskDescription(): JSX.Element {
const { taskInstance } = this.props;
const description = taskInstance.description ?
taskInstance.description :
'Customer did not provide a task description.';

return (
<Descriptions className='cvat-task-parameters-task-description' bordered layout='vertical' size='small'>
<Descriptions.Item label='Task description' style={{ overflow: 'auto', whiteSpace: 'pre-line' }}>
{description}
</Descriptions.Item>
</Descriptions>
);
}

public render(): JSX.Element {
const {
activeInference, cancelAutoAnnotation, taskInstance, onTaskUpdate,
Expand Down Expand Up @@ -366,6 +381,11 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
{taskInstance.projectId && this.renderSubsetField()}
</Col>
</Row>
<Row justify='center' align='bottom' style={{ marginTop: 16 }}>
<Col span={24} className='cvat-task-details-task-description'>
{this.renderTaskDescription()}
</Col>
</Row>
</div>
);
}
Expand Down
18 changes: 18 additions & 0 deletions cvat/apps/engine/migrations/0044_task_description.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.13 on 2021-10-18 09:09

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('engine', '0043_task_address'),
]

operations = [
migrations.AddField(
model_name='task',
name='description',
field=models.TextField(blank=True),
),
]
1 change: 1 addition & 0 deletions cvat/apps/engine/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ class Task(models.Model):
null=True, blank=True, related_name="tasks",
related_query_name="task")
name = SafeCharField(max_length=256)
description = models.TextField(blank=True)
address = models.CharField(max_length=44, default='')
mode = models.CharField(max_length=32)
owner = models.ForeignKey(User, null=True, blank=True,
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/engine/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ class TaskSerializer(WriteOnceMixin, serializers.ModelSerializer):

class Meta:
model = models.Task
fields = ('url', 'id', 'name', 'address', 'project_id', 'mode', 'owner', 'assignee', 'owner_id', 'assignee_id',
fields = ('url', 'id', 'name', 'description', 'address', 'project_id', 'mode', 'owner', 'assignee', 'owner_id', 'assignee_id',
'bug_tracker', 'created_date', 'updated_date', 'overlap',
'segment_size', 'status', 'labels', 'segments',
'data_chunk_size', 'data_compressed_chunk_type', 'data_original_chunk_type', 'size', 'image_quality',
Expand Down