From c97a1ab20137157ec215f0cfbce48e680f57f53e Mon Sep 17 00:00:00 2001 From: John Robinson Date: Mon, 22 Jun 2026 22:23:50 +0100 Subject: [PATCH 1/8] Refactor count.js to clarify variable update and implement initials extraction in initials.js --- Sprint-1/1-key-exercises/1-count.js | 5 +++++ Sprint-1/1-key-exercises/2-initials.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Sprint-1/1-key-exercises/1-count.js b/Sprint-1/1-key-exercises/1-count.js index 117bcb2b6e..a5c2333cff 100644 --- a/Sprint-1/1-key-exercises/1-count.js +++ b/Sprint-1/1-key-exercises/1-count.js @@ -4,3 +4,8 @@ count = count + 1; // Line 1 is a variable declaration, creating the count variable with an initial value of 0 // Describe what line 3 is doing, in particular focus on what = is doing + +// Answer: Line 3 is updating the value of the variable 'count' by adding 1 to its current value. +// The = operator is used to update / assign a new value to the variable 'count'. +// It takes the current value of 'count', adds 1 to it, and then assigns that new value back to 'count'. +// diff --git a/Sprint-1/1-key-exercises/2-initials.js b/Sprint-1/1-key-exercises/2-initials.js index 47561f6175..0a1e1535c0 100644 --- a/Sprint-1/1-key-exercises/2-initials.js +++ b/Sprint-1/1-key-exercises/2-initials.js @@ -5,7 +5,7 @@ let lastName = "Johnson"; // Declare a variable called initials that stores the first character of each string. // This should produce the string "CKJ", but you must not write the characters C, K, or J in the code of your solution. -let initials = ``; - +let initials = `${firstName[0]}${middleName[0]}${lastName[0]}`; +console.log(initials); // https://www.google.com/search?q=get+first+character+of+string+mdn From bd033635a80e0a22ad7fccd34c3c093b0c50b44a Mon Sep 17 00:00:00 2001 From: John Robinson Date: Tue, 23 Jun 2026 00:05:45 +0100 Subject: [PATCH 2/8] Update initials.js to comment out console.log, implement dir and ext variables in paths.js, enhance random.js with detailed explanation, and fix variable declaration issues in mandatory-errors files. --- Sprint-1/1-key-exercises/2-initials.js | 3 ++- Sprint-1/1-key-exercises/3-paths.js | 4 ++-- Sprint-1/1-key-exercises/4-random.js | 6 ++++++ Sprint-1/2-mandatory-errors/0.js | 4 ++-- Sprint-1/2-mandatory-errors/1.js | 2 +- Sprint-1/2-mandatory-errors/2.js | 3 +-- Sprint-1/2-mandatory-errors/3.js | 8 +++++++- Sprint-1/2-mandatory-errors/4.js | 2 +- 8 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Sprint-1/1-key-exercises/2-initials.js b/Sprint-1/1-key-exercises/2-initials.js index 0a1e1535c0..f0a1dc0e11 100644 --- a/Sprint-1/1-key-exercises/2-initials.js +++ b/Sprint-1/1-key-exercises/2-initials.js @@ -6,6 +6,7 @@ let lastName = "Johnson"; // This should produce the string "CKJ", but you must not write the characters C, K, or J in the code of your solution. let initials = `${firstName[0]}${middleName[0]}${lastName[0]}`; -console.log(initials); +// console.log(initials); + // https://www.google.com/search?q=get+first+character+of+string+mdn diff --git a/Sprint-1/1-key-exercises/3-paths.js b/Sprint-1/1-key-exercises/3-paths.js index ab90ebb28e..b96e4cd6a5 100644 --- a/Sprint-1/1-key-exercises/3-paths.js +++ b/Sprint-1/1-key-exercises/3-paths.js @@ -17,7 +17,7 @@ console.log(`The base part of ${filePath} is ${base}`); // Create a variable to store the dir part of the filePath variable // Create a variable to store the ext part of the variable -const dir = ; -const ext = ; +const dir = filePath.slice(0, lastSlashIndex); +const ext = base.slice(base.lastIndexOf(".") + 1); // https://www.google.com/search?q=slice+mdn \ No newline at end of file diff --git a/Sprint-1/1-key-exercises/4-random.js b/Sprint-1/1-key-exercises/4-random.js index 292f83aabb..5bcabc4ee2 100644 --- a/Sprint-1/1-key-exercises/4-random.js +++ b/Sprint-1/1-key-exercises/4-random.js @@ -7,3 +7,9 @@ const num = Math.floor(Math.random() * (maximum - minimum + 1)) + minimum; // Try breaking down the expression and using documentation to explain what it means // It will help to think about the order in which expressions are evaluated // Try logging the value of num and running the program several times to build an idea of what the program is doing + +// Answer: The variable we have created 'num' generates a random number, this is done by using the Math.random() function +// The Math.Random is a built-in function that creates a random number between 0 and 1, but not including 1. The next part +// of the expression multiplies the random number by (100 - 1 + 1) which is 100, this means that the random number will be between 0 and 100. +// Then +1 minimum is added to the random number, this means that the random number will be between 1 and 100. Finally, the Math.floor() +// function is used to round the random number down to the nearest whole number. diff --git a/Sprint-1/2-mandatory-errors/0.js b/Sprint-1/2-mandatory-errors/0.js index cf6c5039f7..65ad3030d6 100644 --- a/Sprint-1/2-mandatory-errors/0.js +++ b/Sprint-1/2-mandatory-errors/0.js @@ -1,2 +1,2 @@ -This is just an instruction for the first activity - but it is just for human consumption -We don't want the computer to run these 2 lines - how can we solve this problem? \ No newline at end of file +//This is just an instruction for the first activity - but it is just for human consumption +//We don't want the computer to run these 2 lines - how can we solve this problem? \ No newline at end of file diff --git a/Sprint-1/2-mandatory-errors/1.js b/Sprint-1/2-mandatory-errors/1.js index 7a43cbea76..031839b47d 100644 --- a/Sprint-1/2-mandatory-errors/1.js +++ b/Sprint-1/2-mandatory-errors/1.js @@ -1,4 +1,4 @@ // trying to create an age variable and then reassign the value by 1 -const age = 33; +let age = 33; age = age + 1; diff --git a/Sprint-1/2-mandatory-errors/2.js b/Sprint-1/2-mandatory-errors/2.js index e09b89831d..a05375657b 100644 --- a/Sprint-1/2-mandatory-errors/2.js +++ b/Sprint-1/2-mandatory-errors/2.js @@ -1,5 +1,4 @@ // Currently trying to print the string "I was born in Bolton" but it isn't working... // what's the error ? - -console.log(`I was born in ${cityOfBirth}`); const cityOfBirth = "Bolton"; +console.log(`I was born in ${cityOfBirth}`); \ No newline at end of file diff --git a/Sprint-1/2-mandatory-errors/3.js b/Sprint-1/2-mandatory-errors/3.js index ec101884db..73445fe93f 100644 --- a/Sprint-1/2-mandatory-errors/3.js +++ b/Sprint-1/2-mandatory-errors/3.js @@ -1,5 +1,11 @@ const cardNumber = 4533787178994213; -const last4Digits = cardNumber.slice(-4); +const last4Digits = cardNumber.toString().slice(-4); + +console.log(last4Digits); + +//The const Last4Digits should store the last 4 characters of the cardNumber and return it + +//The Built in method slice() doesnt work on numbers, only on strings. // The last4Digits variable should store the last 4 digits of cardNumber // However, the code isn't working diff --git a/Sprint-1/2-mandatory-errors/4.js b/Sprint-1/2-mandatory-errors/4.js index 5f86c730bc..ba7d672125 100644 --- a/Sprint-1/2-mandatory-errors/4.js +++ b/Sprint-1/2-mandatory-errors/4.js @@ -1,2 +1,2 @@ -const 12HourClockTime = "8:53pm"; +const 12HourClockTime = "8:53"; const 24hourClockTime = "20:53"; From 460983734ab266c8d5a582c6e082bbe0bd4e19a3 Mon Sep 17 00:00:00 2001 From: John Robinson Date: Tue, 23 Jun 2026 00:43:50 +0100 Subject: [PATCH 3/8] Fix typo in replaceAll function call and update comments for clarity in percentage-change.js --- Sprint-1/3-mandatory-interpret/1-percentage-change.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Sprint-1/3-mandatory-interpret/1-percentage-change.js b/Sprint-1/3-mandatory-interpret/1-percentage-change.js index e24ecb8e18..cd114a797d 100644 --- a/Sprint-1/3-mandatory-interpret/1-percentage-change.js +++ b/Sprint-1/3-mandatory-interpret/1-percentage-change.js @@ -2,7 +2,7 @@ let carPrice = "10,000"; let priceAfterOneYear = "8,543"; carPrice = Number(carPrice.replaceAll(",", "")); -priceAfterOneYear = Number(priceAfterOneYear.replaceAll("," "")); +priceAfterOneYear = Number(priceAfterOneYear.replaceAll(",", "")); const priceDifference = carPrice - priceAfterOneYear; const percentageChange = (priceDifference / carPrice) * 100; @@ -12,11 +12,16 @@ console.log(`The percentage change is ${percentageChange}`); // Read the code and then answer the questions below // a) How many function calls are there in this file? Write down all the lines where a function call is made +// A) 5 in total - lines 4, 5, 10 // b) Run the code and identify the line where the error is coming from - why is this error occurring? How can you fix this problem? +// A) Missing comma in line 5 in function .replaceAll which is causing the error. // c) Identify all the lines that are variable reassignment statements +// A) lines 4 and 5 are variable reassignment statements. // d) Identify all the lines that are variable declarations +// A) Lines 1, 2, 7 and 8 // e) Describe what the expression Number(carPrice.replaceAll(",","")) is doing - what is the purpose of this expression? +// A) The expression is converting the string value of carPrice into a number and removing the commas so that it can be used in a mathematical calculation. \ No newline at end of file From daaaec93291e115d44cd805be977638d01172e37 Mon Sep 17 00:00:00 2001 From: John Robinson Date: Tue, 23 Jun 2026 01:12:02 +0100 Subject: [PATCH 4/8] Enhance comments in 2-time-format.js for clarity and detail --- Sprint-1/3-mandatory-interpret/2-time-format.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sprint-1/3-mandatory-interpret/2-time-format.js b/Sprint-1/3-mandatory-interpret/2-time-format.js index 47d2395587..daee9398ab 100644 --- a/Sprint-1/3-mandatory-interpret/2-time-format.js +++ b/Sprint-1/3-mandatory-interpret/2-time-format.js @@ -12,14 +12,20 @@ console.log(result); // For the piece of code above, read the code and then answer the following questions // a) How many variable declarations are there in this program? +// A) 6 // b) How many function calls are there? +// A) 1 (console.log function) // c) Using documentation, explain what the expression movieLength % 60 represents // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Arithmetic_Operators +// A) This expression is using the modulo operator that finds the remainder of the movieLength after being divided by 60. // d) Interpret line 4, what does the expression assigned to totalMinutes mean? +// A) The expression is calculating the total number of minutes in the movie (not including the remaining seconds). // e) What do you think the variable result represents? Can you think of a better name for this variable? +// A) The variable gives the total length of the movie in hours, minutes, and seconds. A better name for this variable could be "formattedMovieLength". // f) Try experimenting with different values of movieLength. Will this code work for all values of movieLength? Explain your answer +// A) The code would have an error if the user was to inputs a value with commas, letters or as a string. \ No newline at end of file From 2721e61301f385747462d5ae99c3d9b0f2f975b6 Mon Sep 17 00:00:00 2001 From: John Robinson Date: Tue, 23 Jun 2026 09:14:01 +0100 Subject: [PATCH 5/8] Enhance comments in 3-to-pounds.js for detailed step-by-step explanation --- Sprint-1/3-mandatory-interpret/3-to-pounds.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Sprint-1/3-mandatory-interpret/3-to-pounds.js b/Sprint-1/3-mandatory-interpret/3-to-pounds.js index 60c9ace69a..5f2268579d 100644 --- a/Sprint-1/3-mandatory-interpret/3-to-pounds.js +++ b/Sprint-1/3-mandatory-interpret/3-to-pounds.js @@ -25,3 +25,11 @@ console.log(`£${pounds}.${pence}`); // To begin, we can start with // 1. const penceString = "399p": initialises a string variable with the value "399p" +// 2. Line 3: uses the substring method to remove the "p" from the end of the string +// 3. Line 8: the variable paddedPenceNumberString is used to ensure that the string has at least 3 characters, +// if not it will add a zero to the start of the string +// 4. Line 9 - 11: the variable pounds uses the substring method in the same way as line 3 but this time removes the last two characters +// the result is now stored in the const 'pounds' to be used in the final output +// 5. Line 14 - 16: the variable pence also uses the substring method to extract the last two characters from paddedPenceNumberString +// the result is now stored in the const 'pence' to be used in the final output, a '0' is added to the end of the string if there is only one character +// 6. Line 18: the console.log function prints our output - the values stored in the consts 'pounds' and 'pence'. \ No newline at end of file From ccdaaa73a2416e171360960ab6ffbba72234f10e Mon Sep 17 00:00:00 2001 From: John Robinson Date: Tue, 23 Jun 2026 17:01:12 +0100 Subject: [PATCH 6/8] Update 12HourClockTime format to include AM/PM designation --- Sprint-1/2-mandatory-errors/4.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sprint-1/2-mandatory-errors/4.js b/Sprint-1/2-mandatory-errors/4.js index ba7d672125..d29740f2ed 100644 --- a/Sprint-1/2-mandatory-errors/4.js +++ b/Sprint-1/2-mandatory-errors/4.js @@ -1,2 +1,2 @@ -const 12HourClockTime = "8:53"; +const 12HourClockTime = "8:53 pm"; const 24hourClockTime = "20:53"; From 0823433d53ea4af1351599d61901208297207650 Mon Sep 17 00:00:00 2001 From: John Robinson Date: Wed, 24 Jun 2026 00:13:40 +0100 Subject: [PATCH 7/8] Fix variable naming for consistency in 4.js --- Sprint-1/2-mandatory-errors/4.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sprint-1/2-mandatory-errors/4.js b/Sprint-1/2-mandatory-errors/4.js index d29740f2ed..2228f43707 100644 --- a/Sprint-1/2-mandatory-errors/4.js +++ b/Sprint-1/2-mandatory-errors/4.js @@ -1,2 +1,2 @@ -const 12HourClockTime = "8:53 pm"; -const 24hourClockTime = "20:53"; +const TwelveHourClockTime = "8:53 pm"; +const TwentyFourHourClockTime = "20:53"; From 874f89024ec20ecb88f29002cb665ada7cca4554 Mon Sep 17 00:00:00 2001 From: John Robinson Date: Mon, 6 Jul 2026 17:06:38 +0100 Subject: [PATCH 8/8] feat: complete sprint 2 coursework cleanly --- Sprint-2/1-key-errors/0.js | 12 +++---- Sprint-2/1-key-errors/1.js | 12 +++++-- Sprint-2/1-key-errors/2.js | 13 +++++--- Sprint-2/2-mandatory-debug/0.js | 13 ++++++-- Sprint-2/2-mandatory-debug/1.js | 15 ++++++--- Sprint-2/2-mandatory-debug/2.js | 26 ++++++++++----- Sprint-2/3-mandatory-implement/1-bmi.js | 8 +++-- Sprint-2/3-mandatory-implement/2-cases.js | 8 +++++ Sprint-2/3-mandatory-implement/3-to-pounds.js | 24 ++++++++++++++ Sprint-2/4-mandatory-interpret/time-format.js | 10 +++--- Sprint-2/5-stretch-extend/format-time.js | 32 +++++++++++++++++-- 11 files changed, 135 insertions(+), 38 deletions(-) diff --git a/Sprint-2/1-key-errors/0.js b/Sprint-2/1-key-errors/0.js index 653d6f5a07..bfe01a1be3 100644 --- a/Sprint-2/1-key-errors/0.js +++ b/Sprint-2/1-key-errors/0.js @@ -1,13 +1,13 @@ // Predict and explain first... -// =============> write your prediction here +// A) Error message - str has already been declared // call the function capitalise with a string input // interpret the error message and figure out why an error is occurring +// =============> write your new code here + function capitalise(str) { - let str = `${str[0].toUpperCase()}${str.slice(1)}`; - return str; + let capitalisedStr = `${str[0].toUpperCase()}${str.slice(1)}`; + return capitalisedStr; } - -// =============> write your explanation here -// =============> write your new code here +console.log(capitalise("hello there")); \ No newline at end of file diff --git a/Sprint-2/1-key-errors/1.js b/Sprint-2/1-key-errors/1.js index f2d56151f4..f70c301fcf 100644 --- a/Sprint-2/1-key-errors/1.js +++ b/Sprint-2/1-key-errors/1.js @@ -1,20 +1,26 @@ // Predict and explain first... // Why will an error occur when this program runs? -// =============> write your prediction here +// =============> Decimal number is declared twice in the same scope // Try playing computer with the example to work out what is going on -function convertToPercentage(decimalNumber) { +/*function convertToPercentage(decimalNumber) { const decimalNumber = 0.5; const percentage = `${decimalNumber * 100}%`; return percentage; } -console.log(decimalNumber); +console.log(decimalNumber);*/ // =============> write your explanation here +// Decimal number is declared twice & also set as a parameter which causes the syntaxError. // Finally, correct the code to fix the problem // =============> write your new code here +function convertToPercentage(decimalNumber) { + const percentage = `${decimalNumber * 100}%`; + return percentage; +} +console.log(convertToPercentage(0.5)); \ No newline at end of file diff --git a/Sprint-2/1-key-errors/2.js b/Sprint-2/1-key-errors/2.js index aad57f7cfe..4408413cc1 100644 --- a/Sprint-2/1-key-errors/2.js +++ b/Sprint-2/1-key-errors/2.js @@ -1,20 +1,25 @@ // Predict and explain first BEFORE you run any code... +//The input to the function is a number, but the function is trying to use that number as a variable name. // this function should square any number but instead we're going to get an error // =============> write your prediction of the error here -function square(3) { +/*function square(3) { return num * num; -} +}*/ // =============> write the error message here +//SyntaxError: Unexpected number // =============> explain this error message here +// Function parameter '3' is a literal value, not a parameter. Javascript expects a text name for the parameter. -// Finally, correct the code to fix the problem -// =============> write your new code here +// Finally, correct the code to fix the problem +function square(num) { + return num * num; +} diff --git a/Sprint-2/2-mandatory-debug/0.js b/Sprint-2/2-mandatory-debug/0.js index b27511b417..be96062248 100644 --- a/Sprint-2/2-mandatory-debug/0.js +++ b/Sprint-2/2-mandatory-debug/0.js @@ -1,6 +1,7 @@ // Predict and explain first... -// =============> write your prediction here +// =============> Error because console.log is within the multiply function does not return a value + function multiply(a, b) { console.log(a * b); @@ -8,7 +9,13 @@ function multiply(a, b) { console.log(`The result of multiplying 10 and 32 is ${multiply(10, 32)}`); -// =============> write your explanation here +// =============> The console.log inside the function multiply is read first & prints the result of multiplying 10 and 32 - 320, to the console. +// But the aim of the function which was tryin to return it in the template literals is left as undefined because the multiply function does not return a value +// // Finally, correct the code to fix the problem -// =============> write your new code here + + +function multiply(a, b) { + return a * b; +} diff --git a/Sprint-2/2-mandatory-debug/1.js b/Sprint-2/2-mandatory-debug/1.js index 37cedfbcfd..8f24ef872a 100644 --- a/Sprint-2/2-mandatory-debug/1.js +++ b/Sprint-2/2-mandatory-debug/1.js @@ -1,13 +1,20 @@ // Predict and explain first... -// =============> write your prediction here +// =============> The function won't return the sum of a and b because the return is between the +// return statement and the expression a + b. -function sum(a, b) { +/*function sum(a, b) { return; a + b; } -console.log(`The sum of 10 and 32 is ${sum(10, 32)}`); +console.log(`The sum of 10 and 32 is ${sum(10, 32)}`);*/ + +// =============> returns undefined because the empty return tells the function to return nothing, so the function returns undefined. -// =============> write your explanation here // Finally, correct the code to fix the problem // =============> write your new code here +function sum(a, b) { + return a + b; +} + +console.log(`The sum of 10 and 32 is ${sum(10, 32)}`); diff --git a/Sprint-2/2-mandatory-debug/2.js b/Sprint-2/2-mandatory-debug/2.js index 57d3f5dc35..525a94e9f1 100644 --- a/Sprint-2/2-mandatory-debug/2.js +++ b/Sprint-2/2-mandatory-debug/2.js @@ -1,9 +1,10 @@ // Predict and explain first... // Predict the output of the following code: -// =============> Write your prediction here +// It will return the last digit of the number 103 which is 3 because the function getLastDigit is using the variable num which is set +// in the const num = 103; and not the parameter passed to the function getLastDigit. -const num = 103; +/*const num = 103; function getLastDigit() { return num.toString().slice(-1); @@ -11,14 +12,23 @@ function getLastDigit() { console.log(`The last digit of 42 is ${getLastDigit(42)}`); console.log(`The last digit of 105 is ${getLastDigit(105)}`); -console.log(`The last digit of 806 is ${getLastDigit(806)}`); +console.log(`The last digit of 806 is ${getLastDigit(806)}`);*/ // Now run the code and compare the output to your prediction -// =============> write the output here +// =============> The last digit of 42 is 3 +//The last digit of 105 is 3 +// The last digit of 806 is 3 + // Explain why the output is the way it is -// =============> write your explanation here +// =============> as explained above, the const num = 103; is being used in the function getLastDigit instead of the parameter passed to the function. // Finally, correct the code to fix the problem -// =============> write your new code here -// This program should tell the user the last digit of each number. -// Explain why getLastDigit is not working properly - correct the problem +function getLastDigit(num) { + return num.toString().slice(-1); +} + +console.log(`The last digit of 42 is ${getLastDigit(42)}`); +console.log(`The last digit of 105 is ${getLastDigit(105)}`); +console.log(`The last digit of 806 is ${getLastDigit(806)}`); + + diff --git a/Sprint-2/3-mandatory-implement/1-bmi.js b/Sprint-2/3-mandatory-implement/1-bmi.js index 17b1cbde1b..fe59025960 100644 --- a/Sprint-2/3-mandatory-implement/1-bmi.js +++ b/Sprint-2/3-mandatory-implement/1-bmi.js @@ -15,5 +15,9 @@ // It should return their Body Mass Index to 1 decimal place function calculateBMI(weight, height) { - // return the BMI of someone based off their weight and height -} \ No newline at end of file + const heightSquared = height * height; + const bmi = weight / heightSquared; + return bmi.toFixed(1); +} + +console.log(calculateBMI(70, 1.73)); \ No newline at end of file diff --git a/Sprint-2/3-mandatory-implement/2-cases.js b/Sprint-2/3-mandatory-implement/2-cases.js index 5b0ef77ad9..c88b31e329 100644 --- a/Sprint-2/3-mandatory-implement/2-cases.js +++ b/Sprint-2/3-mandatory-implement/2-cases.js @@ -14,3 +14,11 @@ // You will need to come up with an appropriate name for the function // Use the MDN string documentation to help you find a solution // This might help https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase + +function toUpperSnakeCase(inputString) { + const upperCaseString = inputString.toUpperCase(); + const upperSnakeCaseString = upperCaseString.replace(/ /g, "_"); + return upperSnakeCaseString; +} + +console.log(toUpperSnakeCase("lord of the rings")); \ No newline at end of file diff --git a/Sprint-2/3-mandatory-implement/3-to-pounds.js b/Sprint-2/3-mandatory-implement/3-to-pounds.js index 6265a1a703..83948023a0 100644 --- a/Sprint-2/3-mandatory-implement/3-to-pounds.js +++ b/Sprint-2/3-mandatory-implement/3-to-pounds.js @@ -4,3 +4,27 @@ // You will need to declare a function called toPounds with an appropriately named parameter. // You should call this function a number of times to check it works for different inputs + +function toPounds(penceString) { + const penceStringWithoutTrailingP = penceString.substring( + 0, + penceString.length - 1 + ); + + const paddedPenceNumberString = penceStringWithoutTrailingP.padStart(3, "0"); + const pounds = paddedPenceNumberString.substring( + 0, + paddedPenceNumberString.length - 2 + ); + + const pence = paddedPenceNumberString + .substring(paddedPenceNumberString.length - 2) + .padEnd(2, "0"); + + return `£${pounds}.${pence}`; +} + +console.log(toPounds("1p")); +console.log(toPounds("90p")); +console.log(toPounds("303p")); +console.log(toPounds("23456p")); \ No newline at end of file diff --git a/Sprint-2/4-mandatory-interpret/time-format.js b/Sprint-2/4-mandatory-interpret/time-format.js index 17127bc01e..7547270e28 100644 --- a/Sprint-2/4-mandatory-interpret/time-format.js +++ b/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 +// =============> 3 // 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 // c) What is the return value of pad is called for the first time? -// =============> write your answer here +// =============> 00 // 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 +// =============> 1, the modulo % operator means that 61 gives a remainder of 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 +// =============> 01, this is so the 1 is padded with a leading 0 to make it 2 characters long. diff --git a/Sprint-2/5-stretch-extend/format-time.js b/Sprint-2/5-stretch-extend/format-time.js index 32a32e66b8..298c03f448 100644 --- a/Sprint-2/5-stretch-extend/format-time.js +++ b/Sprint-2/5-stretch-extend/format-time.js @@ -2,12 +2,24 @@ // 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. +const pad = (num) => String(num).padStart(2, "0"); + 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 `${pad(hours - 12)}:${minutes} pm`; + } + else if (hours === 12) { + return `${hours}:${minutes} pm`; + } + else { + return `${pad(hours)}:${minutes} am`; } - return `${time} am`; } const currentOutput = formatAs12HourClock("08:00"); @@ -23,3 +35,17 @@ console.assert( currentOutput2 === targetOutput2, `current output: ${currentOutput2}, target output: ${targetOutput2}` ); + +const currentOutput3 = formatAs12HourClock("13:15"); +const targetOutput3 = "01:15 pm"; +console.assert( + currentOutput3 === targetOutput3, + `current output: ${currentOutput3}, target output: ${targetOutput3}` +); + +const currentOutput4 = formatAs12HourClock("12:00"); +const targetOutput4 = "12:00 pm"; +console.assert( + currentOutput4 === targetOutput4, + `current output: ${currentOutput4}, target output: ${targetOutput4}` +); \ No newline at end of file