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

Jump to bottom

Undo finish task #4415

Merged
merged 17 commits into from
Feb 27, 2020
Merged

Undo finish task #4415

merged 17 commits into from
Feb 27, 2020

Conversation

youri-k
Copy link
Contributor

@youri-k youri-k commented Jan 23, 2020 •
edited
Loading

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • press Finish and Get Next Task
  • Red Undo Finish should appear
  • Undo should be possible

Issues:

@youri-k youri-k self-assigned this Jan 23, 2020
philippotto
philippotto reviewed Jan 23, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

Awesome stuff! See my few comments :)

app/controllers/AnnotationController.scala Outdated Show resolved Hide resolved
conf/messages Outdated Show resolved Hide resolved
frontend/javascripts/oxalis/view/action-bar/tracing_actions_view.js Outdated Show resolved Hide resolved
frontend/javascripts/oxalis/view/action-bar/tracing_actions_view.js Outdated Show resolved Hide resolved
fm3
fm3 reviewed Jan 23, 2020
View reviewed changes
Copy link
Member

@fm3 fm3 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, not sure what happened to the snapshots. I made a suggestion on the config block. Also, how do you feel about an indicator on the button showing the 30s counting down? Not super important, though

...ascripts/test/snapshots/public/test-bundle/test/backend-snapshot-tests/annotations.e2e.js.md Show resolved Hide resolved
frontend/javascripts/oxalis/view/action-bar/tracing_actions_view.js Outdated Show resolved Hide resolved
@youri-k
Copy link
Contributor Author

youri-k commented Jan 31, 2020

@fm3 @philippotto could you review this again 🙂

philippotto
philippotto reviewed Jan 31, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

Overall looks good 👍 However, I left a comment about the timeout code. Will accept after that's done :)

conf/application.conf Outdated Show resolved Hide resolved
frontend/javascripts/oxalis/view/action-bar/tracing_actions_view.js Outdated Show resolved Hide resolved
fm3
fm3 reviewed Feb 3, 2020
View reviewed changes
conf/application.conf Outdated Show resolved Hide resolved
@youri-k
Copy link
Contributor Author

youri-k commented Feb 6, 2020

@philippotto Could you review it again?

philippotto
philippotto approved these changes Feb 6, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

Great 👍

@youri-k youri-k merged commit ea1b095 into master Feb 27, 2020
@fm3 fm3 deleted the undo-finish-annotation branch March 20, 2020 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fm3 fm3 fm3 left review comments

@philippotto philippotto philippotto approved these changes

@daniel-wer daniel-wer Awaiting requested review from daniel-wer

Assignees

@youri-k youri-k

Labels
backend frontend
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Undo "Finish and Get Next Task"
3 participants
@youri-k @fm3 @philippotto