Update video duration string to show hours when duration greater than or equal 60min...

* Update video duration string to show hours when >= 60min

* Only show hours in duration when relevant

* Fix problem with ternary expression

* Remove accidentally commited package-lock.json

diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts
index 8e46ce44bc9a7507935d0482bed1a1d63eefe07a..50ca9eb9934d11e09252ab14d979dfbbe1bd1fc5 100644 (file)
--- a/client/src/app/shared/video/video.model.ts
+++ b/client/src/app/shared/video/video.model.ts
@@ -42,12 +42,16 @@ export class Video implements VideoServerModel {
   }
 
   private static createDurationString (duration: number) {
-    const minutes = Math.floor(duration / 60)
+    const hours = Math.floor(duration / 3600)
+    const minutes = Math.floor(duration % 3600 / 60)
     const seconds = duration % 60
+
     const minutesPadding = minutes >= 10 ? '' : '0'
     const secondsPadding = seconds >= 10 ? '' : '0'
+    const displayedHours = hours > 0 ? hours.toString() + ':' : ''
 
-    return minutesPadding + minutes.toString() + ':' + secondsPadding + seconds.toString()
+    return displayedHours + minutesPadding +
+        minutes.toString() + ':' + secondsPadding + seconds.toString()
   }
 
   constructor (hash: VideoServerModel) {