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.

Sign up for GitHub

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

fix: bug where appointments can appear outside the calendar #1204

Merged
merged 5 commits into from
May 24, 2019
Merged

fix: bug where appointments can appear outside the calendar #1204

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8b9ebb
Fixed bug where appointments can appear outside the calendar
NathanBP Feb 1, 2019
054ea9f
Modfied change to stop moving all appointments up by 2%
NathanBP Feb 1, 2019
184b9f3
Updated code to get top of appointment
NathanBP Feb 3, 2019
142ee7d
Added range tests, to ensure appointments don't appear outside calendar
NathanBP Feb 14, 2019
f9eba9c
Merge branch 'master' into Appointments_Booked_Outside_Calendar_Range…
NathanBP May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const EXAMPLES = {
customView: 'Custom Calendar Views',
resource: 'Resource Scheduling',
dnd: 'Addon: Drag and drop',
dndresource: 'Resource Drag and drop',
}

const DEFAULT_EXAMPLE = 'basic'
Expand Down
30 changes: 30 additions & 0 deletions examples/demos/dndresource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,41 @@ const events = [
end: new Date(2018, 0, 29, 12, 30, 0),
resourceId: 3,
},
{
id: 10,
title: 'Board meeting',
start: new Date(2018, 0, 30, 23, 0, 0),
end: new Date(2018, 0, 30, 23, 59, 0),
resourceId: 1,
},
{
id: 11,
title: 'Birthday Party',
start: new Date(2018, 0, 30, 7, 0, 0),
end: new Date(2018, 0, 30, 10, 30, 0),
resourceId: 4,
},
{
id: 12,
title: 'Board meeting',
start: new Date(2018, 0, 29, 23, 59, 0),
end: new Date(2018, 0, 30, 13, 0, 0),
resourceId: 1,
},
{
id: 13,
title: 'Board meeting',
start: new Date(2018, 0, 29, 23, 50, 0),
end: new Date(2018, 0, 30, 13, 0, 0),
resourceId: 2,
},
{
id: 14,
title: 'Board meeting',
start: new Date(2018, 0, 29, 23, 40, 0),
end: new Date(2018, 0, 30, 13, 0, 0),
resourceId: 4,
},
]

const resourceMap = [
Expand Down Expand Up @@ -103,6 +131,8 @@ class Dnd extends React.Component {
resourceTitleAccessor="resourceTitle"
onEventResize={this.resizeEvent}
defaultView="day"
step={15}
showMultiDayTimes={true}
defaultDate={new Date(2018, 0, 29)}
/>
)
Expand Down
5 changes: 4 additions & 1 deletion src/utils/TimeSlots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {

const rangeStartMin = positionFromDate(rangeStart)
const rangeEndMin = positionFromDate(rangeEnd)
const top = (rangeStartMin / (step * numSlots)) * 100
const top =
rangeEndMin - rangeStartMin < step
? ((rangeStartMin - step) / (step * numSlots)) * 100
: (rangeStartMin / (step * numSlots)) * 100

return {
top,
Expand Down
78 changes: 78 additions & 0 deletions test/utils/TimeSlots.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,81 @@ describe('getSlotMetrics', () => {
expect(diff).toBe(60)
})
})

describe('getRange', () => {
const min = dates.startOf(new Date(), 'day')
const max = dates.endOf(new Date(), 'day')
const slotMetrics = getSlotMetrics({ min, max, step: 60, timeslots: 1 })

test('getRange: 15 minute start of day appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 0, 0, 0),
new Date(2018, 0, 29, 0, 15, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: 1 hour start of day appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 0, 0, 0),
new Date(2018, 0, 29, 1, 0, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: 1 hour mid range appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 14, 0, 0),
new Date(2018, 0, 29, 15, 0, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: 3 hour mid range appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 14, 0, 0),
new Date(2018, 0, 29, 17, 0, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: full day appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 0, 0, 0),
new Date(2018, 0, 29, 23, 59, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: 1 hour end of day appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 23, 0, 0),
new Date(2018, 0, 29, 23, 59, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: 15 minute end of day appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 23, 45, 0),
new Date(2018, 0, 29, 23, 59, 0)
)
expect(range.top + range.height).toBeLessThan(100)
expect(range.height).toBeGreaterThan(0)
})

test('getRange: multi day appointment stays within calendar', () => {
let range = slotMetrics.getRange(
new Date(2018, 0, 29, 0, 0, 0),
new Date(2018, 0, 30, 4, 0, 0)
)
expect(range.top + range.height).toBeLessThan(100)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be equal to 100?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe so, as there is code in the getRange that selects the max value between the start of the day and the start of the appointment. Along with the start of the day and the end of the appointment. My understanding is that this is what splits a multi day appointment over separate days in the week view when the showMultiDayTimes prop is set.

I might be wrong though as this is just my understanding of how the calendar displays appointments

expect(range.height).toBeGreaterThan(0)
})
})