Added fullDay default duration for events #52

Jacob-Daniel · 2024-10-02T15:11:01Z

Changes
Implemented fullDay functionality for the Calendar to support events spanning multiple days.
Updated the default behaviour to handle multi-day events in a 'Booking' collection type.

Testing
Tested functionality in the month view successfully.
Bookings were correctly displayed across the appropriate duration of days.
Clicking on an event correctly redirects to the corresponding Booking details page in Strapi.

Error
Encountered an error when switching between calendar views (e.g., from month to week or day view), unrelated to the fullDay changes. The error (Uncaught TypeError: Cannot read properties of undefined (reading 'end')) was reproduced on a fresh install.
A separate issue will be opened to track this bug.

Versions
Strapi version: 4.25.11
Calendar plugin version: ^0.1.2
Node version: v20.17.0

v0.1.2

LuisRodriguezLD

thanks for the PR,
I've left a few comments, let me know if you have questions

admin/src/pages/settings.js

LuisRodriguezLD · 2024-10-02T15:48:24Z

server/services/service.js

@@ -81,7 +81,9 @@ module.exports = () => ({
      startDate: x[config.startField],
      endDate: config.endField
        ? x[config.endField]
-        : moment(x[config.startField]).add(config.defaultDuration, 'minutes'),
+        : config.defaultDuration === 'fullDay' 


default duration will never be fullDay, you would need to compare to that value which is 1440

LuisRodriguezLD · 2024-10-02T15:49:20Z

server/services/service.js

@@ -81,7 +81,9 @@ module.exports = () => ({
      startDate: x[config.startField],


if the event is fullDay, shouldn't it also affect the start?

change formatting from tab to spaces

Fix indenting

Jacob-Daniel · 2024-10-03T16:00:04Z

Hi Luis,

I believe I have pushed to the same branch, do you not see it?

master...Jacob-Daniel:strapi-calendar:add-fullDay-duration

I hope I have resolved the above issues, here is an outline.

The logic to determine all-day events has been adjusted. Specifically, if an event is deemed full-day, we only use the date part of the startField, ensuring the start and end dates are treated as:

startDate: ${startDate}T00:00:00
endDate: ${endDate}T23:59:59
This ensures that the calendar visually represents the entire day block, allowing events to visually span across multiple days correctly.

The default duration is now set to 1440.

"If the event is fullDay, shouldn't it also affect the start?"

Yes, I addressed this by ensuring that for all-day events, the start time is set to midnight (T00:00:00) and the end time is set to one second before the next day (T23:59:59). This change guarantees that the event fills the entire day block on the calendar.

Please let me know what you think, if we need to do any further adjustments etc.

Jacob

LuisRodriguezLD · 2024-10-03T20:00:58Z

admin/src/pages/settings.js

@@ -61,6 +61,7 @@ function Settings() {
    titleField: null,
    colorField: null,
    defaultDuration: 30,
+    defaultStartTime: '12:00',    


as of now, there's no way for users to edit this so let's remove it and uses moment instead

LuisRodriguezLD · 2024-10-03T20:02:26Z

admin/src/pages/settings.js

@@ -372,7 +379,7 @@ function Settings() {
                      ))}
                  </Select>
                </GridItem>
-              </Grid>
+              </Grid>              


I believe this whitespace is unnecessary

LuisRodriguezLD · 2024-10-03T20:04:19Z

server/services/service.js

-      color: config.colorField ? x[config.colorField] : null,
-    }));
+    return dataFiltered.map((x) => {
+      const startDate = x[config.startField].split('T')[0];


this could yield different results depending on the timezone,
could we use moment().startOf('day') and moment().endOf('day') instead?

server/services/service.js

…f time zones using moment().

admin/src/pages/settings.js

server/services/service.js

LuisRodriguezLD · 2024-10-09T14:33:59Z

Code looks good but the build failed, could you run npm run lint:fix and push the changes?

Revert ESLint version to match master branch

LuisRodriguezLD

Code is solid. Let's just clean up before we merge.
Thank you for your time

LuisRodriguezLD · 2024-10-11T13:26:48Z

pnpm-lock.yaml

This field should not be here. We use yarn.
Please remove

Done, sorry for that ..

LuisRodriguezLD · 2024-10-11T13:27:48Z

package.json

I think the lint script updated this file by mistake. could you revert the change?

I think my last push looks okay now, again sorry for that ..

package-lock.json

Jacob-Daniel · 2024-10-12T13:18:02Z

Louis, I think you mentioned a new release? Do you have an out-line of goals/ objectives? Just, as you know I am using your plugin and there maybe features I would like to contribute. Thanks for your recent help.

LuisRodriguezLD · 2024-10-14T13:26:09Z

Code is flawless, thank you Jacob.
Regarding the next major version, I published a beta a few weeks ago, the work is here.
I don't have specific goals or objectives other than

change calendar library
TS support everywhere
use new strapi plugin sdk
strapi5 compat

Fee free to join the conversation here

LuisRodriguezLD and others added 2 commits September 20, 2024 09:40

Merge pull request offset-dev#49 from offset-dev/develop

34894d2

v0.1.2

Added fullDay default duration for events

4ef7602

LuisRodriguezLD requested changes Oct 2, 2024

View reviewed changes

LuisRodriguezLD changed the base branch from master to develop October 2, 2024 15:50

LuisRodriguezLD added the waiting for op Needs action from the original poster label Oct 3, 2024

Jacob-Daniel and others added 3 commits October 3, 2024 13:24

Code Revision for All-Day Events

b10f8c0

Update service.js

8a0c621

change formatting from tab to spaces

Update settings.js

e84e1b3

Fix indenting

LuisRodriguezLD mentioned this pull request Oct 3, 2024

Add full day duration #53

Closed

LuisRodriguezLD requested changes Oct 3, 2024

View reviewed changes

Settings: remove unused defaultStartTime. Service: improve handling o…

a75217d

…f time zones using moment().

Jacob-Daniel commented Oct 4, 2024

View reviewed changes

admin/src/pages/settings.js Show resolved Hide resolved

LuisRodriguezLD requested changes Oct 7, 2024

View reviewed changes

admin/src/pages/settings.js Show resolved Hide resolved

server/services/service.js Show resolved Hide resolved

simplify handling of 'allDay' events

79362d6

Jacob-Daniel added 2 commits October 11, 2024 07:19

fix: linting issues resolved

94c0a9a

Revert ESLint version to match master branch

9d21648

Revert ESLint version to match master branch

Jacob-Daniel force-pushed the add-fullDay-duration branch from 071df13 to 9d21648 Compare October 11, 2024 07:43

LuisRodriguezLD requested changes Oct 11, 2024

View reviewed changes

Jacob-Daniel added 2 commits October 12, 2024 13:38

remove unused files

9b3f091

revert changes: git checkout master -- package.json

6372c32

LuisRodriguezLD merged commit 16a41cb into offset-dev:develop Oct 14, 2024
1 check passed

LuisRodriguezLD mentioned this pull request Oct 14, 2024

Custom Default Event Duration - Request. #51

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added fullDay default duration for events #52

Added fullDay default duration for events #52

Jacob-Daniel commented Oct 2, 2024

LuisRodriguezLD left a comment

LuisRodriguezLD Oct 2, 2024

LuisRodriguezLD Oct 2, 2024

Jacob-Daniel commented Oct 3, 2024 •

edited

Loading

LuisRodriguezLD Oct 3, 2024

LuisRodriguezLD Oct 3, 2024

LuisRodriguezLD Oct 3, 2024

LuisRodriguezLD commented Oct 9, 2024

LuisRodriguezLD left a comment

LuisRodriguezLD Oct 11, 2024

Jacob-Daniel Oct 12, 2024

LuisRodriguezLD Oct 11, 2024

Jacob-Daniel Oct 12, 2024

Jacob-Daniel commented Oct 12, 2024

LuisRodriguezLD commented Oct 14, 2024

		@@ -81,7 +81,9 @@ module.exports = () => ({
		startDate: x[config.startField],

Added fullDay default duration for events #52

Added fullDay default duration for events #52

Conversation

Jacob-Daniel commented Oct 2, 2024

LuisRodriguezLD left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jacob-Daniel commented Oct 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LuisRodriguezLD commented Oct 9, 2024

LuisRodriguezLD left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jacob-Daniel commented Oct 12, 2024

LuisRodriguezLD commented Oct 14, 2024

Jacob-Daniel commented Oct 3, 2024 •

edited

Loading