diff --git a/src/app/modules/time-clock/pages/time-clock.component.spec.ts b/src/app/modules/time-clock/pages/time-clock.component.spec.ts
index b4b17dc0d..5fa3d8e53 100644
--- a/src/app/modules/time-clock/pages/time-clock.component.spec.ts
+++ b/src/app/modules/time-clock/pages/time-clock.component.spec.ts
@@ -1,5 +1,5 @@
-import { EntryActionTypes, StopTimeEntryRunning } from './../store/entry.actions';
-import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
+import { StopTimeEntryRunning } from './../store/entry.actions';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { ToastrService } from 'ngx-toastr';
diff --git a/src/app/modules/time-clock/pipes/time-details.pipe.spec.ts b/src/app/modules/time-clock/pipes/time-details.pipe.spec.ts
new file mode 100644
index 000000000..59c9bb1c9
--- /dev/null
+++ b/src/app/modules/time-clock/pipes/time-details.pipe.spec.ts
@@ -0,0 +1,13 @@
+import { TimeDetailsPipe } from './time-details.pipe';
+
+describe('TimeDetailsPipe', () => {
+ it('create an instance', () => {
+ const pipe = new TimeDetailsPipe();
+ expect(pipe).toBeTruthy();
+ });
+
+ it('adds a 0 if has one number', () => {
+ const pipe = new TimeDetailsPipe();
+ expect(pipe.formatAsTwoDigit('5')).toBe('05');
+ });
+});
diff --git a/src/app/modules/time-clock/pipes/time-details.pipe.ts b/src/app/modules/time-clock/pipes/time-details.pipe.ts
new file mode 100644
index 000000000..d99a7e660
--- /dev/null
+++ b/src/app/modules/time-clock/pipes/time-details.pipe.ts
@@ -0,0 +1,19 @@
+import { TimeDetails } from '../models/time.entry.summary';
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'timeDetails'
+})
+export class TimeDetailsPipe implements PipeTransform {
+
+ transform(value: TimeDetails): string {
+ return `${this.formatAsTwoDigit(value.hours)}:${this.formatAsTwoDigit(value.minutes)}` ;
+ }
+
+ formatAsTwoDigit(time: string): string {
+ // tslint:disable-next-line:no-construct
+ const stringLength = new String(time).length;
+ const formattedTime = (stringLength === 1) ? `0${time}` : time;
+ return formattedTime;
+ }
+}
diff --git a/src/app/modules/time-clock/services/entry.service.ts b/src/app/modules/time-clock/services/entry.service.ts
index 1c3ec7515..e3834d144 100644
--- a/src/app/modules/time-clock/services/entry.service.ts
+++ b/src/app/modules/time-clock/services/entry.service.ts
@@ -1,4 +1,4 @@
-import { TimeEntriesSummary } from './../models/time.entry.summary';
+import { TimeEntriesSummary } from '../models/time.entry.summary';
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
diff --git a/src/app/modules/time-clock/store/entry.actions.spec.ts b/src/app/modules/time-clock/store/entry.actions.spec.ts
index c5b6ce429..64535d610 100644
--- a/src/app/modules/time-clock/store/entry.actions.spec.ts
+++ b/src/app/modules/time-clock/store/entry.actions.spec.ts
@@ -1,6 +1,17 @@
import * as actions from './entry.actions';
describe('Actions for Entries', () => {
+
+ it('LoadEntriesSummaryFail type is EntryActionTypes.LOAD_ENTRIES_SUMMARY_FAIL', () => {
+ const action = new actions.LoadEntriesSummaryFail();
+ expect(action.type).toEqual(actions.EntryActionTypes.LOAD_ENTRIES_SUMMARY_FAIL);
+ });
+
+ it('LoadEntriesSummarySuccess type is EntryActionTypes.LOAD_ENTRIES_SUMMARY_SUCCESS', () => {
+ const action = new actions.LoadEntriesSummarySuccess(null);
+ expect(action.type).toEqual(actions.EntryActionTypes.LOAD_ENTRIES_SUMMARY_SUCCESS);
+ });
+
it('LoadActiveEntrySuccess type is EntryActionTypes.LOAD_ACTIVE_ENTRY_SUCCESS', () => {
const loadActiveEntrySuccess = new actions.LoadActiveEntrySuccess([]);
expect(loadActiveEntrySuccess.type).toEqual(actions.EntryActionTypes.LOAD_ACTIVE_ENTRY_SUCCESS);
diff --git a/src/app/modules/time-clock/store/entry.actions.ts b/src/app/modules/time-clock/store/entry.actions.ts
index 3342371bb..c7102f556 100644
--- a/src/app/modules/time-clock/store/entry.actions.ts
+++ b/src/app/modules/time-clock/store/entry.actions.ts
@@ -1,7 +1,11 @@
+import { TimeEntriesSummary } from '../models/time.entry.summary';
import { Action } from '@ngrx/store';
import { NewEntry, Entry } from '../../shared/models';
export enum EntryActionTypes {
+ LOAD_ENTRIES_SUMMARY = '[Entry] LOAD_ENTRIES_SUMMARY',
+ LOAD_ENTRIES_SUMMARY_SUCCESS = '[Entry] LOAD_ENTRIES_SUMMARY_SUCCESS',
+ LOAD_ENTRIES_SUMMARY_FAIL = '[Entry] LOAD_ENTRIES_SUMMARY_FAIL',
LOAD_ACTIVE_ENTRY = '[Entry] LOAD_ACTIVE_ENTRY',
LOAD_ACTIVE_ENTRY_SUCCESS = '[Entry] LOAD_ACTIVE_ENTRY_SUCCESS',
LOAD_ACTIVE_ENTRY_FAIL = '[Entry] LOAD_ACTIVE_ENTRY_FAIL',
@@ -25,6 +29,19 @@ export enum EntryActionTypes {
CLEAN_ENTRY_UPDATE_ERROR = '[Entry] CLEAN_ENTRY_UPDATE_ERROR',
}
+export class LoadEntriesSummary implements Action {
+ public readonly type = EntryActionTypes.LOAD_ENTRIES_SUMMARY;
+}
+
+export class LoadEntriesSummarySuccess implements Action {
+ readonly type = EntryActionTypes.LOAD_ENTRIES_SUMMARY_SUCCESS;
+ constructor(readonly payload: TimeEntriesSummary) {}
+}
+
+export class LoadEntriesSummaryFail implements Action {
+ readonly type = EntryActionTypes.LOAD_ENTRIES_SUMMARY_FAIL;
+}
+
export class LoadActiveEntry implements Action {
public readonly type = EntryActionTypes.LOAD_ACTIVE_ENTRY;
}
@@ -137,6 +154,9 @@ export class DefaultEntry implements Action {
}
export type EntryActions =
+ | LoadEntriesSummary
+ | LoadEntriesSummarySuccess
+ | LoadEntriesSummaryFail
| LoadActiveEntry
| LoadActiveEntrySuccess
| LoadActiveEntryFail
diff --git a/src/app/modules/time-clock/store/entry.effects.ts b/src/app/modules/time-clock/store/entry.effects.ts
index 03be222fd..437528df2 100644
--- a/src/app/modules/time-clock/store/entry.effects.ts
+++ b/src/app/modules/time-clock/store/entry.effects.ts
@@ -11,6 +11,19 @@ import * as actions from './entry.actions';
export class EntryEffects {
constructor(private actions$: Actions, private entryService: EntryService, private toastrService: ToastrService) {}
+ @Effect()
+ loadEntriesSummary$: Observable
= this.actions$.pipe(
+ ofType(actions.EntryActionTypes.LOAD_ENTRIES_SUMMARY),
+ mergeMap(() =>
+ this.entryService.summary().pipe(
+ map((response) => {
+ return new actions.LoadEntriesSummarySuccess(response);
+ }),
+ catchError((error) => of(new actions.LoadEntriesSummaryFail()))
+ )
+ )
+ );
+
@Effect()
loadActiveEntry$: Observable = this.actions$.pipe(
ofType(actions.EntryActionTypes.LOAD_ACTIVE_ENTRY),
diff --git a/src/app/modules/time-clock/store/entry.reducer.spec.ts b/src/app/modules/time-clock/store/entry.reducer.spec.ts
index e89f40f4c..7fb991895 100644
--- a/src/app/modules/time-clock/store/entry.reducer.spec.ts
+++ b/src/app/modules/time-clock/store/entry.reducer.spec.ts
@@ -1,8 +1,13 @@
+import { TimeEntriesSummary, TimeDetails } from '../models/time.entry.summary';
import { NewEntry, Entry } from './../../shared/models';
import * as actions from './entry.actions';
import { entryReducer, EntryState } from './entry.reducer';
describe('entryReducer', () => {
+
+ const emptyTimeDetails: TimeDetails = { hours: '--:--', minutes: '--:--', seconds: '--:--' };
+ const emptyTimeEntriesSummary: TimeEntriesSummary = { day: emptyTimeDetails, week: emptyTimeDetails, month: emptyTimeDetails };
+
const initialState: EntryState = {
active: null,
entryList: [],
@@ -10,7 +15,9 @@ describe('entryReducer', () => {
message: '',
createError: null,
updateError: null,
+ timeEntriesSummary: emptyTimeEntriesSummary
};
+
const entry: NewEntry = {
start_date: 'start-date',
description: 'description',
@@ -18,13 +25,30 @@ describe('entryReducer', () => {
technologies: ['angular', 'typescript'],
};
- const newEntry: Entry = {
- id: '1',
- start_date: new Date(),
- end_date: new Date(),
- activity: '',
- technologies: ['abc', 'abc'],
- };
+ it('sets timeEntriesSummary from action on LOAD_ENTRIES_SUMMARY_SUCCESS', () => {
+ const payload = null;
+ const action = new actions.LoadEntriesSummarySuccess(payload);
+ const state = entryReducer(initialState, action);
+ expect(state.timeEntriesSummary).toBe(payload);
+ });
+
+ it('sets message on LOAD_ACTIVE_ENTRY_FAIL', () => {
+ const action = new actions.LoadActiveEntryFail('');
+ const state = entryReducer(initialState, action);
+ expect(state.message).toBe('Something went wrong fetching active entry!');
+ });
+
+ it('sets timeEntriesSummary as empty on LOAD_ENTRIES_SUMMARY_FAIL', () => {
+ const action = new actions.LoadEntriesSummaryFail();
+ const state = entryReducer(initialState, action);
+ expect(state.timeEntriesSummary).toEqual(emptyTimeEntriesSummary);
+ });
+
+ it('on LOAD_ENTRIES_SUMMARY, is Loading true', () => {
+ const action = new actions.LoadEntriesSummary();
+ const state = entryReducer(initialState, action);
+ expect(state.isLoading).toBe(true);
+ });
it('on Default, ', () => {
const action = new actions.DefaultEntry();
@@ -116,6 +140,7 @@ describe('entryReducer', () => {
it('on DeleteEntrySuccess', () => {
const currentState = {
+ timeEntriesSummary: emptyTimeEntriesSummary,
active: null,
entryList: [
{
@@ -171,6 +196,7 @@ describe('entryReducer', () => {
message: '',
createError: null,
updateError: null,
+ timeEntriesSummary: emptyTimeEntriesSummary
};
const entryUpdated: Entry = {
id: 'id',
diff --git a/src/app/modules/time-clock/store/entry.reducer.ts b/src/app/modules/time-clock/store/entry.reducer.ts
index 23e5327c6..b17ab89f7 100644
--- a/src/app/modules/time-clock/store/entry.reducer.ts
+++ b/src/app/modules/time-clock/store/entry.reducer.ts
@@ -1,3 +1,4 @@
+import { TimeEntriesSummary, TimeDetails } from '../models/time.entry.summary';
import { EntryActions, EntryActionTypes } from './entry.actions';
import { Entry } from '../../shared/models';
@@ -8,19 +9,40 @@ export interface EntryState {
message: string;
createError: boolean;
updateError: boolean;
+ timeEntriesSummary: TimeEntriesSummary;
}
+const emptyTimeDetails: TimeDetails = { hours: '--:--', minutes: '--:--', seconds: '--:--' };
+const emptyTimeEntriesSummary: TimeEntriesSummary = { day: emptyTimeDetails, week: emptyTimeDetails, month: emptyTimeDetails };
+
export const initialState = {
active: null,
entryList: [],
isLoading: false,
message: '',
createError: null,
- updateError: null
+ updateError: null,
+ timeEntriesSummary: emptyTimeEntriesSummary,
};
export const entryReducer = (state: EntryState = initialState, action: EntryActions) => {
switch (action.type) {
+ case EntryActionTypes.LOAD_ENTRIES_SUMMARY: {
+ return {
+ ...state,
+ isLoading: true,
+ };
+ }
+ case EntryActionTypes.LOAD_ENTRIES_SUMMARY_SUCCESS:
+ return {
+ ...state,
+ timeEntriesSummary: action.payload,
+ };
+ case EntryActionTypes.LOAD_ENTRIES_SUMMARY_FAIL:
+ return {
+ ...state,
+ timeEntriesSummary: emptyTimeEntriesSummary,
+ };
case EntryActionTypes.LOAD_ACTIVE_ENTRY: {
return {
...state,
@@ -33,7 +55,6 @@ export const entryReducer = (state: EntryState = initialState, action: EntryActi
active: action.payload,
isLoading: false,
};
-
case EntryActionTypes.LOAD_ACTIVE_ENTRY_FAIL: {
return {
...state,
@@ -173,14 +194,14 @@ export const entryReducer = (state: EntryState = initialState, action: EntryActi
case EntryActionTypes.CLEAN_ENTRY_CREATE_ERROR: {
return {
...state,
- createError: null
+ createError: null
};
}
case EntryActionTypes.CLEAN_ENTRY_UPDATE_ERROR: {
return {
...state,
- updateError: null
+ updateError: null
};
}
diff --git a/src/app/modules/time-clock/store/entry.selectors.ts b/src/app/modules/time-clock/store/entry.selectors.ts
index 9282e5861..9531acac2 100644
--- a/src/app/modules/time-clock/store/entry.selectors.ts
+++ b/src/app/modules/time-clock/store/entry.selectors.ts
@@ -4,6 +4,10 @@ import { EntryState } from './entry.reducer';
const getEntryState = createFeatureSelector('entries');
+export const getEntriesSummary = createSelector(getEntryState, (state: EntryState) => {
+ return state.timeEntriesSummary;
+});
+
export const getActiveTimeEntry = createSelector(getEntryState, (state: EntryState) => {
return state.active;
});