Skip to content
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.

Sign up for GitHub

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

Finished Tasks sorting and UI rework #3202

Merged
merged 6 commits into from
Sep 13, 2018
Merged

Finished Tasks sorting and UI rework #3202

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a072a8
reduced details in finished tasks list and sorted it by last modifica…
MichaelBuessemeyer Sep 12, 2018
8d48342
added changelog entry
MichaelBuessemeyer Sep 12, 2018
d7f41da
Merge branch 'master' into dashboard-task-list-ui-and-sorting
daniel-wer Sep 12, 2018
8e76702
applied pr feedback
MichaelBuessemeyer Sep 12, 2018
33427a3
Merge branch 'master' into dashboard-task-list-ui-and-sorting
MichaelBuessemeyer Sep 12, 2018
885ee30
Merge branch 'master' into dashboard-task-list-ui-and-sorting
MichaelBuessemeyer Sep 13, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
- Renamed "Soma Clicking" to "Single-Node-Tree Mode". [#3141](https://github.com/scalableminds/webknossos/pull/3141/files)
- The fallback segmentation layer attribute of volume tracings is now persisted to NML/ZIP files. Upon re-upload, only volume tracings with this attribute will show a fallback layer. Use `tools/volumeAddFallbackLayer.py` to add this attribute to existing volume tracings. [#3088](https://github.com/scalableminds/webknossos/pull/3088)
- When splitting a tree, the split part that contains the initial node will now keep the original tree name and id. [#3145](https://github.com/scalableminds/webknossos/pull/3145)
- Finished tasks will be displayed with less details and sorted by their finishing date in the dashboard. [#3202](https://github.com/scalableminds/webknossos/pull/3202)
- The welcome header will now also show on the default page if there are no existing organisations. [#3133](https://github.com/scalableminds/webknossos/pull/3133)
- Simplified the sharing of tracings. Users can simply copy the active URL from the browser's URL bar to share a tracing (assuming the tracing is public). [#3176](https://github.com/scalableminds/webknossos/pull/3176)
- Improved general performance of the tracing view by leveraging web workers. [#3162](https://github.com/scalableminds/webknossos/pull/3162)
Expand Down
62 changes: 41 additions & 21 deletions app/assets/javascripts/dashboard/dashboard_task_list_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,11 @@ class DashboardTaskListView extends React.PureComponent<Props, State> {

renderTaskList() {
const tasks = this.getCurrentTasks().sort(
Utils.compareBy(typeHint, task => task.created, false),
Utils.compareBy(
typeHint,
task => (this.state.showFinishedTasks ? task.annotation.modified : task.created),
false,
),
);
const descriptionClassName = classNames("task-type-description", {
short: this.state.showFinishedTasks || this.props.isAdminView,
Expand All @@ -355,28 +359,44 @@ class DashboardTaskListView extends React.PureComponent<Props, State> {
</React.Fragment>
);

const TaskCard = task => (
<Card key={task.id} title={<TaskCardTitle task={task} />} style={{ margin: "10px" }}>
<Row gutter={16}>
<Col span={16}>
<div className={descriptionClassName}>
<Markdown
source={task.type.description}
options={{ html: false, breaks: true, linkify: true }}
/>
</div>
</Col>
<Col span={8}>
<p style={{ marginBottom: 14 }}>
const TaskCard = task =>
this.state.showFinishedTasks ? (
<Card key={task.id} style={{ margin: "10px" }}>
<Row gutter={16}>
<Col span={7}>
<b>Task ID:</b> {task.id}
<br />
</Col>
<Col span={7}>
<b>Project:</b> {task.projectName}
</p>
{this.renderActions(task)}
</Col>
</Row>
</Card>
);
</Col>
<Col span={7}>
<b>Task Finished:</b> <FormattedDate timestamp={task.annotation.modified} />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say you can drop the word task here.

</Col>
<Col span={3}>{this.renderActions(task)}</Col>
</Row>
</Card>
) : (
<Card key={task.id} title={<TaskCardTitle task={task} />} style={{ margin: "10px" }}>
<Row gutter={16}>
<Col span={16}>
<div className={descriptionClassName}>
<Markdown
source={task.type.description}
options={{ html: false, breaks: true, linkify: true }}
/>
</div>
</Col>
<Col span={8}>
<p style={{ marginBottom: 14 }}>
<b>Task ID:</b> {task.id}
<br />
<b>Project:</b> {task.projectName}
</p>
{this.renderActions(task)}
</Col>
</Row>
</Card>
);

return (
<List
Expand Down