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
Properly show all tasks matching a collection #431
Conversation
Do you have screenshots of a scenario? That would be much appreciated to illustrate the issue & solution. :) |
One more question would be now, what the counter in the app-sidebar shows. It could show |
I would say (if I got this right), for the task 5, always show the full task tree if it leads to a starred task. |
That would be an option as well. |
Hmm, so when you favorited a child task at the 3rd level deep, why not just show only that? That would simplify the whole structure a lot and not make the tree structure necessary. Viewing favorites is about focusing, and the structure might detract. Otherwise we can do it like you and @skjnldsv proposed – show the structure for reference, but leave out siblings which are not favorited. |
I think not showing the full tree might be confusing. You expect a subtask to be shown as a subtask. I will implement it as @skjnldsv proposed it. Show the tree if it leads to a starred subtask. I will then show the number of other (not shown) subtasks as a number with a tooltip. When you open the details of this task showing all subtasks then might be good as well. |
7e4694a
to
9ae2212
Compare
9ae2212
to
6ece2b8
Compare
6ece2b8
to
366454b
Compare
366454b
to
1dcd621
Compare
Codecov Report
@@ Coverage Diff @@
## master #431 +/- ##
===========================================
+ Coverage 11.13% 26.46% +15.32%
===========================================
Files 44 44
Lines 2047 2086 +39
Branches 367 386 +19
===========================================
+ Hits 228 552 +324
+ Misses 1685 1417 -268
+ Partials 134 117 -17 |
d99dde8
to
2c2a3c8
Compare
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Only show subtasks in a collection when they or a descendant task match the collection Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Not only root tasks 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> 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>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
285aaac
to
a80b78d
Compare
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>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Now that it can happen that a task is shown multiple times in the week view (e.g. a task a two subtasks due today and tomorrow) a task should only be shown as active if it is the very exact task.
|
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>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
@skjnldsv @jancborchardt This was quite a bit of work, but I think it is finally done. With this PR all tasks (including subtasks) are shown if they match a collection. We show the full tree for subtasks matching the collection, but don't show siblings which don't match. When a task is open in the details view, all its subtasks are shown. For the starred view this looks like this. Task which is not matching the collection is open (showing all its subtasks): Subtask which doesn't match the collection is open (still showing full tree to this subtask): I also added a lot of tests to check for the correct behaviour of the collections. What is still left to be done is to indicate which task exactly matches a collection and which one is only shown because a subtask matches. I would like to do this in a follow up PR, because this one is already quite huge. |
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
@@ -35,7 +35,18 @@ const routes = [ | |||
// reliably with router-link due to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the router file is usually located into /src/router/index.js
;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't seem so usual to me 😉
https://github.com/nextcloud/calendar/blob/master/src/router.js
https://github.com/nextcloud/notes/blob/master/src/router.js
https://github.com/nextcloud/bookmarks/blob/master/src/router.js
https://github.com/nextcloud/forms/blob/master/src/router.js
vs.
https://github.com/nextcloud/contacts/blob/master/src/router/index.js
But I agree, it is never else located in src/components/TheRouter.js
. How should we do it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say it's fine as well in a router.js file, more clear ;)
I like having everything in separate folders, but feel free to choose :)
Both are fine imho (just not in components 😉 )
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See one unrelated comment! :)
I'm using 0.11.3 on 17.0.1 and this is still an issue, so it doesn't seem like it fixed the problem. Creating a subtask with a due date when the parent does not have a due date does not show that task in Important, Today, or Week. |
This fix is not included in 0.11.3. It will be released with 0.12.0. |
This PR aims at solving an issue with the current way we sort tasks into collections (see e.g #83). At the moment we only show a task in a collection if it is a root task and matches the collection in question.
E.g. we only show a task in the
today
collection when it is due today and if it is a root task. In case a subtask is due today, it will not be shown unless its root task is also due today.The problem here is, that you potentially won't see subtasks due today / this week, are important. This means the collections don't catch all tasks that they should.
With this PR, we show all root tasks that have a subtask matching the collection (or match the collection itself).
The question here is, whether this is reasonable and how we should count the tasks then (for showing their count in the sidebar). Options are to
Feedback from @nextcloud/designers would be very welcome.