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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<th class="col md-col">User email</th>
<th class="col sm-col">Date</th>
<th class="col sm-col">Duration (hours)</th>
<th class="col sm-col">Time in</th>
<th class="col sm-col">Time out</th>
<th class="col md-col">Project</th>
<th class="col lg-col">Project ID</th>
<th class="col md-col">Customer</th>
Expand All @@ -26,6 +28,8 @@
<td class="col md-col multiline-col"> {{ entry.owner_email }} </td>
<td class="col sm-col"> {{ entry.start_date | date: 'MM/dd/yyyy' }} </td>
<td class="col sm-col"> {{ entry.end_date | substractDate: entry.start_date }} </td>
<td class="col sm-col"> {{ entry.start_date | date: 'HH:mm' }} </td>
<td class="col sm-col"> {{ entry.end_date | date: 'HH:mm' }} </td>
<td class="col md-col"> {{ entry.project_name }} </td>
<td class="col md-col"> {{ entry.project_id }} </td>
<td class="col md-col"> {{ entry.customer_name }} </td>
Expand Down
2 changes: 0 additions & 2 deletions src/app/modules/time-clock/services/entry.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ import * as moment from 'moment';
describe('EntryService', () => {
let service: EntryService;
let httpMock: HttpTestingController;
let datePipe: DatePipe;

beforeEach(() => {
TestBed.configureTestingModule({imports: [HttpClientTestingModule], providers: [DatePipe]});
service = TestBed.inject(EntryService);
httpMock = TestBed.inject(HttpTestingController);
datePipe = TestBed.inject(DatePipe);
service.baseUrl = 'time-entries';
});

Expand Down
4 changes: 3 additions & 1 deletion src/app/modules/time-clock/store/entry.selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ export const getCreateError = createSelector(getEntryState, (state: EntryState)
});

export const getUpdateError = createSelector(getEntryState, (state: EntryState) => {
return state.updateError;
if (state) {
return state.updateError;
}
});
export const getStatusMessage = createSelector(getEntryState, (state: EntryState) => state.message);

Expand Down