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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
},
"config": {
"commit-message-validator": {
"pattern": "^(fix: TTA-|feat: TTA-|perf: TTA-|build: TTA-|ci: TTA-|docs: TTA-|refactor: TTA-|style: TTA-|test: TTA-|code-smell: TTA-)[0-9].*",
"errorMessage": "\nYour commit message must comply with the following pattern:\n ^(fix: TTA-|feat: TTA-|perf: TTA-|build: TTA-|ci: TTA-|docs: TTA-|refactor: TTA-|style: TTA-|test: TTA-|code-smell: TTA-)[0-9].*\n followed by any commit message.\n\n Example:\n fix: TTA-43 any commit message\n"
"pattern": "^(fix: TTL-|feat: TTL-|perf: TTL-|build: TTL-|ci: TTL-|docs: TTL-|refactor: TTL-|style: TTL-|test: TTL-|code-smell: TTL-)[0-9].*",
"errorMessage": "\nYour commit message must comply with the following pattern:\n ^(fix: TTL-|feat: TTL-|perf: TTL-|build: TTL-|ci: TTL-|docs: TTL-|refactor: TTL-|style: TTL-|test: TTL-|code-smell: TTL-)[0-9].*\n followed by any commit message.\n\n Example:\n fix: TTL-43 any commit message\n"
}
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ if (isNotLegacy) {
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
})
export class AppRoutingModule {
export class AppRoutingModule {

}
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
}

goToCustomerForm(){
scrollToCustomerForm();
scrollToCustomerForm();
}

}
12 changes: 6 additions & 6 deletions src/app/modules/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ export class LoginComponent implements OnInit {
ngOnInit() {

this.googleAuthSDK();
this.loginService.isLogin().subscribe(isLogin => {
if (isLogin) {
this.router.navigate(['']);
}
});
this.loginService.isLogin().subscribe(isLogin => {
if (isLogin) {
this.router.navigate(['']);
}
});

window.handleCredentialResponse = (response) => {
const {credential = ''} = response;
this.featureToggleCookiesService.setCookies();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
map((isAdmin) => {
if (isAdmin) {
this.itemsSidebar = [
{ route: '/time-clock', icon: 'far fa-clock', text: 'Time Clock', active: false },
{ route: '/time-clock', icon: 'far fa-clock', text: 'Home', active: false },
{ route: '/time-entries', icon: 'far fa-file-alt', text: 'Time Entries', active: false },
{ route: '/reports', icon: 'fas fa-chart-bar', text: 'Reports', active: false },
{ route: '/activities-management', icon: 'fas fa-list-ol', text: 'Activities', active: false },
Expand All @@ -64,7 +64,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
];
} else {
this.itemsSidebar = [
{ route: '/time-clock', icon: 'far fa-clock', text: 'Time Clock', active: false },
{ route: '/time-clock', icon: 'far fa-clock', text: 'Home', active: false },
{ route: '/time-entries', icon: 'far fa-file-alt', text: 'Time Entries', active: false },
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class InjectTokenInterceptor implements HttpInterceptor {
if (err instanceof HttpErrorResponse) {
if (err.status === 401) {
this.loginService.logout();
window.open("/login", "_self")
window.open('/login', '_self');
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('SubstractDatePipeDisplayAsFloat', () => {
expect(pipe).toBeTruthy();
});

/*TODO: tests will be more robust if they take into account FIXED_POINT_DIGITS*/
/*TODO: tests will be more robust if they take into account FIXED_POINT_DIGITS*/
it('returns the date diff as float hours (xx.xx)', () => {
[
{ endDate: '2021-04-11T10:20:00Z', startDate: '2021-04-11T08:00:00Z', expectedDiff: '2.33' },
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/store/entry.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class EntryEffects {
this.entryService.summary().pipe(
map((response) => {
if (!response){
this.toastrService.warning("It's a brand new month! You don't have any time entries yet.");
this.toastrService.warning('It is a brand new month! You do not have any time entries yet.');
}
return new actions.LoadEntriesSummarySuccess(response);
}),
Expand Down