diff --git a/Sprint-2/1-key-errors/0.js b/Sprint-2/1-key-errors/0.js index 653d6f5a0..c5ba1e922 100644 --- a/Sprint-2/1-key-errors/0.js +++ b/Sprint-2/1-key-errors/0.js @@ -1,13 +1,23 @@ // Predict and explain first... -// =============> write your prediction here +// =============> write your prediction here : +// The function capitalise is expected to take a string input and return the string with the first letter capitalised. When called with the input "hello", it should return "Hello". However, since the function body is empty, it will likely result in an error or return undefined. // call the function capitalise with a string input // interpret the error message and figure out why an error is occurring +// function capitalise(str) { +//let str = `${str[0].toUpperCase()}${str.slice(1)}`; +// return str; +//} + +// =============> write your explanation here : +// The function capitalise is called with the string "hello" as an argument. The function takes the first character of the string, converts it to uppercase, and concatenates it with the rest of the string starting from the second character. The result is "Hello", which is then returned and logged to the console. There is no error in this code; it works as intended. + +// =============> 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")); \ 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 f2d56151f..f3b3e7861 100644 --- a/Sprint-2/1-key-errors/1.js +++ b/Sprint-2/1-key-errors/1.js @@ -1,10 +1,12 @@ // Predict and explain first... // Why will an error occur when this program runs? -// =============> write your prediction here +// =============> write your prediction here : The variable decimalNumber has been declared. // Try playing computer with the example to work out what is going on +// The old code : +/* function convertToPercentage(decimalNumber) { const decimalNumber = 0.5; const percentage = `${decimalNumber * 100}%`; @@ -13,8 +15,22 @@ function convertToPercentage(decimalNumber) { } console.log(decimalNumber); +*/ -// =============> write your explanation here - +// =============> write your explanation here : +/* +-The variable decimalNumber has been declared within the function as a parameter then declared again using const. +- The variable decimalNumber should be defined first. +*/ // Finally, correct the code to fix the problem // =============> write your new code here + +//The correct code : +const decimalNumber = 0.5; + +function convertToPercentage(decimalNumber) { + return `${decimalNumber * 100}%`; +} + + +console.log(convertToPercentage(decimalNumber)); diff --git a/Sprint-2/1-key-errors/2.js b/Sprint-2/1-key-errors/2.js index aad57f7cf..723cd05ba 100644 --- a/Sprint-2/1-key-errors/2.js +++ b/Sprint-2/1-key-errors/2.js @@ -1,20 +1,22 @@ - // Predict and explain first BEFORE you run any code... // this function should square any number but instead we're going to get an error -// =============> write your prediction of the error here +// =============> write your prediction of the error here : There will be a syntax error because the parameter name cannot be a number. -function square(3) { - return num * num; + function square(3) { + return num * num; } -// =============> write the error message here +// =============> write the error message here : SyntaxError: Unexpected number. -// =============> explain this error message here +// =============> explain this error message here : /*The error message shows that there is an unexpected number in the function parameter name. Function parameters must be valid identifiers (like variable names) and cannot be numeric literals.*/ // Finally, correct the code to fix the problem // =============> write your new code here - +function square(num) { + return num * num; +} +console.log(square(3)); diff --git a/Sprint-2/2-mandatory-debug/0.js b/Sprint-2/2-mandatory-debug/0.js index b27511b41..ef6e18966 100644 --- a/Sprint-2/2-mandatory-debug/0.js +++ b/Sprint-2/2-mandatory-debug/0.js @@ -1,14 +1,21 @@ // Predict and explain first... -// =============> write your prediction here +// =============> write your prediction here : This function doesn’t have a return statement. +// That means: even though it takes parameters, it won’t give any value back when called and the result will be undefined. -function multiply(a, b) { - console.log(a * b); -} -console.log(`The result of multiplying 10 and 32 is ${multiply(10, 32)}`); +//function multiply(a, b) { +//console.log(a * b); +//} + +// console.log(`The result of multiplying 10 and 32 is ${multiply(10, 32)}`); -// =============> write your explanation here +// =============> write your explanation here : /* The function multiply does not return any value, it only logs the result to the console. It returns undefined. To fix this, we need to add a return statement in the multiply function. */ // Finally, correct the code to fix the problem // =============> write your new code here + +function multiply(a, b) { + return a * b; +} +console.log(`The result of multiplying 10 and 32 is ${multiply(10, 32)}`); diff --git a/Sprint-2/2-mandatory-debug/1.js b/Sprint-2/2-mandatory-debug/1.js index 37cedfbcf..70fe5501e 100644 --- a/Sprint-2/2-mandatory-debug/1.js +++ b/Sprint-2/2-mandatory-debug/1.js @@ -1,5 +1,5 @@ // Predict and explain first... -// =============> write your prediction here +// =============> write your prediction here : A syntax error for the semicolon after return. function sum(a, b) { return; @@ -8,6 +8,11 @@ function sum(a, b) { console.log(`The sum of 10 and 32 is ${sum(10, 32)}`); -// =============> write your explanation here +// =============> write your explanation here : The semicolon after return at end of the statement. So there will be no value returned from the function. + // 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 57d3f5dc3..c099ca927 100644 --- a/Sprint-2/2-mandatory-debug/2.js +++ b/Sprint-2/2-mandatory-debug/2.js @@ -1,7 +1,7 @@ // Predict and explain first... -// Predict the output of the following code: -// =============> Write your prediction here +// Predict the output of the following code +// =============> Write your prediction here : The code did not set any parameter/s for the function getLastDigit. So it will always take the value of num which is 103 as a default value. const num = 103; @@ -14,11 +14,26 @@ console.log(`The last digit of 105 is ${getLastDigit(105)}`); 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 +// =============> write the output here : The output should be as the return line (103."103".3). +/* 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 +// =============> write your explanation here : Since .toString() converts the number to a string. The slice(-1) method extracts the last character from that string.. + // Finally, correct the code to fix the problem // =============> write your new code here +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)}`); // This program should tell the user the last digit of each number. // Explain why getLastDigit is not working properly - correct the problem +// >>>> because the pre declared value of num with const. So the function always returns the last digit of 103 which is 3. +// >>>> getLastDigit should take a parameter to work properly. diff --git a/Sprint-2/3-mandatory-implement/1-bmi.js b/Sprint-2/3-mandatory-implement/1-bmi.js index 17b1cbde1..d70095f0f 100644 --- a/Sprint-2/3-mandatory-implement/1-bmi.js +++ b/Sprint-2/3-mandatory-implement/1-bmi.js @@ -15,5 +15,8 @@ // 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 bmi = weight / (height * height); + return Math.round(bmi * 10) / 10; +} + +console.log(calculateBMI(75, 1.74)); diff --git a/Sprint-2/3-mandatory-implement/2-cases.js b/Sprint-2/3-mandatory-implement/2-cases.js index 5b0ef77ad..5cbb3715d 100644 --- a/Sprint-2/3-mandatory-implement/2-cases.js +++ b/Sprint-2/3-mandatory-implement/2-cases.js @@ -14,3 +14,9 @@ // 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 toUpperSnake(name) { + const upperCase = name.toUpperCase(); // Convert the string to uppercase + return upperCase.replaceAll(" ", "_"); // Replace all spaces with underscores +} +console.log(toUpperSnake("alaa tagi is my name")); diff --git a/Sprint-2/3-mandatory-implement/3-to-pounds.js b/Sprint-2/3-mandatory-implement/3-to-pounds.js index 6265a1a70..9112b5bb0 100644 --- a/Sprint-2/3-mandatory-implement/3-to-pounds.js +++ b/Sprint-2/3-mandatory-implement/3-to-pounds.js @@ -4,3 +4,23 @@ // 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(penceToPound) { + const penceStringWithoutTrailingP = penceToPound.substring(0, penceToPound.length - 1); // Remove the P at the end. + const paddedPenceNumberString = penceStringWithoutTrailingP.padStart(3, "0"); // Make sure there 3 digits at least. + const pounds = paddedPenceNumberString.substring( + 0, + paddedPenceNumberString.length - 2 + ); // get the pounds part( - the last two digits). + const pence = paddedPenceNumberString + .substring(paddedPenceNumberString.length - 2) + .padEnd(2, "0"); // get the pence part( they should be 2 digits). + return `£${pounds}.${pence}`; // The final format. +} +console.log(toPounds("3990p")); +console.log(toPounds("1500p")); +console.log(toPounds("150p")); +console.log(toPounds("100p")); +console.log(toPounds("70p")); +console.log(toPounds("50p")); +console.log(toPounds("0p")); \ 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 7c98eb0e8..038d4aecc 100644 --- a/Sprint-2/4-mandatory-interpret/time-format.js +++ b/Sprint-2/4-mandatory-interpret/time-format.js @@ -17,18 +17,19 @@ function formatTimeDisplay(seconds) { // Questions // a) When formatTimeDisplay is called how many times will pad be called? -// =============> write your answer here +// =============> write your answer here : three times in Line 11 with return. // 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 +// =============> write your answer here : 0, because totalHours is 0. // c) What is the return value of pad is called for the first time? -// =============> write your answer here +// =============> write your answer here : "00", because num is converted to string and padded to 2 characters with "0". // 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 +// =============> write your answer here : 1, because remainingSeconds is 1 on python tutor. // e) What is the return value assigned to num when pad is called for the last time in this program? Explain your answer -// =============> write your answer here +// =============> write your answer here : +// "01", because the number 1 is converted to a string ("1").Then padStart(2, "0") makes sure it has 2 characters by adding "0" at the start, so "1" becomes "01". diff --git a/Sprint-2/5-stretch-extend/format-time.js b/Sprint-2/5-stretch-extend/format-time.js index 32a32e66b..5f8b9992c 100644 --- a/Sprint-2/5-stretch-extend/format-time.js +++ b/Sprint-2/5-stretch-extend/format-time.js @@ -1,25 +1,115 @@ -// 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. - +// Fixed function function formatAs12HourClock(time) { - const hours = Number(time.slice(0, 2)); + // Validate input format + if (typeof time !== "string" || !time.includes(":")) { + return "Invalid time"; + } + + const [hourStr, minuteStr] = time.split(":"); + const hours = Number(hourStr); + const minutes = Number(minuteStr); + let period = "am"; + + // Validate range + if ( + isNaN(hours) || isNaN(minutes) || + hours < 0 || hours > 23 || + minutes < 0 || minutes > 59 + ) { + return "Invalid time"; + } + + // Midnight + if (hours === 0) { + return `12:${minuteStr.padStart(2, "0")} am`; + } + + // Noon + if (hours === 12) { + period = "pm"; + return `12:${minuteStr.padStart(2, "0")} ${period}`; + } + + // PM hours if (hours > 12) { - return `${hours - 12}:00 pm`; + return `${hours - 12}:${minuteStr.padStart(2, "0")} pm`; } - return `${time} am`; + + // AM hours + return `${hours}:${minuteStr.padStart(2, "0")} ${period}`; } -const currentOutput = formatAs12HourClock("08:00"); -const targetOutput = "08:00 am"; +// ✅ Re-tests +const currentOutput1 = formatAs12HourClock("08:00"); +const targetOutput1 = "8:00 am"; console.assert( - currentOutput === targetOutput, - `current output: ${currentOutput}, target output: ${targetOutput}` -); + currentOutput1 === targetOutput1, + `current output: ${currentOutput1}, target output: ${targetOutput1}` +); -const currentOutput2 = formatAs12HourClock("23:00"); -const targetOutput2 = "11:00 pm"; +const currentOutput2 = formatAs12HourClock("7:45"); +const targetOutput2 = "7:45 am"; console.assert( currentOutput2 === targetOutput2, `current output: ${currentOutput2}, target output: ${targetOutput2}` ); + +const currentOutput3 = formatAs12HourClock("23:00"); +const targetOutput3 = "11:00 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}` +); + +const currentOutput5 = formatAs12HourClock("00:00"); +const targetOutput5 = "12:00 am"; +console.assert( + currentOutput5 === targetOutput5, + `current output: ${currentOutput5}, target output: ${targetOutput5}` +); + +const currentOutput6 = formatAs12HourClock("15:30"); +const targetOutput6 = "3:30 pm"; +console.assert( + currentOutput6 === targetOutput6, + `current output: ${currentOutput6}, target output: ${targetOutput6}` +); + +const currentOutput7 = formatAs12HourClock("11:45"); +const targetOutput7 = "11:45 am"; +console.assert( + currentOutput7 === targetOutput7, + `current output: ${currentOutput7}, target output: ${targetOutput7}` +); + +const currentOutput8 = formatAs12HourClock("25:30"); +const targetOutput8 = "Invalid time"; +console.assert( + currentOutput8 === targetOutput8, + `current output: ${currentOutput8}, target output: ${targetOutput8}` +); + +const currentOutput9 = formatAs12HourClock("1724688"); +const targetOutput9 = "Invalid time"; +console.assert( + currentOutput9 === targetOutput9, + `current output: ${currentOutput9}, target output: ${targetOutput9}` +); + +// ✅ Display output +console.log(formatAs12HourClock("08:00")); +console.log(formatAs12HourClock("7:45")); +console.log(formatAs12HourClock("23:00")); +console.log(formatAs12HourClock("12:00")); +console.log(formatAs12HourClock("00:00")); +console.log(formatAs12HourClock("15:30")); +console.log(formatAs12HourClock("11:45")); +console.log(formatAs12HourClock("25:30")); +console.log(formatAs12HourClock("1724688"));