-
Notifications
You must be signed in to change notification settings - Fork 402
Allow option to exclude specific weekdays from total time #1219
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
Open
alpaca-tc
wants to merge
1
commit into
actions:main
Choose a base branch
from
alpaca-tc:add-exclude-weekdays
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
import {elapsedMillisExcludingDays} from './elapsed-millis-excluding-days'; | ||
|
||
describe('elapsedMillisExcludingDays', () => { | ||
const HOUR = 1000 * 60 * 60; | ||
const DAY = HOUR * 24; | ||
|
||
it('calculates elapsed days when no weekdays are excluded', () => { | ||
const from = new Date(); | ||
const lessThan = new Date(from.getTime() - 1); | ||
const equal = from; | ||
const greaterThan = new Date(from.getTime() + 1); | ||
|
||
expect(elapsedMillisExcludingDays(from, lessThan, [])).toEqual(-1); | ||
expect(elapsedMillisExcludingDays(from, equal, [])).toEqual(0); | ||
expect(elapsedMillisExcludingDays(from, greaterThan, [])).toEqual(1); | ||
}); | ||
|
||
it('calculates elapsed days with specified weekdays excluded', () => { | ||
const date = new Date('2025-03-03 09:00:00'); // Monday | ||
|
||
const tomorrow = new Date('2025-03-04 09:00:00'); | ||
expect(elapsedMillisExcludingDays(date, tomorrow, [])).toEqual(DAY); | ||
expect(elapsedMillisExcludingDays(date, tomorrow, [1])).toEqual(9 * HOUR); | ||
|
||
const dayAfterTomorrow = new Date('2025-03-05 10:00:00'); | ||
const full = 2 * DAY + HOUR; | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [])).toEqual( | ||
full | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [0])).toEqual( | ||
full | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [1])).toEqual( | ||
full - 15 * HOUR | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [2])).toEqual( | ||
full - DAY | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [3])).toEqual( | ||
full - 10 * HOUR | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [4])).toEqual( | ||
full | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [1, 2])).toEqual( | ||
10 * HOUR | ||
); | ||
expect(elapsedMillisExcludingDays(date, dayAfterTomorrow, [2, 3])).toEqual( | ||
15 * HOUR | ||
); | ||
}); | ||
|
||
it('handles week spanning periods correctly', () => { | ||
const friday = new Date('2025-03-07 09:00:00'); | ||
const nextMonday = new Date('2025-03-10 09:00:00'); | ||
expect(elapsedMillisExcludingDays(friday, nextMonday, [0, 6])).toEqual(DAY); | ||
}); | ||
|
||
it('handles long periods with multiple weeks', () => { | ||
const start = new Date('2025-03-03 09:00:00'); | ||
const twoWeeksLater = new Date('2025-03-17 09:00:00'); | ||
expect(elapsedMillisExcludingDays(start, twoWeeksLater, [0, 6])).toEqual( | ||
10 * DAY | ||
); | ||
|
||
const lessThanTwoWeeksLater = new Date('2025-03-17 08:59:59'); | ||
expect( | ||
elapsedMillisExcludingDays(start, lessThanTwoWeeksLater, [0, 6]) | ||
).toEqual(10 * DAY - 1000); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
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.
If you don't use options, the existing implementation is used, so even if there are bugs, the impact is minimal. A simple O(N) calculation logic is used. While an O(1) logic could also be possible, it would be a bit more complex.