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.

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

Added manual task assignment #6551

Merged
merged 10 commits into from
Oct 17, 2022
Merged

Added manual task assignment #6551

merged 10 commits into from
Oct 17, 2022

Conversation

hotzenklotz
Copy link
Member

@hotzenklotz hotzenklotz commented Oct 14, 2022

Up until now task can only be assigned through the automated task distribution system. This PR adds an additional way for manually assigning tasks to user through the admin interface/task list.

URL of deployed dev instance (used for testing):

Steps to test:

  • Create a task
  • Navigate to Admin >> Tasks
  • Locate your task and Click on "Manually Assign to User" from the right-hand actions
  • Choose a user from the dropdown and click OK
  • Check either tasks list to verify the correct assignment or the user's dashboard

Issues:


@hotzenklotz hotzenklotz self-assigned this Oct 14, 2022
…ssos into assign_task

* 'assign-task-to-user' of github.com:scalableminds/webknossos:
  Allow assigning task to a user directly
@hotzenklotz
Copy link
Member Author

@fm3 If I see this correctly, then manual task assignment returns a task object with negative finished instance: finished: -1. Do you have any idea what could be causing this?

image

image

…ign_task

* 'master' of github.com:scalableminds/webknossos:
  Added more filters and sorting options to Projects list (#6550)
  fix double occurance of "ago" in VX progress times (#6535)
  Fix docs for the annotation download file format (#6546)
@hotzenklotz hotzenklotz enabled auto-merge (squash) October 14, 2022 09:03
@hotzenklotz hotzenklotz changed the title WIP: Added manual task assignment Added manual task assignment Oct 14, 2022
@hotzenklotz
Copy link
Member Author

@daniel-wer Please have a look at the frontend parts for the PR review :-)

@fm3
Copy link
Member

fm3 commented Oct 17, 2022

task object with negative finished instance: finished: -1.

Good catch! The old state was still partially used when writing the statistics json. I just pushed a fix

@fm3 fm3 requested a review from jstriebel October 17, 2022 09:49
app/controllers/TaskController.scala Show resolved Hide resolved
app/controllers/TaskController.scala Outdated Show resolved Hide resolved

val annotationId = ObjectId.generate
val now = new java.sql.Timestamp(System.currentTimeMillis)
Copy link
Contributor

Choose a reason for hiding this comment

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

If the related column is of type timestamp, we might directly use NOW() or LOCALTIMESTAMP() or sth similar, but probably doesn't matter with those queries.

@fm3 fm3 requested a review from jstriebel October 17, 2022 13:14
Copy link
Contributor

@jstriebel jstriebel left a comment

Choose a reason for hiding this comment

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

Backend LGTM, didn't test anything myself, though 👍

@hotzenklotz hotzenklotz merged commit d7c783a into master Oct 17, 2022
@hotzenklotz hotzenklotz deleted the assign_task branch October 17, 2022 13:55
@jstriebel
Copy link
Contributor

auto-merge shot too fast here, I think this still needs a frontend-review @daniel-wer. Should we revert, or simply do the review-changes separately if there are any?

Copy link
Member

@daniel-wer daniel-wer left a comment

Choose a reason for hiding this comment

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

I had a look and don't think this needs to be reverted (if it was properly tested). There is one small typo that can be fixed in another open PR, maybe.

/>
</div>
<Alert
message="Note, manual assignments will bypass the automated task distribution system and its checks for user experience, access rights and other elligibility criteria."
Copy link
Member

Choose a reason for hiding this comment

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

I cannot propose code changes, because the PR was merged already, but it should be eligibility

hotzenklotz added a commit that referenced this pull request Oct 18, 2022
…ebar_button

* 'master' of github.com:scalableminds/webknossos:
  added more usage shortcuts to status bar (#6549)
  Look up annotation dataset by tracing id instead of (broken) organizationName field (#6548)
  Add links to resource creation pages (#6513)
  Improve Zarr Import UI (and general editing of datasets) (#6485)
  Remove unused dataSetName and organizationName property of protobuf objects (#6559)
  WIP: Added manual task assignment (#6551)
  Fix zarr private links for volume tracings and some minor improvements to private links UI (#6541)
  Fix stack overflow in compactMovedNodesAndEdges (#6557)
hotzenklotz added a commit that referenced this pull request Oct 18, 2022
…ect_spinner

* 'master' of github.com:scalableminds/webknossos:
  added more usage shortcuts to status bar (#6549)
  Look up annotation dataset by tracing id instead of (broken) organizationName field (#6548)
  Add links to resource creation pages (#6513)
  Improve Zarr Import UI (and general editing of datasets) (#6485)
  Remove unused dataSetName and organizationName property of protobuf objects (#6559)
  WIP: Added manual task assignment (#6551)
  Fix zarr private links for volume tracings and some minor improvements to private links UI (#6541)
  Fix stack overflow in compactMovedNodesAndEdges (#6557)
hotzenklotz added a commit that referenced this pull request Oct 19, 2022
…ault_volume_layer

* 'master' of github.com:scalableminds/webknossos: (21 commits)
  adds ETA calculation to voxelytics tasks (#6564)
  update immutability-helper package to v3.1.1 with TS support (#6565)
  [Skeletons] Allow deletion of root group (#6553)
  fix disappearing sidebar button (#6555)
  Enable "What's new" in navbar for everybody (#6563)
  Highlight Menu in Navbar Menu (#6558)
  refactor Select loading spinner property (#6556)
  Reload histogram when reloading layer (#6537)
  added more usage shortcuts to status bar (#6549)
  Look up annotation dataset by tracing id instead of (broken) organizationName field (#6548)
  Add links to resource creation pages (#6513)
  Improve Zarr Import UI (and general editing of datasets) (#6485)
  Remove unused dataSetName and organizationName property of protobuf objects (#6559)
  WIP: Added manual task assignment (#6551)
  Fix zarr private links for volume tracings and some minor improvements to private links UI (#6541)
  Fix stack overflow in compactMovedNodesAndEdges (#6557)
  Add backspace keyboard shortcut to delete active node (#6554)
  fix scaling in new meshfile rendering (#6552)
  Added more filters and sorting options to Projects list (#6550)
  fix double occurance of "ago" in VX progress times (#6535)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow to assign a certain task to a certain user?
4 participants