fixed code and updated edge cases

Author: marscancode

Sprint-3/5-stretch-extend/format-time.js

@@ -2,12 +2,27 @@
 // Make sure to do the prep before you do the coursework
 // Your task is to write tests for as many different groups of input data or edge cases as you can, and fix any bugs you find.
 
+//function formatAs12HourClock(time) {
+//  const hours = Number(time.slice(0, 2));
+//  if (hours > 12) {
+//    return `${hours - 12}:00 pm`;
+//  }
+//return `${time} am`;
+//}
+
 function formatAs12HourClock(time) {
   const hours = Number(time.slice(0, 2));
-  if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+  const minutes = time.slice(3, 5);
+
+  if (hours === 0) {
+    return `12:${minutes} am`;
+  } else if (hours > 12) {
+    return `${hours - 12}:${minutes} pm`;
+  } else if (hours === 12) {
+    return `12:${minutes} pm`;
+  } else {
+    return `${time} am`;
   }
-  return `${time} am`;
 }
 
 //current = what the code did
@@ -33,41 +48,42 @@ console.assert(
   currentOutput3 === targetOutput3,
   `current output: ${currentOutput3}, target output: ${targetOutput3}`,
 );
-const currentOutput4 = formatAs12HourClock("23:00");
+const currentOutput4 = formatAs12HourClock("23:59");
 const targetOutput4 = "11:59 pm";
 console.assert(
   currentOutput4 === targetOutput4,
   `current output: ${currentOutput4}, target output: ${targetOutput4}`,
 );
 
 const currentOutput5 = formatAs12HourClock("00:00");
-const targetOutput5 = "00:00 am";
+const targetOutput5 = "12:00 am";
 console.assert(
   currentOutput5 === targetOutput5,
   `current output: ${currentOutput5}, target output: ${targetOutput5}`,
 );
 
 const currentOutput6 = formatAs12HourClock("00:30");
-const targetOutput6 = "00:30 am";
+const targetOutput6 = "12:30 am";
 console.assert(
   currentOutput6 === targetOutput6,
   `current output: ${currentOutput6}, target output: ${targetOutput6}`,
 );
 
-const currentOutput7 = formatAs12HourClock("14:00");
-const targetOutput7 = "14:30 pm";
+const currentOutput7 = formatAs12HourClock("14:30");
+const targetOutput7 = "2:30 pm";
 console.assert(
   currentOutput7 === targetOutput7,
   `current output: ${currentOutput7}, target output: ${targetOutput7}`,
 );
 
-const currentOutput7 = formatAs12HourClock("15:00");
-const targetOutput7 = "15:30 pm";
+const currentOutput8 = formatAs12HourClock("15:30");
+const targetOutput8 = "3:30 pm";
 console.assert(
-  currentOutput7 === targetOutput7,
-  `current output: ${currentOutput7}, target output: ${targetOutput7}`,
+  currentOutput8 === targetOutput8,
+  `current output: ${currentOutput8}, target output: ${targetOutput8}`,
 );
-console.log();
+console.log(formatAs12HourClock("14:30"));
+console.log(formatAs12HourClock("15:30"));
 //Edge cases noticed:
 // minutes are ignored in the formatAs12HourClock function after 12 so all pm hours are printed incorrectly because minutes hasn't been stored anywhere in the function.
 // 12 should return 12:00pm but it returns 12:00am in the function