Skip to content

TTL 886 display time zone reports #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 24, 2023
Merged

TTL 886 display time zone reports #988

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2493ec3
feat: TTL-886 add time_zone column to reports
Santiago220991 May 23, 2023
83de7ed
test: TTL-886 add time zone tests
Santiago220991 May 23, 2023
7ae6952
fix: TTL-886 make changes according PR review
Santiago220991 May 23, 2023
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
11 changes: 8 additions & 3 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
[dtTrigger]="dtTrigger"
[dtOptions]="dtOptions"
*ngIf="reportDataSource$ | async as dataSource"
id="time-entries-table"
>
<thead class="thead-blue">
<tr class="d-flex">
Expand All @@ -17,6 +18,7 @@
<th class="col sm-col" title="Duration (hours)">Duration</th>
<th class="col x-sm-col" title="Time in">Time in</th>
<th class="col x-sm-col" title="Time out">Time out</th>
<th class="col sm-col" title="Time zone">Time zone</th>
<th class="col md-col">Project</th>
<th class="hidden-col">Project ID</th>
<th class="col md-col">Customer</th>
Expand All @@ -38,11 +40,14 @@
<td class="col sm-col">
{{ entry.start_date | date: 'MM/dd/yyyy' }}
</td>
<td class="col sm-col">
<td class="col sm-col text-center">
{{ entry.end_date | substractDateDisplayAsFloat: entry.start_date }}
</td>
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date, entry.timezone_offset) }}</td>
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.end_date, entry.timezone_offset) }}</td>
<td class="col x-sm-col text-center">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date, entry.timezone_offset) }}</td>
<td class="col x-sm-col text-center">{{ dateTimeOffset.parseDateTimeOffset(entry.end_date, entry.timezone_offset) }}</td>
<td class="col sm-col text-center">
UTC{{(entry.timezone_offset < 0)? "+": ""}}{{- entry.timezone_offset/60}}
Copy link
Contributor

@mmaquina mmaquina May 23, 2023

Choose a reason for hiding this comment

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

Suggested change
UTC{{(entry.timezone_offset < 0)? "+": ""}}{{- entry.timezone_offset/60}}
UTC{{ (entry.timezone_offset < 0) ? "+" : "" }}{{ - entry.timezone_offset / 60 }}

</td>
<td class="col md-col">{{ entry.project_name }}</td>
<td class="hidden-col">{{ entry.project_id }}</td>
<td class="col md-col">{{ entry.customer_name }}</td>
Expand Down
20 changes: 20 additions & 0 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ describe('Reports Page', () => {
uri: 'custom uri',
project_id: '123',
project_name: 'Time-Tracker',
timezone_offset: 300,
};

const timeEntryList: Entry[] = [
Expand Down Expand Up @@ -253,6 +254,25 @@ describe('Reports Page', () => {
});
});

it('Should render column header called Time Zone', () => {
const table = document.querySelector('table#time-entries-table');
const tableHeaderElements = Array.from(table.getElementsByTagName('th'));
const tableHeaderTitles = tableHeaderElements.map(element => (element.textContent));
expect(tableHeaderTitles).toContain('Time zone');
});

it('Should render a cell content with UTC text', () => {
const TIME_ZONE_CELL_NUMBER = 7;
const TABLE_ROW_NUMBER = 1;
const table = document.querySelector('table#time-entries-table');
const arrayTableRows = Array.from(table.getElementsByTagName('tr'));
const tablerow = arrayTableRows[TABLE_ROW_NUMBER];
const cells = Array.from(tablerow.getElementsByTagName('td'));
const cell = cells[TIME_ZONE_CELL_NUMBER].textContent;
expect(cell).toContain('UTC-5');
});


afterEach(() => {
fixture.destroy();
});
Expand Down
1 change: 1 addition & 0 deletions src/app/modules/shared/models/entry.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export interface Entry {

customer_id?: string;
customer_name?: string;
timezone_offset?: number;
}

export interface NewEntry {
Expand Down