From d8cec3d2364de743b9c13a6c3d75c5096169022b Mon Sep 17 00:00:00 2001 From: Rene Enriquez Date: Tue, 12 May 2020 20:11:33 -0500 Subject: [PATCH] fix: #229 fix general observations --- .../create-customer/create-customer.html | 4 +- .../customer-list.component.html | 6 +- .../create-project-type.component.html | 4 +- .../project-type-list.component.html | 4 +- .../create-project.component.html | 4 +- .../project-list/project-list.component.html | 6 +- src/app/modules/login/login.component.html | 4 +- .../details-fields.component.html | 2 +- .../components/sidebar/sidebar.component.ts | 8 +- .../time-clock/models/time.entry.summary.ts | 11 +++ .../pages/time-clock.component.html | 87 +++++++++---------- .../time-clock/services/entry.service.spec.ts | 9 ++ .../time-clock/services/entry.service.ts | 7 ++ .../pages/time-entries.component.html | 8 +- 14 files changed, 94 insertions(+), 70 deletions(-) create mode 100644 src/app/modules/time-clock/models/time.entry.summary.ts diff --git a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html index 1bdc0d541..2e21622f6 100644 --- a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html +++ b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html @@ -30,8 +30,8 @@ >Customer description is required - - + diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html index abe79e3ff..4e172ebde 100644 --- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html +++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html @@ -12,11 +12,11 @@ > {{ customer.name }} - - diff --git a/src/app/modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component.html b/src/app/modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component.html index 2eda7232c..69ef61d4e 100644 --- a/src/app/modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component.html +++ b/src/app/modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component.html @@ -10,10 +10,10 @@ - - diff --git a/src/app/modules/customer-management/components/projects-type/components/project-type-list/project-type-list.component.html b/src/app/modules/customer-management/components/projects-type/components/project-type-list/project-type-list.component.html index ec28d05d6..076737384 100644 --- a/src/app/modules/customer-management/components/projects-type/components/project-type-list/project-type-list.component.html +++ b/src/app/modules/customer-management/components/projects-type/components/project-type-list/project-type-list.component.html @@ -14,8 +14,8 @@ > {{ projectType.name }} - - + + diff --git a/src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html b/src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html index 6c7c91a4d..540926cb0 100644 --- a/src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html +++ b/src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html @@ -23,12 +23,12 @@ - + diff --git a/src/app/modules/customer-management/components/projects/components/project-list/project-list.component.html b/src/app/modules/customer-management/components/projects/components/project-list/project-list.component.html index 009aa279d..5d598d9d0 100644 --- a/src/app/modules/customer-management/components/projects/components/project-list/project-list.component.html +++ b/src/app/modules/customer-management/components/projects/components/project-list/project-list.component.html @@ -16,11 +16,11 @@ > {{ project.name }} - - diff --git a/src/app/modules/login/login.component.html b/src/app/modules/login/login.component.html index f2c5c908d..897b15813 100644 --- a/src/app/modules/login/login.component.html +++ b/src/app/modules/login/login.component.html @@ -4,11 +4,11 @@
-

Please login

+

Please log in

- \ No newline at end of file + diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 728c93d83..057964e78 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -128,7 +128,7 @@
diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.ts b/src/app/modules/shared/components/sidebar/sidebar.component.ts index 416cbca6f..c409a3c64 100644 --- a/src/app/modules/shared/components/sidebar/sidebar.component.ts +++ b/src/app/modules/shared/components/sidebar/sidebar.component.ts @@ -16,11 +16,11 @@ export class SidebarComponent implements OnInit { getItemsSidebar() { this.itemsSidebar = [ - { route: '/time-clock', icon: 'far fa-clock', text: 'Time Clock' }, - { route: '/time-entries', icon: 'far fa-list-alt', text: 'Time Entries' }, + { route: '/time-clock', icon: 'fas fa-clock', text: 'Time Clock' }, + { route: '/time-entries', icon: 'fas fa-list-alt', text: 'Time Entries' }, { route: '/reports', icon: 'fas fa-chart-pie', text: 'Reports' }, - { route: '/activities-management', icon: 'far fa-file-alt', text: 'Activities' }, - { route: '/customers-management', icon: 'fas fa-users-cog', text: 'Customers' }, + { route: '/activities-management', icon: 'fas fa-file-alt', text: ' Activities' }, + { route: '/customers-management', icon: 'fas fa-user', text: 'Customers' }, ]; } } diff --git a/src/app/modules/time-clock/models/time.entry.summary.ts b/src/app/modules/time-clock/models/time.entry.summary.ts new file mode 100644 index 000000000..51580ddbd --- /dev/null +++ b/src/app/modules/time-clock/models/time.entry.summary.ts @@ -0,0 +1,11 @@ +export interface TimeEntriesSummary { + day: TimeDetails; + week: TimeDetails; + month: TimeDetails; +} + +export interface TimeDetails { + hours: string; + minutes: string; + seconds: string; +} diff --git a/src/app/modules/time-clock/pages/time-clock.component.html b/src/app/modules/time-clock/pages/time-clock.component.html index 9cd581ea5..23ae6066c 100644 --- a/src/app/modules/time-clock/pages/time-clock.component.html +++ b/src/app/modules/time-clock/pages/time-clock.component.html @@ -1,49 +1,46 @@ -
+
Summary
+
+
+
+
Day
+

4:22

+
+
+
Week
+

14:25

+
+
+
Month
+

49:32

+
+
+
-
Summary
-
-
-
-
Day
-

4:22

-
-
-
Week
-

14:25

-
-
-
Month
-

49:32

-
-
-
-
-

- {{ username }} clocked in at - {{ activeTimeEntry?.start_date | date:'shortTime' }} -

-

- {{ username }} you did not clock-in yet. -

-
+
+
+

+ You clocked in at + {{ activeTimeEntry?.start_date | date:'shortTime' }} +

+

+ Hi {{ username }}, please select a project to clock-in. +

+
+ +
+
+
+ Project +
+ +
+
+ +
-
-
-
- Project -
- -
-
- -
-
-
-
- -
-
+
+
diff --git a/src/app/modules/time-clock/services/entry.service.spec.ts b/src/app/modules/time-clock/services/entry.service.spec.ts index 01d685a66..2a90889b5 100644 --- a/src/app/modules/time-clock/services/entry.service.spec.ts +++ b/src/app/modules/time-clock/services/entry.service.spec.ts @@ -45,6 +45,15 @@ describe('EntryService', () => { }); }); + it('loads summary with get /summary', () => { + service.baseUrl = 'time-entries'; + + service.summary().subscribe((response) => { + const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/summary`); + expect(loadEntryRequest.request.method).toBe('GET'); + }); + }); + it('loads all Entries', () => { service.baseUrl = 'time-entries'; service.loadEntries().subscribe((response) => { diff --git a/src/app/modules/time-clock/services/entry.service.ts b/src/app/modules/time-clock/services/entry.service.ts index 460264eeb..1c3ec7515 100644 --- a/src/app/modules/time-clock/services/entry.service.ts +++ b/src/app/modules/time-clock/services/entry.service.ts @@ -1,3 +1,4 @@ +import { TimeEntriesSummary } from './../models/time.entry.summary'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; @@ -38,4 +39,10 @@ export class EntryService { const url = `${this.baseUrl}/${idEntry}/stop`; return this.http.post(url, null); } + + summary(): Observable { + const summaryUrl = `${this.baseUrl}/summary`; + return this.http.get(summaryUrl); + } + } diff --git a/src/app/modules/time-entries/pages/time-entries.component.html b/src/app/modules/time-entries/pages/time-entries.component.html index 2a4cb8839..e36952444 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.html +++ b/src/app/modules/time-entries/pages/time-entries.component.html @@ -35,20 +35,20 @@ {{ entry.uri }}