fix(): times on mobile view

bleenco · Oct 3, 2017 · c3657e6 · c3657e6
1 parent ee7609e
commit c3657e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/app/components/app-build-details/app-build-details.component.html b/src/app/components/app-build-details/app-build-details.component.html
@@ -123,8 +123,10 @@ <h1 class="bold">
                   <span *ngIf="commitMessage" class="commit-message">{{ commitMessage }}</span>
                 </div>
                 <div class="column is-2">
-                  <span class="build-time" *ngIf="status !== 'running'">{{ totalTime | toTime }}</span>
-                  <span class="build-time" *ngIf="status === 'running'">{{ currentTime - totalTime | toTime }}</span>
+                  <span class="build-time" *ngIf="status !== 'running' && maxCompletedJobTime">{{ maxCompletedJobTime | toTime }}</span>
+                  <span class="build-time" *ngIf="status !== 'running' && !maxCompletedJobTime">00:00</span>
+                  <span class="build-time" *ngIf="status === 'running' && maxCompletedJobTime > (currentTime - minRunningJobStartTime)">{{ maxCompletedJobTime | toTime }}</span>
+                  <span class="build-time" *ngIf="status === 'running' && (!maxCompletedJobTime || maxCompletedJobTime <= (currentTime - minRunningJobStartTime))">{{ currentTime - minRunningJobStartTime | toTime }}</span>
 
                   <span class="icon circle restart-build" (click)="restartBuild($event, build.id)" [class.disabled]="processingRequest">
                     <i class="ionicon ion-refresh"></i>

diff --git a/src/app/components/app-build-item/app-build-item.component.html b/src/app/components/app-build-item/app-build-item.component.html
@@ -81,8 +81,9 @@
     </div>
   </div>
   <div class="column is-2">
-    <span class="build-time" *ngIf="build?.status === 'running'">{{ currentTime - build?.startTime | toTime }} </span>
-    <span class="build-time" *ngIf="build?.status !== 'running'">{{ build?.maxTime | toTime }}</span>
+    <span class="build-time" *ngIf="build?.status === 'running' && build?.maxCompletedJobTime && build?.minRunningJobStartTime && build?.maxCompletedJobTime > (currentTime - build?.minRunningJobStartTime)">{{ build?.maxCompletedJobTime | toTime }} </span>
+    <span class="build-time" *ngIf="build?.status === 'running' && build?.maxCompletedJobTime && build?.minRunningJobStartTime && build?.maxCompletedJobTime <= (currentTime - build?.minRunningJobStartTime)">{{ currentTime - build?.minRunningJobStartTime | toTime }} </span>
+    <span class="build-time" *ngIf="build?.status !== 'running' && build?.maxCompletedJobTime">{{ build?.maxCompletedJobTime | toTime }}</span>
 
     <span class="icon circle restart-build" (click)="restartBuild($event, build.id)" [class.disabled]="processingRequest">
       <i class="ionicon ion-refresh"></i>