Merge pull request #8 from vesrah/bugfix/12hr-display

Fix hour display on 24hr and 12hr.
SteveDunlap13 · Jan 9, 2018 · b7f2960 · b7f2960
2 parents 726f71c + e4e5c07
commit b7f2960
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/time-control/w-time/w-time.component.ts b/src/time-control/w-time/w-time.component.ts
@@ -55,13 +55,14 @@ export class WTimeComponent implements OnInit {
 
   public formatHour(): string {
 
-    if (this.userTime.hour === 24) {
-      return '00';
-    } else if (this.userTime.hour < 12) {
-      return '0' + String(this.userTime.hour);
-    } else {
-      return String(this.userTime.hour);
+    if (this.userTime.format === 24) {
+      if (this.userTime.hour === 24) {
+        return '00';
+      } else if (this.userTime.hour < 10) {
+        return '0' + String(this.userTime.hour);
+      }
     }
+    return String(this.userTime.hour);
   }
 
   public formatMinute(): string {