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

Treat cancelled tasks as completed #1553

Merged
merged 6 commits into from
May 11, 2021
Merged

Conversation

raimund-schluessler
Copy link
Member

@raimund-schluessler raimund-schluessler commented May 3, 2021

With this PR we treat cancelled tasks as completed, so they don't show up as still to do. This resolves #1060.

This PR supersedes #1418.

Todo:

  • Indicate canelled tasks (we show a cancelled icon in the checkbox)
  • Also cancel not completed sub-tasks when cancelling a task
  • Treat cancelled sub-tasks as completed in task list
  • Add test functions for new behaviour

@codecov
Copy link

codecov bot commented May 3, 2021

Codecov Report

Merging #1553 (6adab23) into master (1a0090a) will increase coverage by 0.01%.
The diff coverage is 41.66%.

@@            Coverage Diff             @@
##           master    #1553      +/-   ##
==========================================
+ Coverage   32.32%   32.33%   +0.01%     
==========================================
  Files          55       55              
  Lines        2803     2814      +11     
  Branches      528      532       +4     
==========================================
+ Hits          906      910       +4     
- Misses       1758     1762       +4     
- Partials      139      142       +3     

@raimund-schluessler
Copy link
Member Author

@dargmuesli I packed a release, so you can test the changes. Please test it well and make sure everything makes sense and is consistent.

tasks.tar.gz

@dargmuesli
Copy link
Contributor

I manually installed the .tar.gz file and reloaded the page. Now cancelled tasks aren't shown in All and Current lists, but under Completed. I've created a test task and a subtask under it. After cancelling the parent tasks, both tasks show up under Completed. Nice!

dargmuesli and others added 4 commits May 10, 2021 22:26
Resolves #1060.

Signed-off-by: Jonas Thelemann <e-mail@jonas-thelemann.de>
Signed-off-by: Jonas Thelemann <e-mail@jonas-thelemann.de>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
@raimund-schluessler raimund-schluessler marked this pull request as ready for review May 11, 2021 13:52
@raimund-schluessler raimund-schluessler merged commit e553cf9 into master May 11, 2021
@delete-merged-branch delete-merged-branch bot deleted the fix/1040/canceled branch May 11, 2021 13:53
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.

hide 'cancelled' statuses
2 participants