Merge branch 'main' of https://github.com/gramcracker40/GreenWatch

gramcracker40 · May 6, 2023 · e28ba71 · e28ba71
2 parents 302cb7e + 08e6be9
commit e28ba71
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/UserInterface/js/utilities.js b/UserInterface/js/utilities.js
@@ -51,11 +51,13 @@ export function toStandardTime(_hours) {
   let hours = _hours;
   let amPm = '';
   if (hours > 12) {
-    amPm = 'AM';
+    amPm = 'PM';
     hours -= 12;
   } else if (hours == 0) {
     amPm = 'AM';
     hours = "12";
+  }else if (hours < 12) {
+    amPm = 'AM';
   }else{
     amPm = 'PM';
   }