resolved conflicts

src/app/app.module.ts

@@ -15,7 +15,6 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
 import { MatIconModule } from '@angular/material/icon';
-import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatListModule } from '@angular/material/list';
 import { MatMomentDateModule } from '@angular/material-moment-adapter';
 import { NgxPaginationModule } from 'ngx-pagination';
@@ -178,7 +177,6 @@ const maskConfig: Partial<IConfig> = {
     UiSwitchModule,
     DragDropModule,
     MatIconModule,
-    MatCheckboxModule,
     MatListModule,
     StoreModule.forRoot(reducers, {
       metaReducers,

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

@@ -141,21 +141,21 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
     return column === durationColumnIndex ? moment.duration(dataFormated).asHours().toFixed(2) : dataFormated;
   }
 
-  sumDates(arrayData: Entry[]): TotalHours{
+  sumDates(arrayData: Entry[]): TotalHours {
     this.resultSum = new TotalHours();
     const arrayDurations = new Array();
     arrayData.forEach(entry => {
       const start = moment(entry.end_date).diff(moment(entry.start_date));
       arrayDurations.push(moment.utc(start).format('HH:mm:ss'));
     });
 
-    let totalDurations = arrayDurations.slice(1)
-    .reduce((prev, cur) => {
-      return prev.add(cur);
-    },
-    moment.duration(arrayDurations[0]));
-    let daysInHours = totalDurations.days() * 24;
-    this.resultSum.hours=totalDurations.hours() + daysInHours;
+    const totalDurations = arrayDurations.slice(1)
+      .reduce((prev, cur) => {
+        return prev.add(cur);
+      },
+        moment.duration(arrayDurations[0]));
+    const daysInHours = totalDurations.days() * 24;
+    this.resultSum.hours = totalDurations.hours() + daysInHours;
     this.resultSum.minutes = totalDurations.minutes();
     this.resultSum.seconds = totalDurations.seconds();
     return this.resultSum;