Create "Busy" blocks in a user's schedule #279

MelissaAutumn · 2024-02-28T16:56:40Z

Fixes #277

Adjust event_set_difference to event_roll_up_difference - This now rolls up any collisions as a "booked" slot.
Create a replica enum of slot's booking status on the frontend
Style "booked" bookable slots to not be bookable, clickable, or friendly looking.
Locale update!
Remove storeToRefs for a function that seems to be breaking.
Hide agenda view on mobile month, because we can't style it right now.
Add a hover effect to change cursor, and highlight the day in mobile month view.
Fix case where event_roll_up_difference would not roll up trailing events.
Add test case for events_roll_up_difference.

Some screenshots:

This does have the potential to show up in the month view like:

Which I would hide, but we don't currently style that slot. I've also hidden the mobile-sized agenda view because we can't style that slot yet. I've added some logic to make it behave to how we use to do month views.

MelissaAutumn · 2024-02-28T16:57:02Z

backend/src/appointment/controller/calendar.py

+
+            available_slots.append(a)
+
+        # FIXME: Lack of coffee == duplicate code. Re-work this code so we don't need a tail append.


If anyone can think of a better solution pls suggest.

Which edge case does this tail append solve?

I should have just named it end append, sounds more fun 😄

If you've got a schedule 9 to 17, and you've got a event from 16-17 then it wouldn't have appended the last busy slot, because I added a continue if collision is found, and it's the end of the loop.

frontend/src/definitions.js

MelissaAutumn · 2024-02-28T16:59:22Z

frontend/src/views/BookingView.vue

@@ -79,7 +79,7 @@ const call = inject('call');
 const appointmentStore = useAppointmentStore();
 const bookingViewStore = useBookingViewStore();
 const bookingModalStore = useBookingModalStore();
-const { status: appointmentStatus } = storeToRefs(appointmentStore);
+const { status: appointmentStatus } = appointmentStore;


I'm not sure why but this was breaking the bookingView for me. Probably because that function isn't a ref to begin with, but I don't know how it worked before..

That's weird, indeed it shouldn't have worked before, since status is just a function. On the other hand, storeToRefs might be able to convert that, but the docs are a bit vague on that in composition mode... 🤷🏻

devmount

On my end, the busy slot was shown as a selectable time slot on the booking page 😅 Even after saving the schedule config again. Anything I need to do before seeing the blocker?

Can you reproduce this?

backend/test/unit/test_calendar_tools.py

frontend/src/definitions.js

MelissaAutumn · 2024-02-29T17:49:31Z

On my end, the busy slot was shown as a selectable time slot on the booking page 😅 Even after saving the schedule config again. Anything I need to do before seeing the blocker?

Can you reproduce this?

I cannot, but can you check your response to see if the booking_status for that event is 3? And can you try clearing your cache (it shouldn't be affected because I think vite hashes js/css but just in case!)

devmount · 2024-03-04T16:14:24Z

I cannot, but can you check your response to see if the booking_status for that event is 3? And can you try clearing your cache (it shouldn't be affected because I think vite hashes js/css but just in case!)

Ok maybe it really was a caching issue, after logging in again I cannot reproduce that anymore 😇 Case closed. If I see that again, I'll create an issue.

devmount

I'm so sorry, but now I found some issues again 🙈

I got the first issue with blockers styled as selectable events again. But as soon as I wanted to inspect that, the blockers showed up again! Sneaky little bug. I get back to that as soon as I have some debugging information on this.
There seems to be some issues with calculating the start blockers now. I have a blocker shown on the booking page where none is supposed to be:

My Google Calendar:

My booking page:

The events array with the two blocker objects opened:

Any ideas? I'll play around with the blocker calculation. I feel we should do some intense testing on that method again and comment every little step since that seems kind of complicated.

MelissaAutumn · 2024-03-05T17:17:13Z

Thanks for finding that! Whats your scheduled booking hours? And do you have any other calendars connected to Appointment? It uses all calendars to determine blockers (but only the schedule calendar to book on.)

MelissaAutumn · 2024-03-05T18:59:04Z

I think I've found the bug while working on a separate issue. Will poke into it more.

MelissaAutumn · 2024-03-05T21:26:27Z

The mystery blocker at 8am could be a stray booked slot. I'll add some functionality to restrict this logic to run only between the schedule's available booking time.

* Adjust event_set_difference to event_roll_up_difference - This now rolls up any collisions as a "booked" slot. * Create a replica enum of slot's booking status on the frontend * Style "booked" bookable slots to not be bookable, clickable, or friendly looking. * Locale update! * Remove storeToRefs for a function that seems to be breaking. * Hide agenda view on mobile month, because we can't style it right now. * Add a hover effect to change cursor, and highlight the day in mobile month view. * Fix case where event_roll_up_difference would not roll up trailing events. * Add test case for events_roll_up_difference.

… view.

devmount · 2024-03-12T15:10:05Z

Thanks for finding that! Whats your scheduled booking hours? And do you have any other calendars connected to Appointment? It uses all calendars to determine blockers (but only the schedule calendar to book on.)

Sorry for the late reply. This is my schedule config:

And I only have one calendar, the google calendar, connected.

MelissaAutumn · 2024-03-18T22:43:24Z

PR is up to the current main code.

Additional issues found:
All day events just leave the day blank

I have a busy block from 1am to 9??

Confirmed bug: When there's a blocker at end of day, it will roll over to the next day before the next available slot. Adding test, and will fix once it's broken in test.

MelissaAutumn · 2024-03-19T00:05:18Z

...okay there's some issues with some of our test libraries that prevents me from creating a digestable unit test. Will work on that, but I've pushed up a fix for the issue.

@devmount can you test the latest push?

devmount

No event glitches anymore, great work @MelissaAutumn!

This is how it looks on my end now:

I'm still not sure if I really like those "busy" blocks, I found it kind of cleaner to only show selectable events 🤷🏻 And is it correct, that busy blocks show at the beginning of the day, but not at the end?

MelissaAutumn · 2024-03-22T15:27:15Z

Not showing at the end is also a bug...back to the busy mines I go! But yeah, they do look a little tough, but I'm sure we can soften the styling a bit. Maybe make them smaller than the bookable slots. 🤔

I'll play around with it early next week.

devmount · 2024-03-22T15:51:33Z

It's fine, really! I do see the value of having the whole working hours area filled with either selectable slots or blockers. Thank for your work on this! 💪🏻 👏🏻

MelissaAutumn · 2024-03-25T15:28:28Z

Oh no worries! It should at least look a little less heavy. 😄

* Make two lists * Merge them together * Sort * Might be a little less performant, but it's simpler.

MelissaAutumn · 2024-03-25T19:39:05Z

cc @devmount for one last check. I re-wrote the roll up function, might be a little slower but it's simpler-ish now. Please test to see if it still works as expected. (Looks fine to me, and the tests.)

Here's the updated styles to be a little less "in your face".

devmount

Nice work Mel! Edge event properly show up now on my end too 👏🏻 Also I like the less prominent blocker entries 👍🏻

* Adjustments to create "Busy" blocks in a user's schedule: * Adjust event_set_difference to event_roll_up_difference - This now rolls up any collisions as a "booked" slot. * Create a replica enum of slot's booking status on the frontend * Style "booked" bookable slots to not be bookable, clickable, or friendly looking. * Locale update! * Remove storeToRefs for a function that seems to be breaking. * Hide agenda view on mobile month, because we can't style it right now. * Add a hover effect to change cursor, and highlight the day in mobile month view. * Fix case where event_roll_up_difference would not roll up trailing events. * Add test case for events_roll_up_difference. * Fix pytest error with filenames. * Add enum jsdoc properties to our defines. * 🌐 complete German translation * Add schedule store and pass the slot_duration info into qalendar. * Add slot_duration to AppointmentOut schema, and hook it up for public view. * Fix the egg. * Fix booking redis cache clearing on booking code and fix test. * Fix busy blocks sometimes being created before the schedule starts. * Test blockers * Fix missing .start * Merge duplicate definition * Disable `tailwindcss/no-custom-classname` * Adjust styling of booked slots * Refactor events_roll_up_difference: * Make two lists * Merge them together * Sort * Might be a little less performant, but it's simpler. * Remove references to booking view. --------- Co-authored-by: Andreas Müller <[email protected]>

MelissaAutumn added the l10n update A string has been added or needs updating label Feb 28, 2024

MelissaAutumn requested a review from devmount February 28, 2024 16:56

MelissaAutumn self-assigned this Feb 28, 2024

MelissaAutumn commented Feb 28, 2024

View reviewed changes

frontend/src/definitions.js Outdated Show resolved Hide resolved

MelissaAutumn commented Feb 28, 2024

View reviewed changes

MelissaAutumn changed the title ~~Adjustments to create "Busy" blocks in a user's schedule:~~ Create "Busy" blocks in a user's schedule Feb 28, 2024

devmount requested changes Feb 29, 2024

View reviewed changes

backend/test/unit/test_calendar_tools.py Outdated Show resolved Hide resolved

frontend/src/definitions.js Outdated Show resolved Hide resolved

frontend/src/definitions.js Outdated Show resolved Hide resolved

MelissaAutumn force-pushed the main branch 2 times, most recently from 0e75e8b to 73d348b Compare March 1, 2024 18:09

devmount approved these changes Mar 4, 2024

View reviewed changes

devmount requested changes Mar 5, 2024

View reviewed changes

MelissaAutumn force-pushed the features/277-fill-in-busy-time-ga branch from 237bd6e to f66d3f3 Compare March 5, 2024 21:29

MelissaAutumn and others added 4 commits March 5, 2024 13:31

Fix pytest error with filenames.

6276af4

Add enum jsdoc properties to our defines.

0e721dd

🌐 complete German translation

483a0a8

MelissaAutumn force-pushed the features/277-fill-in-busy-time-ga branch from f66d3f3 to 483a0a8 Compare March 5, 2024 21:32

MelissaAutumn added 3 commits March 5, 2024 14:15

Add schedule store and pass the slot_duration info into qalendar.

cfca67c

Add slot_duration to AppointmentOut schema, and hook it up for public…

3d59df4

… view.

Fix the egg.

58520f0

MelissaAutumn added 2 commits March 18, 2024 15:23

Merge branch 'main' into features/277-fill-in-busy-time-ga

f382bd5

Fix booking redis cache clearing on booking code and fix test.

9e6affe

MelissaAutumn force-pushed the features/277-fill-in-busy-time-ga branch from 751c93a to 9e6affe Compare March 18, 2024 22:37

Fix busy blocks sometimes being created before the schedule starts.

e2a3685

MelissaAutumn added 2 commits March 19, 2024 10:09

Test blockers

fdaa5be

Fix missing .start

536416f

MelissaAutumn requested a review from devmount March 20, 2024 15:47

devmount approved these changes Mar 22, 2024

View reviewed changes

MelissaAutumn added 5 commits March 25, 2024 08:56

Merge branch 'main' into features/277-fill-in-busy-time-ga

602bcdd

Merge duplicate definition

dc978ca

Disable tailwindcss/no-custom-classname

fe4b23c

Adjust styling of booked slots

3d6a6ea

Refactor events_roll_up_difference:

390b33d

* Make two lists * Merge them together * Sort * Might be a little less performant, but it's simpler.

devmount approved these changes Mar 26, 2024

View reviewed changes

Remove references to booking view.

476ea39

MelissaAutumn mentioned this pull request Mar 26, 2024

Show pending appointments on the Calendar view #338

Merged

Merge branch 'main' into features/277-fill-in-busy-time-ga

4ebde51

MelissaAutumn merged commit 33cc02d into main Mar 26, 2024
2 checks passed

MelissaAutumn deleted the features/277-fill-in-busy-time-ga branch March 26, 2024 15:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create "Busy" blocks in a user's schedule #279

Create "Busy" blocks in a user's schedule #279

MelissaAutumn commented Feb 28, 2024 •

edited

Loading

MelissaAutumn Feb 28, 2024

devmount Feb 29, 2024

MelissaAutumn Feb 29, 2024

devmount Mar 22, 2024

MelissaAutumn Feb 28, 2024

devmount Feb 29, 2024

devmount left a comment

MelissaAutumn commented Feb 29, 2024

devmount commented Mar 4, 2024

devmount left a comment

MelissaAutumn commented Mar 5, 2024

MelissaAutumn commented Mar 5, 2024

MelissaAutumn commented Mar 5, 2024

devmount commented Mar 12, 2024

MelissaAutumn commented Mar 18, 2024 •

edited

Loading

MelissaAutumn commented Mar 19, 2024

devmount left a comment

MelissaAutumn commented Mar 22, 2024

devmount commented Mar 22, 2024

MelissaAutumn commented Mar 25, 2024

MelissaAutumn commented Mar 25, 2024

devmount left a comment


		available_slots.append(a)

		# FIXME: Lack of coffee == duplicate code. Re-work this code so we don't need a tail append.

Create "Busy" blocks in a user's schedule #279

Create "Busy" blocks in a user's schedule #279

Conversation

MelissaAutumn commented Feb 28, 2024 • edited Loading

MelissaAutumn Feb 28, 2024

Choose a reason for hiding this comment

devmount Feb 29, 2024

Choose a reason for hiding this comment

MelissaAutumn Feb 29, 2024

Choose a reason for hiding this comment

devmount Mar 22, 2024

Choose a reason for hiding this comment

MelissaAutumn Feb 28, 2024

Choose a reason for hiding this comment

devmount Feb 29, 2024

Choose a reason for hiding this comment

devmount left a comment

Choose a reason for hiding this comment

MelissaAutumn commented Feb 29, 2024

devmount commented Mar 4, 2024

devmount left a comment

Choose a reason for hiding this comment

MelissaAutumn commented Mar 5, 2024

MelissaAutumn commented Mar 5, 2024

MelissaAutumn commented Mar 5, 2024

devmount commented Mar 12, 2024

MelissaAutumn commented Mar 18, 2024 • edited Loading

MelissaAutumn commented Mar 19, 2024

devmount left a comment

Choose a reason for hiding this comment

MelissaAutumn commented Mar 22, 2024

devmount commented Mar 22, 2024

MelissaAutumn commented Mar 25, 2024

MelissaAutumn commented Mar 25, 2024

devmount left a comment

Choose a reason for hiding this comment

MelissaAutumn commented Feb 28, 2024 •

edited

Loading

MelissaAutumn commented Mar 18, 2024 •

edited

Loading