Skip to content

Tt 501 integrate reports with the new backend #797

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 3 commits into from
Jan 20, 2022
Merged

Tt 501 integrate reports with the new backend #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10f867a
refactor: TT-501 change of route
Davcg5 Jan 13, 2022
d72c90b
refactor: TT-501 change of name of route
Davcg5 Jan 18, 2022
9780430
refactor: TT-501 just change the url when in development
OscarPallazhco Jan 20, 2022
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
11 changes: 6 additions & 5 deletions src/app/modules/time-clock/services/entry.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ describe('EntryService', () => {
const pipe: DatePipe = new DatePipe('en');
const timeRange: TimeEntriesTimeRange = {start_date: yesterday, end_date: today};
const userId = '123';

const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
service.loadEntriesByTimeRange(timeRange, userId).subscribe();

const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);
const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
expect(loadEntryRequest.request.params.get('start_date')).toBe(pipe.transform(yesterday,
EntryService.TIME_ENTRIES_DATE_TIME_FORMAT));
expect(loadEntryRequest.request.params.get('end_date')).toBe(pipe.transform(today, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT));
Expand All @@ -120,10 +120,10 @@ describe('EntryService', () => {
const today = moment(new Date());
const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
const userId = '123';

const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
service.loadEntriesByTimeRange(timeRange, userId).subscribe();

const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);
const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
expect(loadEntryRequest.request.params.get('limit')).toEqual('9999');
});

Expand All @@ -132,10 +132,11 @@ describe('EntryService', () => {
const today = moment(new Date());
const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
const userId = '123';
const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';

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

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

const timezoneOffset = new Date().getTimezoneOffset().toString();
expect(loadEntryRequest.request.params.get('timezone_offset')).toEqual(timezoneOffset);
Expand Down
3 changes: 2 additions & 1 deletion src/app/modules/time-clock/services/entry.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ export class EntryService {

loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable<any> {
const MAX_NUMBER_OF_ENTRIES_FOR_REPORTS = 9999;
return this.http.get(this.baseUrl,
const loadEntriesByTimeRangeURL = this.urlInProduction ? this.baseUrl : this.baseUrl + '/report';
return this.http.get(loadEntriesByTimeRangeURL,
{
params: {
start_date: this.datePipe.transform(range.start_date, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT),
Expand Down