Skip to content

feat: TT-443 start time entry with time clock #779

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
gcobena-dev merged 4 commits into from
Dec 22, 2021
Merged

feat: TT-443 start time entry with time clock #779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7af6317
feat: TT-443 Use V2 for start timeEntry from timeClock
gcobena-dev Dec 20, 2021
a13fb90
fix: TT-443 Test for start timeEntry from timeClock
gcobena-dev Dec 20, 2021
8dd9d87
Merge branch 'master' into TT-443-Start-TimeEntry-With-TimeClock
gcobena-dev Dec 21, 2021
9df4cee
fix: TT-443 Fix url in prod
gcobena-dev Dec 21, 2021
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
Next Next commit
feat: TT-443 Use V2 for start timeEntry from timeClock
  • Loading branch information
@gcobena-dev
gcobena-dev committed Dec 20, 2021
commit 7af6317b42ab013bb1ca8dc6b8d80b736af10a68
8 changes: 7 additions & 1 deletion 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 @@ -41,8 +41,14 @@ describe('EntryService', () => {

it('loads an activeEntry with /running', () => {
service.loadActiveEntry().subscribe();
let path = '';
if (service.showOptionInDevelopment){
path = `${service.baseUrl}}/running`;
}else{
path = `${service.baseUrl}/active/2`;
}

const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/running`);
const loadEntryRequest = httpMock.expectOne(path);
expect(loadEntryRequest.request.method).toBe('GET');
});

Expand Down
11 changes: 9 additions & 2 deletions src/app/modules/time-clock/services/entry.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TimeEntriesSummary } from '../models/time.entry.summary';
import { Injectable } from '@angular/core';
import { Injectable, Input } from '@angular/core';
import { HttpClient } from '@angular/common/http';

import { Observable } from 'rxjs';
Expand All @@ -19,9 +19,16 @@ export class EntryService {

static TIME_ENTRIES_DATE_TIME_FORMAT = 'yyyy-MM-ddTHH:mm:ssZZZZZ';
baseUrl = `${environment.timeTrackerApiUrl}/time-entries`;
@Input() showOptionInDevelopment: boolean;

loadActiveEntry(): Observable<any> {
return this.http.get(`${this.baseUrl}/running`);
let path = '';
if (this.showOptionInDevelopment){
path = `${this.baseUrl}/running`;
}else{
path = `${this.baseUrl}/active/2`;
}
return this.http.get(path);
}

loadEntries(date): Observable<any> {
Expand Down