diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 0f887879959..8f3ff8ab388 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -23,6 +23,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released ### Changed - Redesigned the info tab in the right-hand sidebar to be fit the new branding and design language. [#7110](https://github.com/scalableminds/webknossos/pull/7110) - Optimized processing of parallel requests (new thread pool configuration, asynchronous FossilDB client), improving performance and reducing idle waiting. [#7139](https://github.com/scalableminds/webknossos/pull/7139) +- Renamed "open" tasks to "pending" and slightly redesigned the available task assignment view for clarity. [#7187](https://github.com/scalableminds/webknossos/pull/7187) ### Fixed - Fixed rare rendering bug at viewport edge for anisotropic datasets. [#7163](https://github.com/scalableminds/webknossos/pull/7163) diff --git a/frontend/javascripts/admin/project/project_list_view.tsx b/frontend/javascripts/admin/project/project_list_view.tsx index bcc8e6d3771..62c26058a3e 100644 --- a/frontend/javascripts/admin/project/project_list_view.tsx +++ b/frontend/javascripts/admin/project/project_list_view.tsx @@ -305,7 +305,7 @@ class ProjectListView extends React.PureComponent { width={250} /> project.numberOfOpenAssignments)} diff --git a/frontend/javascripts/admin/project/transfer_all_tasks_modal.tsx b/frontend/javascripts/admin/project/transfer_all_tasks_modal.tsx index 8d9811a90d2..bae6aab52e6 100644 --- a/frontend/javascripts/admin/project/transfer_all_tasks_modal.tsx +++ b/frontend/javascripts/admin/project/transfer_all_tasks_modal.tsx @@ -134,7 +134,7 @@ class TransferAllTasksModal extends React.PureComponent { ); } else { - const title = `All users with open tasks of ${project.name}`; + const title = `All users with active tasks for ${project.name}`; return ( { render() { return (
-

Open Tasks

- +

Available Task Assignments

+ + Select a team to show an overview of its users and the number of available task assigments + they qualify for. Task availability for each user is determined by assigned experiences, + team memberships, the number of pending task instances, etc. For tasks with multiple + instances, each user will get at most one. Note that individual tasks may be listed as + available to multiple users here, but each will only be handed to the first user to + request it. + + + + + + this.fetchData(team.id)} /> @@ -75,21 +93,36 @@ class OpenTasksReportView extends React.PureComponent<{}, State> { width={200} /> task.totalAssignments)} width={150} /> - // @ts-expect-error ts-migrate(2571) FIXME: Object is of type 'unknown'. - Object.keys(item.assignmentsByProjects) - // @ts-expect-error ts-migrate(2571) FIXME: Object is of type 'unknown'. - .map((key) => `${key} (${item.assignmentsByProjects[key]})`) - .join(", ") + render={(_text, item: APIOpenTasksReport) => + Object.keys(item.assignmentsByProjects).map((key) => { + const [projectName, experience] = key.split("/"); + return ( +
+ + There are potentially {item.assignmentsByProjects[key]} tasks from the + project {projectName} available for automatic assignment for this + user because they match the configured assignment criteria; especially + the required experience level {experience}. + + } + > + {projectName}: {item.assignmentsByProjects[key]} + + {experience} +
+ ); + }) } /> diff --git a/frontend/javascripts/admin/statistic/project_progress_report_view.tsx b/frontend/javascripts/admin/statistic/project_progress_report_view.tsx index 4be13c4546a..3599401a466 100644 --- a/frontend/javascripts/admin/statistic/project_progress_report_view.tsx +++ b/frontend/javascripts/admin/statistic/project_progress_report_view.tsx @@ -238,7 +238,7 @@ class ProjectProgressReportView extends React.PureComponent<{}, State> { { key="status" render={(status, task: APITask) => (
- + {status.open} diff --git a/frontend/javascripts/navbar.tsx b/frontend/javascripts/navbar.tsx index 1ab4a0cab69..fca8370a59e 100644 --- a/frontend/javascripts/navbar.tsx +++ b/frontend/javascripts/navbar.tsx @@ -279,7 +279,7 @@ function getStatisticsSubMenu(collapse: boolean): SubMenuType { key: "/reports/openTasks", label: ( - Open Tasks + Available Task Assignments ), },