From 78d0dd8f3b4482dfc3f1dbebe4b32d411aeb3bff Mon Sep 17 00:00:00 2001
From: Ricardo Gonzalez <rickgc@gmail.com>
Date: Fri, 16 Oct 2020 21:52:03 +0100
Subject: [PATCH] Use humanizeDuration directly in the template

---
 .../app/modules/dashboard/dashboard.component.html |  3 ++-
 .../app/modules/dashboard/dashboard.component.ts   | 14 ++------------
 .../src/app/modules/detail/detail.component.html   |  4 ++--
 .../src/app/modules/detail/detail.component.ts     | 13 +------------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/webapp/frontend/src/app/modules/dashboard/dashboard.component.html b/webapp/frontend/src/app/modules/dashboard/dashboard.component.html
index 68d42d7..dbb43d4 100644
--- a/webapp/frontend/src/app/modules/dashboard/dashboard.component.html
+++ b/webapp/frontend/src/app/modules/dashboard/dashboard.component.html
@@ -105,7 +105,8 @@
                             </div>
                             <div class="flex flex-col mx-6 my-3 xs:w-full">
                                 <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Powered On</div>
-                                <div class="mt-2 font-medium text-3xl leading-none">{{ humanizeHours(disk.smart_results[0]?.power_on_hours) }}</div>
+                                <div class="mt-2 font-medium text-3xl leading-none" *ngIf="disk.smart_results[0]?.power_on_hours; else unknownPoweredOn">{{ humanizeDuration(disk.smart_results[0]?.power_on_hours * 60 * 60 * 1000, { round: true, largest: 1, units: ['y', 'd', 'h'] }) }}</div>
+                                <ng-template #unknownPoweredOn><div class="mt-2 font-medium text-3xl leading-none">--</div></ng-template>
                             </div>
                         </div>
                     </div>
diff --git a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts
index 0d44110..f6d867c 100644
--- a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts
+++ b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts
@@ -185,16 +185,6 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
         return item.id || index;
     }
 
-    humanizeHours(hours: number, full: boolean = false): string {
-        let duration: string = ''
-        if(!hours){
-            return '--'
-        }
-        if(!full){
-            duration = humanizeDuration(hours * 60 * 60 * 1000, { round: true, largest: 1, units: ['y', 'd', 'h', 'm', 's'] });
-        } else {
-            duration = humanizeDuration(hours * 60 * 60 * 1000, { conjunction: " and ", serialComma: false });
-        }
-        return duration
-    }
+    readonly humanizeDuration = humanizeDuration;
+
 }
diff --git a/webapp/frontend/src/app/modules/detail/detail.component.html b/webapp/frontend/src/app/modules/detail/detail.component.html
index 3b3e322..073ba30 100644
--- a/webapp/frontend/src/app/modules/detail/detail.component.html
+++ b/webapp/frontend/src/app/modules/detail/detail.component.html
@@ -96,8 +96,8 @@
                         <div>{{data.data.smart_results[0]?.power_cycle_count}}</div>
                         <div class="text-secondary text-md">Power Cycle Count</div>
                     </div>
-                    <div class="my-2 col-span-2 lt-md:col-span-1">
-                        <div matTooltip="{{humanizeHours(data.data.smart_results[0]?.power_on_hours, true)}}">{{humanizeHours(data.data.smart_results[0]?.power_on_hours)}}</div>
+                    <div *ngIf="data.data.smart_results[0]?.power_on_hours"  class="my-2 col-span-2 lt-md:col-span-1">
+                        <div matTooltip="{{humanizeDuration(data.data.smart_results[0]?.power_on_hours * 60 * 60 * 1000, { conjunction: ' and ', serialComma: false })}}">{{humanizeDuration(data.data.smart_results[0]?.power_on_hours *60 * 60 * 1000, { round: true, largest: 1, units: ['y', 'd', 'h'] })}}</div>
                         <div class="text-secondary text-md">Powered On</div>
                     </div>
                     <div class="my-2 col-span-2 lt-md:col-span-1">
diff --git a/webapp/frontend/src/app/modules/detail/detail.component.ts b/webapp/frontend/src/app/modules/detail/detail.component.ts
index cd84d38..a4321ec 100644
--- a/webapp/frontend/src/app/modules/detail/detail.component.ts
+++ b/webapp/frontend/src/app/modules/detail/detail.component.ts
@@ -321,17 +321,6 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
         // return item.id || index;
     }
 
+    readonly humanizeDuration = humanizeDuration;
 
-    humanizeHours(hours: number, full: boolean = false): string {
-        let duration: string = ''
-        if(!hours){
-            return '--'
-        }
-        if(!full){
-            duration = humanizeDuration(hours * 60 * 60 * 1000, { round: true, largest: 1, units: ['y', 'd', 'h', 'm', 's'] });
-        } else {
-            duration = humanizeDuration(hours * 60 * 60 * 1000, { conjunction: " and ", serialComma: false });
-        }
-        return duration
-    }
 }