Resolving master merge conflicts

src/app/modules/reports/components/time-entries-table/time-entries-table.component.html

@@ -1,4 +1,4 @@
-<div class="row scroll-table mt-5 ml-0 mb-3">
+<div class="row scroll-table mt-5 ml-0">
     <table class="table table-striped mb-0" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(reportDataSource$ | async) as dataSource">
         <thead class="thead-blue">
             <tr class="d-flex">
@@ -20,7 +20,7 @@
         </thead>
         <app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
         <tbody *ngIf="!dataSource.isLoading">
-            <tr class="d-flex" *ngFor="let entry of dataSource.data">
+            <tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
                 <td class="hidden-col">{{ entry.id }}</td>
                 <td class="col md-col">{{ entry.owner_email }}</td>
                 <td class="col sm-col">
@@ -29,8 +29,8 @@
                 <td class="col sm-col">
                     {{ entry.end_date | substractDate: entry.start_date }}
                 </td>
-                <td class="col x-sm-col">{{ entry.start_date | date: 'HH:mm' }}</td>
-                <td class="col x-sm-col">{{ entry.end_date | date: 'HH:mm' }}</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 md-col">{{ entry.project_name }}</td>
                 <td class="hidden-col">{{ entry.project_id }}</td>
                 <td class="col md-col">{{ entry.customer_name }}</td>
@@ -43,8 +43,8 @@
             </a>
                     </ng-container>
                 </td>
-                <td class="col lg-col">{{ entry.description }}</td>
-                <td class="col lg-col">
+                <td class="col lg-scroll">{{ entry.description }}</td>
+                <td class="col lg-scroll">
                     <ng-container *ngIf="entry.technologies.length > 0">
                         <div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
                             {{ technology }}

src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts

@@ -9,6 +9,7 @@ import { DataSource } from 'src/app/modules/shared/models/data-source.model';
 import { EntryState } from '../../../time-clock/store/entry.reducer';
 import { getReportDataSource } from '../../../time-clock/store/entry.selectors';
 import { TotalHours } from '../../models/total-hours-report';
+import { ParseDateTimeOffset } from '../../../shared/formatters/parse-date-time-offset/parse-date-time-offset';
 
 @Component({
   selector: 'app-time-entries-table',
@@ -62,6 +63,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
   reportDataSource$: Observable<DataSource<Entry>>;
   rerenderTableSubscription: Subscription;
   resultSum: TotalHours;
+  dateTimeOffset: ParseDateTimeOffset;
 
   constructor(private store: Store<EntryState>) {
     this.reportDataSource$ = this.store.pipe(select(getReportDataSource));