Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
feat: TT-125 show customer field in time entries table
  • Loading branch information
israteneda committed Jan 27, 2021
commit 4e4b8ef17d0df37b15625cba7eaa151444bb053a
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<th class="col">Date</th>
<th class="col">Time in - out</th>
<th class="col">Duration</th>
<th class="col">Customer</th>
<th class="col">Project</th>
<th class="col">Activity</th>
<th class="col"></th>
Expand All @@ -33,6 +34,7 @@
<td class="col">{{ entry.start_date | date: 'MM/dd/yyyy' }}</td>
<td class="col">{{ entry.start_date | date: 'HH:mm' }} - {{ entry.end_date | date: 'HH:mm' }}</td>
<td class="col">{{ entry.end_date | substractDate: entry.start_date }}</td>
<td class="col">{{ entry.customer_name }}</td>
<td class="col">{{ entry.project_name }}</td>
<td class="col">{{ entry.activity_name }}</td>
<td class="col">
Expand Down
60 changes: 51 additions & 9 deletions src/app/modules/time-entries/pages/time-entries.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { TimeEntriesComponent } from './time-entries.component';
import { ActionsSubject } from '@ngrx/store';
import { EntryActionTypes } from './../../time-clock/store/entry.actions';
import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
import { DebugElement } from '@angular/core';

describe('TimeEntriesComponent', () => {
type Merged = TechnologyState & ProjectState & EntryState;
Expand Down Expand Up @@ -57,6 +58,7 @@ describe('TimeEntriesComponent', () => {
project_name: 'Time-tracker',
start_date: new Date('2020-02-05T15:36:15.887Z'),
end_date: new Date('2020-02-05T18:36:15.887Z'),
customer_name: 'ioet Inc.',
activity_id: 'development',
technologies: ['Angular', 'TypeScript'],
description: 'No comments',
Expand Down Expand Up @@ -375,19 +377,59 @@ describe('TimeEntriesComponent', () => {
component.entry = null;
component.entryId = null;
const lastEntry = {
description : 'testing is fun',
technologies : [],
uri : 'http://testing.is.fun',
activity_id : 'sss',
project_id : 'id',
start_date : new Date(new Date().setHours(0, 0, 0, 0)),
end_date : new Date(new Date().setHours(0, 0, 0, 0))
description: 'testing is fun',
technologies: [],
uri: 'http://testing.is.fun',
activity_id: 'sss',
project_id: 'id',
start_date: new Date(new Date().setHours(0, 0, 0, 0)),
end_date: new Date(new Date().setHours(0, 0, 0, 0))
Comment on lines +380 to +386
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

};
state.timeEntriesDataSource.data = [ lastEntry ];
state.timeEntriesDataSource.data = [lastEntry];
mockEntriesSelector = store.overrideSelector(getTimeEntriesDataSource, state.timeEntriesDataSource);

component.projectSelected({ projectId : 'id'});
component.projectSelected({ projectId: 'id' });
expect(component.entry).toEqual(lastEntry);
}));

it('when the data source is loaded, the entry should to have customer_name field', waitForAsync(() => {
component.timeEntriesDataSource$.subscribe(() => {

fixture.detectChanges();

const expectedColumnTitles = [
'Date',
'Time in - out',
'Duration',
'Customer',
'Project',
'Activity',
'',
];

const columnTitles: string[] = [];

const HTMLTimeEntriesDebugElement: DebugElement = fixture.debugElement;
const HTMLTimeEntriesElement: HTMLElement = HTMLTimeEntriesDebugElement.nativeElement;
const HTMLTimeEntriesTable = HTMLTimeEntriesElement.querySelector('.table') as HTMLTableElement;
const HTMLTableHead = HTMLTimeEntriesTable.rows[0];

Array.from(HTMLTableHead.cells).forEach(columnTitle => {
columnTitles.push(columnTitle.innerText);
});

expect(expectedColumnTitles).toEqual(columnTitles);

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this line in blank

});
}));

it('on success times entries data source charged, the entry should to have customer_name field', waitForAsync(() => {
component.timeEntriesDataSource$.subscribe(dataSource => {
const entryData = dataSource.data[0];

expect(entryData.customer_name).toContain('ioet Inc.');

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this line in blank

});
}));

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this line in blank

});