fix: #403 display time diff complete

Author: enriquezrene

src/app/modules/shared/pipes/substract-date/substract-date.pipe.spec.ts

@@ -6,13 +6,22 @@ describe('SubstractDatePipe', () => {
     expect(pipe).toBeTruthy();
   });
 
-  it('returns the date diff', () => {
+  it('returns the date diff using hh:mm', () => {
     const fromDate = new Date('2011-04-11T10:20:40Z');
     const substractDate = new Date('2011-04-11T08:00:30Z');
 
     const diff = new SubstractDatePipe().transform(fromDate, substractDate);
 
-    expect(diff).toBe('02:20:10');
+    expect(diff).toBe('02:20');
+  });
+
+  it('returns the date diff including seconds if difference is less than a minute', () => {
+    const fromDate = new Date('2011-04-11T10:20:40Z');
+    const substractDate = new Date('2011-04-11T10:20:30Z');
+
+    const diff = new SubstractDatePipe().transform(fromDate, substractDate);
+
+    expect(diff).toBe('00:00:10');
   });
 
   it('returns --:-- if fromDate is null', () => {

src/app/modules/shared/pipes/substract-date/substract-date.pipe.ts

@@ -13,9 +13,16 @@ export class SubstractDatePipe implements PipeTransform {
     }
 
     const startDate = moment(substractDate, 'YYYY-MM-DD HH:mm:ss');
-    const endDate = moment(fromDate, 'YYYY-MM-DD HH:mm:ss');
-    const duration: any = moment.duration(endDate.diff(startDate));
-    return `${this.formatTime(duration._data.hours)}:${this.formatTime(duration._data.minutes)}:${this.formatTime(duration._data.seconds)}`;
+    let endDate = moment(fromDate, 'YYYY-MM-DD HH:mm:ss');
+    let duration: moment.Duration = moment.duration(endDate.diff(startDate));
+
+    if (duration.asSeconds() > 60) {
+      endDate = endDate.add(1, 'minute').startOf('minute');
+      duration = moment.duration(endDate.diff(startDate));
+      return `${ this.formatTime(duration.hours())}:${this.formatTime(duration.minutes()) }`;
+    } else {
+      return `${ this.formatTime(duration.hours())}:${this.formatTime(duration.minutes())}:${this.formatTime(duration.seconds())}`;
+    }
   }
 
   formatTime(time: number): string {

src/app/modules/time-entries/pages/time-entries.component.html

@@ -30,7 +30,7 @@
     <tbody>
       <tr class="d-flex" *ngFor="let entry of dataByMonth">
         <td class="col">{{ entry.start_date | date: 'dd/MM/yyyy' }}</td>
-        <td class="col">{{ entry.start_date | date: 'shortTime' }} - {{ entry.end_date | date: 'shortTime' }}</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.project_name }}</td>
         <td class="col">{{ entry.activity_name }}</td>