Skip to content

Fix: Time entries offsets #77

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

Merged
merged 1 commit into from
Feb 11, 2022
Merged

Fix: Time entries offsets #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix: Time entries offsets
  • Loading branch information
@cxcarvaj
cxcarvaj committed Feb 11, 2022
commit 77ec46b10935fe38ba9c6508076dccf38b1b591f
1 change: 1 addition & 0 deletions nodejs-functions/src/handlers/automatic-clock-outs/clock_out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const doClockOut = async (context) => {
}
timeEntryAsJson.end_date = timeEntry.getTimeToClockOutMidnight();
await container.item(timeEntryAsJson.id, timeEntryAsJson.tenant_id).replace(timeEntryAsJson);
totalClockOutsExecuted++;
}
})
);
Expand Down
16 changes: 8 additions & 8 deletions nodejs-functions/src/handlers/automatic-clock-outs/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nodejs-functions/src/handlers/automatic-clock-outs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"dependencies": {
"@azure/cosmos": "3.5.2",
"@azure/msal-node": "^1.0.0-alpha.5",
"@slack/web-api": "^6.0.0",
"axios": "^0.20.0",
"dotenv": "^8.2.0",
"dotenv": "^16.0.0",
"moment": "^2.27.0",
"@slack/web-api": "^6.0.0",
"msal": "^1.4.0"
},
"author": "",
Expand Down
5 changes: 2 additions & 3 deletions nodejs-functions/src/handlers/automatic-clock-outs/time_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ class TimeEntry {
}

getMidnightInTimeEntryZone(){
return moment(this.timeEntry.start_date).utc()
.subtract(this.timeEntry.timezone_offset, 'minutes').endOf('day');
return moment(this.timeEntry.start_date).utcOffset(this.timeEntry.timezone_offset * -1).endOf('day');
}

getTimeToClockOutMidnight(){
return moment().utc().endOf('day').toISOString();
return moment(this.timeEntry.start_date).utcOffset(this.timeEntry.timezone_offset * -1).endOf('day').toISOString();
}

getCurrentTimeInTimeEntryZone(){
Expand Down