First prototype to show tasks on calendar and redirect to tasks app #1798

bfritscher · 2020-01-12T20:23:03Z

This is a start to address issue #28 . Feedback is welcome.

bfritscher · 2020-01-12T20:26:20Z

Currently changing the settings to display the tasks requires a refresh of the page. As the eventobjects of the current time ranges are already cached. Is there an easy way to force requery of the time ranges?

georgehrke · 2020-01-13T08:45:28Z

Currently changing the settings to display the tasks requires a refresh of the page. As the eventobjects of the current time ranges are already cached. Is there an easy way to force requery of the time ranges?

There is a fetchedTimeRanges store. You will have to add a mutation to reset the entire store. After that, if you increment the modificationCount, it will force fullCalendar to rerender and since there are no time-ranges, it will fetch them from the server.

georgehrke · 2020-01-13T08:46:12Z

@bfritscher Thank you very much for this pull-request :)
I will give this a proper in-depth review later today.

css/fullcalendar.scss

src/models/calendarObject.js

jancborchardt · 2020-01-15T00:26:57Z

Only a superficial thing: It should be "Show tasks in calendar" (on → in) and it should be below "Enable birthday calendar" as it is sort of related since it adds a virtual kind of calendar.

bfritscher · 2020-01-15T11:22:11Z

Thanks for the feedback!
I agree that an icon would be good to indentify it as a task entry, instead of just a checkmark. Not sure that it should be a checkbox which will always be uncheckd except if complete. Complete is already shown by the fact that it has strikethrough and less opacity. Google also displays the same icon:

For the naming and position of the settings entry I am open to suggestions, enable... or show... It is worth mentioning to choose the phrasing that it is not only an additional virtual calendar. There are calendars with only events or only tasks, but there can also be calendars with events and tasks on the same calendar. In which case it could happend that no additional calendar is shown, and only new task entry appear on this calendar.

Thanks for the pointer on the timerange store.

jancborchardt · 2020-01-16T00:19:42Z

Hmm ok, then maybe test with just the icon-checkmark (as per https://docs.nextcloud.com/server/17/developer_manual/design/icons.html) just so it looks like Nextcloud-style instead of Unicode. :)

bpcurse · 2020-01-17T08:23:11Z

aCalendar (10Mio.+ downloads on gplay) uses unchecked checkboxes.
The checkmark might somehow be misleading to think that the task is done.

jancborchardt · 2020-01-19T13:02:04Z

@bpcurse could you show a screenshot?

bpcurse · 2020-01-19T13:40:59Z

@jancborchardt Sure, it looks like this (in dark mode):

Overdue items have a solid color (filled) checkbox with an exclamation mark in it.

armaccloud · 2020-01-20T21:33:55Z

Since tasks can have both a start- and a due date, it would be great if these task will actually occupy the space in the week view just like a calendar item does. This way you can visually see where in the day the task fits.

jancborchardt · 2020-01-23T03:16:47Z

I’d agree with @bpcurse that using non-filled checkboxes or filled ones depending on state is best – just like the Tasks app indeed does, so we have symmetry there.

@armaccloud this seems like something for a follow-up pull request.

PyLit · 2020-02-03T03:13:32Z

I am looking forward to this feature. I hope it gets figured out soon. I saw the new separation of calendars with and without task lists. I assume this is related and it got me excited.

georgehrke · 2020-03-03T13:22:39Z

Hey @bfritscher,
Could you give us a quick update on the status of this PR please? :)

georgehrke · 2020-03-10T14:35:50Z

@bfritscher I would really like to include this in the next minor release.
Would you mind if i take over? :)

bfritscher · 2020-03-10T15:04:38Z

@georgehrke I can set aside some time this evening to make an updated pull request.

Summary of the changes discussed above:

page refresh reset fetchedTimeRange store and increment modificaitonCount
icon show real state with a checkbox
"Show tasks in calendar" (did no get any other suggestion)
if available use start/end date
keep the current workaround for missing properties
resolve merge conflicts

bfritscher · 2020-03-10T20:31:53Z

here a screenshot of second version with discussed changes

src/components/AppNavigation/Settings.vue

juliusknorr

Seems good to me now, except for the minor wording change.

georgehrke · 2020-04-02T14:46:15Z

Yes, it looked good when i checked it earlier.
I'm planning to have a 2.0.3 early next week and afterwards i will merge it.

Eye-Of-Agamotto · 2020-04-13T18:27:23Z

Hey guys I am relatively new to github. Is it possible for normal users to pull requests such as this to our own nextcloud instances. I am very excited for this feature

templates/main.php

src/models/calendarObject.js

georgehrke · 2020-04-15T19:37:35Z

As discussed further above, I improved the support for VTODO in calendar-js, so we no longer need the hack in /src/models/calendarObjects.js: nextcloud/calendar-js#131

I will take care of rebasing and resolving the small leftover ToDos tomorrow.

- supports taks in mixed calendars or on task only calendars - feature can be toggled in settings - checkbox icon adapts to light and dark text and is checked if task is done - if start date is available event duration is set from start to due date - clicking on event redirects to task app Signed-off-by: Boris Fritscher <[email protected]>

Signed-off-by: Boris Fritscher <[email protected]>

Signed-off-by: Georg Ehrke <[email protected]>

…usly done in calendarObject model Signed-off-by: Georg Ehrke <[email protected]>

…nc func in eventClick handler Signed-off-by: Georg Ehrke <[email protected]>

Signed-off-by: Georg Ehrke <[email protected]>

src/fullcalendar/eventClick.js

Signed-off-by: Georg Ehrke <[email protected]>

georgehrke · 2020-04-16T18:22:07Z

@tcitworld Is this good to go from your side? :)

georgehrke · 2020-04-17T07:48:17Z

@bfritscher Thanks a lot for this contribution!

bfritscher · 2020-04-17T07:57:42Z

@georgehrke Thank you for the improvements and the merge!

szaimen · 2020-06-02T18:13:44Z

When will the next calendar release happen? Would love to test this great new feature :)

georgehrke · 2020-06-02T19:53:15Z

2.1.0 will probably come end of June / early July. I had too many other things on my plate last month and didn't manage to work as much on the Calendar as i hoped to.

bfritscher mentioned this pull request Jan 12, 2020

Show tasks with DUE date in calendar [$380] #28

Closed

6 tasks

georgehrke added the 2. developing Work in progress label Jan 13, 2020

georgehrke added this to the 2.1.0 milestone Jan 13, 2020

georgehrke reviewed Jan 14, 2020

View reviewed changes

css/fullcalendar.scss Outdated Show resolved Hide resolved

src/models/calendarObject.js Outdated Show resolved Hide resolved

raimund-schluessler mentioned this pull request Jan 15, 2020

Add link to calendar for tasks with due date nextcloud/tasks#803

Closed

juliusknorr mentioned this pull request Feb 16, 2020

Expose boards as calendars nextcloud/deck#1545

Merged

3 tasks

bfritscher force-pushed the feature/28/tasks_on_calendar branch 2 times, most recently from eb9b14e to d171faa Compare March 10, 2020 20:29

juliusknorr reviewed Apr 2, 2020

View reviewed changes

src/components/AppNavigation/Settings.vue Outdated Show resolved Hide resolved

juliusknorr requested review from georgehrke and jancborchardt April 2, 2020 14:44

juliusknorr reviewed Apr 2, 2020

View reviewed changes

georgehrke self-assigned this Apr 14, 2020

georgehrke reviewed Apr 15, 2020

View reviewed changes

templates/main.php Outdated Show resolved Hide resolved

georgehrke reviewed Apr 15, 2020

View reviewed changes

src/models/calendarObject.js Outdated Show resolved Hide resolved

bfritscher and others added 5 commits April 16, 2020 10:18

add show_tasks to php test

4de3495

Signed-off-by: Boris Fritscher <[email protected]>

Apply composer cs:fix

ef1826b

Signed-off-by: Georg Ehrke <[email protected]>

Rename Settings for tasks

42d5ca4

Signed-off-by: Georg Ehrke <[email protected]>

Use own CSS class for completed tasks

6cb9511

Signed-off-by: Georg Ehrke <[email protected]>

georgehrke force-pushed the feature/28/tasks_on_calendar branch from 539e4c1 to 6cb9511 Compare April 16, 2020 09:10

georgehrke added 5 commits April 16, 2020 11:33

Display percentage for task via eventSourceFunction, as it was previo…

7532b49

…usly done in calendarObject model Signed-off-by: Georg Ehrke <[email protected]>

Add davUrl to extendedProps of fc-event, so we don't have to call asy…

df6d84c

…nc func in eventClick handler Signed-off-by: Georg Ehrke <[email protected]>

Install nc/dialogs for new toast API

fbdcb85

Signed-off-by: Georg Ehrke <[email protected]>

Add tasks_enabled to Initial State Service

32c1e9e

Signed-off-by: Georg Ehrke <[email protected]>

Do not forward to tasks app if it is not enabled

a2f7bee

Signed-off-by: Georg Ehrke <[email protected]>

tcitworld reviewed Apr 16, 2020

View reviewed changes

src/fullcalendar/eventClick.js Outdated Show resolved Hide resolved

Increase test coverage for new Show tasks feature

8785e4f

Signed-off-by: Georg Ehrke <[email protected]>

georgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Apr 16, 2020

georgehrke approved these changes Apr 16, 2020

View reviewed changes

georgehrke linked an issue Apr 16, 2020 that may be closed by this pull request

Show tasks with DUE date in calendar [$380] #28

Closed

6 tasks

tcitworld approved these changes Apr 17, 2020

View reviewed changes

georgehrke merged commit 30ca593 into nextcloud:master Apr 17, 2020

This was referenced Jun 12, 2020

Nextcloud 19: Calendar-Integration not published yet nextcloud/deck#2004

Closed

Also mark tasks as done when STATUS is set to COMPLETED #2339

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

First prototype to show tasks on calendar and redirect to tasks app #1798

First prototype to show tasks on calendar and redirect to tasks app #1798

bfritscher commented Jan 12, 2020

bfritscher commented Jan 12, 2020

georgehrke commented Jan 13, 2020 •

edited

Loading

georgehrke commented Jan 13, 2020

jancborchardt commented Jan 15, 2020

bfritscher commented Jan 15, 2020 •

edited

Loading

jancborchardt commented Jan 16, 2020

bpcurse commented Jan 17, 2020

jancborchardt commented Jan 19, 2020

bpcurse commented Jan 19, 2020

armaccloud commented Jan 20, 2020

jancborchardt commented Jan 23, 2020

PyLit commented Feb 3, 2020

georgehrke commented Mar 3, 2020

georgehrke commented Mar 10, 2020

bfritscher commented Mar 10, 2020

bfritscher commented Mar 10, 2020

juliusknorr left a comment

georgehrke commented Apr 2, 2020

Eye-Of-Agamotto commented Apr 13, 2020

georgehrke commented Apr 15, 2020

georgehrke commented Apr 16, 2020

georgehrke commented Apr 17, 2020

bfritscher commented Apr 17, 2020

szaimen commented Jun 2, 2020

georgehrke commented Jun 2, 2020 •

edited

Loading

First prototype to show tasks on calendar and redirect to tasks app #1798

First prototype to show tasks on calendar and redirect to tasks app #1798

Conversation

bfritscher commented Jan 12, 2020

bfritscher commented Jan 12, 2020

georgehrke commented Jan 13, 2020 • edited Loading

georgehrke commented Jan 13, 2020

jancborchardt commented Jan 15, 2020

bfritscher commented Jan 15, 2020 • edited Loading

jancborchardt commented Jan 16, 2020

bpcurse commented Jan 17, 2020

jancborchardt commented Jan 19, 2020

bpcurse commented Jan 19, 2020

armaccloud commented Jan 20, 2020

jancborchardt commented Jan 23, 2020

PyLit commented Feb 3, 2020

georgehrke commented Mar 3, 2020

georgehrke commented Mar 10, 2020

bfritscher commented Mar 10, 2020

bfritscher commented Mar 10, 2020

juliusknorr left a comment

Choose a reason for hiding this comment

georgehrke commented Apr 2, 2020

Eye-Of-Agamotto commented Apr 13, 2020

georgehrke commented Apr 15, 2020

georgehrke commented Apr 16, 2020

georgehrke commented Apr 17, 2020

bfritscher commented Apr 17, 2020

szaimen commented Jun 2, 2020

georgehrke commented Jun 2, 2020 • edited Loading

georgehrke commented Jan 13, 2020 •

edited

Loading

bfritscher commented Jan 15, 2020 •

edited

Loading

georgehrke commented Jun 2, 2020 •

edited

Loading