finished exercises in 4-mandatory-interpret and 5-stretch-extend folders

Author: lintsang

Sprint-2/4-mandatory-interpret/time-format.js

@@ -21,18 +21,18 @@ function formatTimeDisplay(seconds) {
 // Questions
 
 // a) When formatTimeDisplay is called how many times will pad be called?
-// =============> write your answer here
+// =============> It will be called 3 times in line 15.
 
 // Call formatTimeDisplay with an input of 61, now answer the following:
 
 // b) What is the value assigned to num when pad is called for the first time?
-// =============> write your answer here
+// =============> 0 will be assigned to num when pad is called for the first time.
 
 // c) What is the return value of pad is called for the first time?
-// =============> write your answer here
+// =============> 00 will be the return value when pad is called the first time.
 
 // d) What is the value assigned to num when pad is called for the last time in this program?  Explain your answer
-// =============> write your answer here
+// =============> When pad is being called for the last time, it is on line 15 'pad(remainingSeconds)'. So a value of 1 will be assigned to it as remainingSeconds in line 10 was declared as 1.
 
 // e) What is the return value of pad when it is called for the last time in this program?  Explain your answer
-// =============> write your answer here
+// =============> When pad is being called for the last time, it is on line 15 'pad(remainingSeconds)'. So a value of 1 will be assigned to function pad(num) where num is in value of 1. In line 3, as this string is smaller than 2 which means it is only in 1 digit, we add a '0' in front of it. So it return a numString '01' to the line 15.

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

@@ -1,11 +1,21 @@
 // This is the latest solution to the problem from the prep.
 // 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 pad(num) {
+  let numString = num.toString();
+  while (numString.length < 2) {
+    numString = "0" + numString;
+  }
+  return numString;
+}
 
 function formatAs12HourClock(time) {
   const hours = Number(time.slice(0, 2));
+  const minute = pad(Number(time.slice(3,5)));
   if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+    return `${hours - 12}:${minute} pm`;
+  } else if (hours == 12 & minute == '00'){
+    return `${time} pm`;
   }
   return `${time} am`;
 }
@@ -21,5 +31,33 @@ const currentOutput2 = formatAs12HourClock("23:00");
 const targetOutput2 = "11:00 pm";
 console.assert(
   currentOutput2 === targetOutput2,
-  `current output: ${currentOutput2}, target output: ${targetOutput2}`
+  `2current output: ${currentOutput2}, target output: ${targetOutput2}`
 );
+
+const currentOutput3 = formatAs12HourClock("23:59");
+const targetOutput3 = "11:59 pm";
+console.assert(
+  currentOutput3 === targetOutput3,
+  `current output: ${currentOutput3}, target output: ${targetOutput3}`
+);
+
+const currentOutput4 = formatAs12HourClock("01:31");
+const targetOutput4 = "01:31 am";
+console.assert(
+  currentOutput4 === targetOutput4,
+  `current output: ${currentOutput4}, target output: ${targetOutput4}`
+);
+
+const currentOutput5 = formatAs12HourClock("00:00");
+const targetOutput5 = "00:00 am";
+console.assert(
+  currentOutput5 === targetOutput5,
+  `current output: ${currentOutput5}, target output: ${targetOutput5}`
+);
+
+const currentOutput6 = formatAs12HourClock("12:00");
+const targetOutput6 = "12:00 pm";
+console.assert(
+  currentOutput6 === targetOutput6,
+  `current output: ${currentOutput6}, target output: ${targetOutput6}`
+);