Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
feat: send timezone offset in get time-entries #489
  • Loading branch information
Angeluz-07 committed Aug 8, 2020
commit f7cda1ac5a4bb3f266dcf8e1304efcc767a2c71f
17 changes: 16 additions & 1 deletion src/app/modules/time-clock/services/entry.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ describe('EntryService', () => {

it('load all Entries', () => {
const month = new Date().getMonth();
const timezoneOffset = new Date().getTimezoneOffset();
service.loadEntries(month).subscribe();

const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}?month=${month}`);
const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}?month=${month}&timezone_offset=${timezoneOffset}`);
expect(loadEntryRequest.request.method).toBe('GET');

});
Expand Down Expand Up @@ -115,6 +116,20 @@ describe('EntryService', () => {
expect(loadEntryRequest.request.params.get('limit')).toEqual('9999');
});

it('when getting time entries for report, timezone_offset parameter should be sent', () => {
const yesterday = moment(new Date()).subtract(1, 'day');
const today = moment(new Date());
const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
const userId = '123';

service.loadEntriesByTimeRange(timeRange, userId).subscribe();

const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);

const timezoneOffset = new Date().getTimezoneOffset().toString();
expect(loadEntryRequest.request.params.get('timezone_offset')).toEqual(timezoneOffset);
});

it('when restarting entry, a POST is triggered', () => {
const entry = 'entryId';

Expand Down
6 changes: 4 additions & 2 deletions src/app/modules/time-clock/services/entry.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export class EntryService {
}

loadEntries(month): Observable<any> {
return this.http.get(`${this.baseUrl}?month=${month}`);
const timezoneOffset = new Date().getTimezoneOffset();
return this.http.get(`${this.baseUrl}?month=${month}&timezone_offset=${timezoneOffset}`);
}

createEntry(entryData): Observable<any> {
Expand Down Expand Up @@ -70,7 +71,8 @@ export class EntryService {
start_date: this.datePipe.transform(range.start_date, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT),
end_date: this.datePipe.transform(range.end_date, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT),
user_id: userId,
limit: `${MAX_NUMBER_OF_ENTRIES_FOR_REPORTS}`
limit: `${MAX_NUMBER_OF_ENTRIES_FOR_REPORTS}`,
timezone_offset : new Date().getTimezoneOffset().toString(),
}
}
);
Expand Down