diff --git a/Sprint-1/1-key-exercises/1-count.js b/Sprint-1/1-key-exercises/1-count.js index 117bcb2b6e..38f38830d6 100644 --- a/Sprint-1/1-key-exercises/1-count.js +++ b/Sprint-1/1-key-exercises/1-count.js @@ -3,4 +3,4 @@ let count = 0; 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 +// The = takes the result of count + 1 and saves it back into the count variable, replacing the old value. \ No newline at end of file diff --git a/Sprint-1/1-key-exercises/2-initials.js b/Sprint-1/1-key-exercises/2-initials.js index 47561f6175..5f2f958538 100644 --- a/Sprint-1/1-key-exercises/2-initials.js +++ b/Sprint-1/1-key-exercises/2-initials.js @@ -5,7 +5,8 @@ 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 diff --git a/Sprint-1/1-key-exercises/3-paths.js b/Sprint-1/1-key-exercises/3-paths.js index ab90ebb28e..98ab371c3f 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(".")); // 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..eabc8523c4 100644 --- a/Sprint-1/1-key-exercises/4-random.js +++ b/Sprint-1/1-key-exercises/4-random.js @@ -3,7 +3,13 @@ const maximum = 100; const num = Math.floor(Math.random() * (maximum - minimum + 1)) + minimum; -// In this exercise, you will need to work out what num represents? -// 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 +console.log(num); + + +// num represents a random integer between 1 and 100 (inclusive). + +// 1. Math.random() generates a random decimal in [0, 1) +// 2. (maximum - minimum + 1) = 100, which means Math.random() * 100 gives a decimal in [0, 100) +// 3. Math.floor(...) rounds down to an integer in [0, 99] +// 4. Adding minimum (1) shifts the range to [1, 100] +// Which means num is a random whole number from 1 to 100. diff --git a/Sprint-1/2-mandatory-errors/0.js b/Sprint-1/2-mandatory-errors/0.js index cf6c5039f7..cf3fe7525e 100644 --- a/Sprint-1/2-mandatory-errors/0.js +++ b/Sprint-1/2-mandatory-errors/0.js @@ -1,2 +1,4 @@ -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? + +// Solution is making the instruction to a comment by using two slashes. \ 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..bdd9b5c229 100644 --- a/Sprint-1/2-mandatory-errors/1.js +++ b/Sprint-1/2-mandatory-errors/1.js @@ -1,4 +1,7 @@ // trying to create an age variable and then reassign the value by 1 -const age = 33; +let age = 33; age = age + 1; + +// The error is assignment to constant variable. +// const variables cannot be reassigned. I can fix this by using let instead. \ No newline at end of file diff --git a/Sprint-1/2-mandatory-errors/2.js b/Sprint-1/2-mandatory-errors/2.js index e09b89831d..6cd2c2016d 100644 --- a/Sprint-1/2-mandatory-errors/2.js +++ b/Sprint-1/2-mandatory-errors/2.js @@ -1,5 +1,8 @@ // 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}`); + +// console.log is meant to be at the bottom \ 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..eeab9dbeb5 100644 --- a/Sprint-1/2-mandatory-errors/3.js +++ b/Sprint-1/2-mandatory-errors/3.js @@ -1,9 +1,22 @@ const cardNumber = 4533787178994213; -const last4Digits = cardNumber.slice(-4); +const last4Digits = String(cardNumber).slice(-4); + +console.log(last4Digits); // The last4Digits variable should store the last 4 digits of cardNumber // However, the code isn't working // Before running the code, make and explain a prediction about why the code won't work + +// I think the code will not work because cardNumber is a number, and .slice() only works with strings. + // Then run the code and see what error it gives. + +//TypeError: cardNumber.slice is not a function + + // Consider: Why does it give this error? Is this what I predicted? If not, what's different? + +// The error happens because slice() cannot be used on a number. It only works on strings. Yes, this is what I predicted because I expected an error caused by trying to use slice() on a number. There is no difference between my prediction and the actual error. + + // Then try updating the expression last4Digits is assigned to, in order to get the correct value diff --git a/Sprint-1/2-mandatory-errors/4.js b/Sprint-1/2-mandatory-errors/4.js index 5f86c730bc..52517b0dc9 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 24hourClockTime = "20:53"; +const twelveHourClockTime = "8:53pm"; +const twentyFourHourClockTime = "20:53"; \ No newline at end of file diff --git a/Sprint-1/3-mandatory-interpret/1-percentage-change.js b/Sprint-1/3-mandatory-interpret/1-percentage-change.js index e24ecb8e18..5c4951fa97 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,19 @@ 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 +//The function call are made five times +//line 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? +// Line 5, A comma was missing between the arguments. Include a comma between the arguments to fix the error. // c) Identify all the lines that are variable reassignment statements +//Lines 7 & 8 + // d) Identify all the lines that are variable declarations +//Lines 1 & 2 + // e) Describe what the expression Number(carPrice.replaceAll(",","")) is doing - what is the purpose of this expression? +//It first removes all commas from the string (e.g. "10,000" becomes "10000"), then converts the resulting string into a number using Number(). This allows the value to be used in mathematical calculations. \ No newline at end of file diff --git a/Sprint-1/3-mandatory-interpret/2-time-format.js b/Sprint-1/3-mandatory-interpret/2-time-format.js index 47d2395587..40ab93e683 100644 --- a/Sprint-1/3-mandatory-interpret/2-time-format.js +++ b/Sprint-1/3-mandatory-interpret/2-time-format.js @@ -13,13 +13,26 @@ console.log(result); // a) How many variable declarations are there in this program? +//6 variable declarations + + // b) How many function calls are there? +//One function call - console.log(result) + // c) Using documentation, explain what the expression movieLength % 60 represents // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Arithmetic_Operators +//The % (remainder) operator returns the remainder after dividing by 60. - 8784 % 60 this returns 24, which is the number of seconds left over after converting to whole minutes. + // d) Interpret line 4, what does the expression assigned to totalMinutes mean? +// It removes the leftover seconds from movieLength and then divides by 60 to calculate the total whole minutes. + // e) What do you think the variable result represents? Can you think of a better name for this variable? +//formattedTime + // f) Try experimenting with different values of movieLength. Will this code work for all values of movieLength? Explain your answer + +//// No because it only works for whole numbers of seconds, but it won't format the time properly if the minutes or seconds are less than 10. \ No newline at end of file diff --git a/Sprint-1/3-mandatory-interpret/3-to-pounds.js b/Sprint-1/3-mandatory-interpret/3-to-pounds.js index 60c9ace69a..92dea24ab2 100644 --- a/Sprint-1/3-mandatory-interpret/3-to-pounds.js +++ b/Sprint-1/3-mandatory-interpret/3-to-pounds.js @@ -1,27 +1,32 @@ const penceString = "399p"; +//It stores the price as a string in pence. + const penceStringWithoutTrailingP = penceString.substring( 0, penceString.length - 1 ); +//Removes the "p" from the end of the string. + const paddedPenceNumberString = penceStringWithoutTrailingP.padStart(3, "0"); + +//Makes sure the string has at least 3 digits by adding leading zeros if needed. + const pounds = paddedPenceNumberString.substring( 0, paddedPenceNumberString.length - 2 ); +//Takes all the digits except the last two to get the pounds. + const pence = paddedPenceNumberString .substring(paddedPenceNumberString.length - 2) .padEnd(2, "0"); -console.log(`£${pounds}.${pence}`); + // Takes the last two digits to get the pence. -// This program takes a string representing a price in pence -// The program then builds up a string representing the price in pounds +console.log(`£${pounds}.${pence}`); -// You need to do a step-by-step breakdown of each line in this program -// Try and describe the purpose / rationale behind each step +//Combines the pounds and pence into a currency format and prints it. -// To begin, we can start with -// 1. const penceString = "399p": initialises a string variable with the value "399p" diff --git a/Sprint-1/4-stretch-explore/chrome.md b/Sprint-1/4-stretch-explore/chrome.md index e7dd5feafe..988d2c9aa0 100644 --- a/Sprint-1/4-stretch-explore/chrome.md +++ b/Sprint-1/4-stretch-explore/chrome.md @@ -12,7 +12,14 @@ invoke the function `alert` with an input string of `"Hello world!"`; What effect does calling the `alert` function have? +A pop up notification saying Hello World + Now try invoking the function `prompt` with a string input of `"What is your name?"` - store the return value of your call to `prompt` in an variable called `myName`. What effect does calling the `prompt` function have? + +It brings up a input tab to enter an answer + What is the return value of `prompt`? + +Tprompt returns the text that the user enters as a string if cancelled it would return null \ No newline at end of file diff --git a/Sprint-1/4-stretch-explore/objects.md b/Sprint-1/4-stretch-explore/objects.md index 0216dee56a..e8bd00df16 100644 --- a/Sprint-1/4-stretch-explore/objects.md +++ b/Sprint-1/4-stretch-explore/objects.md @@ -6,11 +6,23 @@ Open the Chrome devtools Console, type in `console.log` and then hit enter What output do you get? +undefined/ f log() native code + Now enter just `console` in the Console, what output do you get back? +It shows that console stores an object with many functions inside it. + Try also entering `typeof console` +object + Answer the following questions: -What does `console` store? +What does `console` store + +Console stores an object that contains tools for displaying information in the browser console, for example console.log() this displays messages or console.error() this displays errors. + + What does the syntax `console.log` or `console.assert` mean? In particular, what does the `.` mean? + +The . is called the dot operator, it is used to access properties or methods inside an object. An example is console.log() \ No newline at end of file diff --git a/Sprint-2/1-key-errors/0.js b/Sprint-2/1-key-errors/0.js index 653d6f5a07..ef5f6fc3f1 100644 --- a/Sprint-2/1-key-errors/0.js +++ b/Sprint-2/1-key-errors/0.js @@ -1,13 +1,12 @@ // 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 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")); diff --git a/Sprint-2/1-key-errors/1.js b/Sprint-2/1-key-errors/1.js index f2d56151f4..aa4bdac795 100644 --- a/Sprint-2/1-key-errors/1.js +++ b/Sprint-2/1-key-errors/1.js @@ -1,7 +1,9 @@ // Predict and explain first... // Why will an error occur when this program runs? -// =============> write your prediction here + +// The error happens because decimalNumber is declared twice. + // Try playing computer with the example to work out what is going on @@ -16,5 +18,17 @@ console.log(decimalNumber); // =============> write your explanation here +//// The error happens because decimalNumber is already a parameter, +// so it cannot be declared again using const. +// Also, decimalNumber is inside the function, so it can't be +// used outside the function with console.log(). + // 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)); diff --git a/Sprint-2/1-key-errors/2.js b/Sprint-2/1-key-errors/2.js index aad57f7cfe..5e1161a944 100644 --- a/Sprint-2/1-key-errors/2.js +++ b/Sprint-2/1-key-errors/2.js @@ -1,6 +1,9 @@ // Predict and explain first BEFORE you run any code... +// I think the code will give an error because 3 cannot be used +// as a function parameter name. Parameters must be variable names. + // this function should square any number but instead we're going to get an error // =============> write your prediction of the error here @@ -11,10 +14,20 @@ function square(3) { // =============> write the error message here +// SyntaxError: Unexpected number + // =============> explain this error message here +// The error means JavaScript found a number where it was +// expecting a parameter name. Function parameters must be +// identifiers like 'num', not values like 3. // 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 b27511b417..7cdfc54247 100644 --- a/Sprint-2/2-mandatory-debug/0.js +++ b/Sprint-2/2-mandatory-debug/0.js @@ -1,6 +1,9 @@ // Predict and explain first... -// =============> write your prediction here +// I think the code will not give an error, but it will print +// "The result of multiplying 10 and 32 is undefined" because +// the function only logs the answer and does not return a value. + function multiply(a, b) { console.log(a * b); @@ -10,5 +13,14 @@ console.log(`The result of multiplying 10 and 32 is ${multiply(10, 32)}`); // =============> write your explanation here +// The problem is that the multiply function uses console.log() +// instead of returning the result. When a function does not +// return anything, JavaScript gives it the value undefined. + // 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)}`); \ No newline at end of file diff --git a/Sprint-2/2-mandatory-debug/1.js b/Sprint-2/2-mandatory-debug/1.js index 37cedfbcfd..e7081efecf 100644 --- a/Sprint-2/2-mandatory-debug/1.js +++ b/Sprint-2/2-mandatory-debug/1.js @@ -1,5 +1,10 @@ // Predict and explain first... -// =============> write your prediction here + +// I think the code will not give an error, but it will print +// "The sum of 10 and 32 is undefined" because the return statement +// stops the function before a + b can run. + + function sum(a, b) { return; @@ -9,5 +14,15 @@ function sum(a, b) { console.log(`The sum of 10 and 32 is ${sum(10, 32)}`); // =============> write your explanation here + +// The problem is that `return;` ends the function immediately. +// The code after return will never be reached, so the function +// does not return the sum of a and b. It returns undefined instead. + // 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)}`); \ No newline at end of file diff --git a/Sprint-2/2-mandatory-debug/2.js b/Sprint-2/2-mandatory-debug/2.js index 57d3f5dc35..59df2933aa 100644 --- a/Sprint-2/2-mandatory-debug/2.js +++ b/Sprint-2/2-mandatory-debug/2.js @@ -1,7 +1,9 @@ // Predict and explain first... // Predict the output of the following code: -// =============> Write your prediction here +// I think the output will be wrong because the function does not use +// the numbers passed into it. It always uses the const num = 103, +// so it will always return 3. const num = 103; @@ -14,11 +16,31 @@ 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 +// 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 + +// The function is not working properly because it does not have a +// parameter to receive the numbers. It uses the global variable num, +// which is always 103, so it always returns the last digit of 103. + + // 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 + +// The function is not working properly because it does not use the +// number that is passed into it. It uses the global variable `num`, +// which is always 103, so it always returns 3. +// The function needs a parameter so it can use each number given to it. \ No newline at end of file diff --git a/Sprint-2/3-mandatory-implement/1-bmi.js b/Sprint-2/3-mandatory-implement/1-bmi.js index 17b1cbde1b..13d096af97 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 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..34660fccb2 100644 --- a/Sprint-2/3-mandatory-implement/2-cases.js +++ b/Sprint-2/3-mandatory-implement/2-cases.js @@ -14,3 +14,10 @@ // 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(text) { + return text.toUpperCase().replaceAll(" ", "_"); +} + +console.log(toUpperSnakeCase("hello there")); +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..cbb37b8188 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("399p")); +console.log(toPounds("45p")); +console.log(toPounds("5p")); +console.log(toPounds("1234p")); \ 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..dfd33f5890 100644 --- a/Sprint-2/4-mandatory-interpret/time-format.js +++ b/Sprint-2/4-mandatory-interpret/time-format.js @@ -21,18 +21,21 @@ function formatTimeDisplay(seconds) { // Questions // a) When formatTimeDisplay is called how many times will pad be called? -// =============> write your answer here +// pad will be called 3 times. // 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" + +// pad adds a leading 0 to single-digit numbers, so 1 becomes "01". diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..785fe23d41 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,14 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 +let count = 0; + + + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count++; + } + } + return count; } + module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf7..23d222825c 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -5,20 +5,21 @@ const countChar = require("./count"); // Then it should: // Scenario: Multiple Occurrences -// Given the input string `str`, -// And a character `char` that occurs one or more times in `str` (e.g., 'a' in 'aaaaa'), -// When the function is called with these inputs, -// Then it should correctly count occurrences of `char`. - test("should count multiple occurrences of a character", () => { - const str = "aaaaa"; - const char = "a"; - const count = countChar(str, char); - expect(count).toEqual(5); + const str = "aaaaa"; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(5); }); + // Scenario: No Occurrences -// Given the input string `str`, -// And a character `char` that does not exist within `str`. -// When the function is called with these inputs, -// Then it should return 0, indicating that no occurrences of `char` were found. +test("should return 0 when character does not exist in string", () => { + const str = "hello"; + const char = "z"; + const count = countChar(str, char); + + + expect(count).toEqual(0); +}); + diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db13..a803b52661 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,23 @@ function getOrdinalNumber(num) { - return "1st"; + if (num % 100 >= 11 && num % 100 <= 13) { + return `${num}th`; +} + if (num % 10 === 1) { + return `${num}st`; + } + + + if (num % 10 === 2) { + return `${num}nd`; + } + + + if (num % 10 === 3) { + return `${num}rd`; + } + + + return `${num}th`; } module.exports = getOrdinalNumber; diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js index adfa58560f..2957500f82 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -18,3 +18,67 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); + +// Case 2: Numbers ending with 2 (but not 12) +test("should append 'nd' for numbers ending with 2, except those ending with 12", () => { + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(32)).toEqual("32nd"); + expect(getOrdinalNumber(332)).toEqual("332nd"); +}); + + +// Case 3: Numbers ending with 3 (but not 13) +test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { + expect(getOrdinalNumber(113)).toEqual("113th"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(453)).toEqual("453rd"); +}); + + +// Case 4: Numbers ending with 4 -9 +test("should append 'th' for numbers ending with 4", () => { + expect(getOrdinalNumber(124)).toEqual("124th"); + expect(getOrdinalNumber(235)).toEqual("235th"); + expect(getOrdinalNumber(16)).toEqual("16th"); + expect(getOrdinalNumber(17)).toEqual("17th"); + expect(getOrdinalNumber(18)).toEqual("18th"); + expect(getOrdinalNumber(19)).toEqual("19th"); +}); + + + + +// Case 5: Numbers ending with 11, 12, 13 +test("should append 'th' for numbers ending with 11, 12, 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); + + +// Case 6: Numbers ending with 0 +test("should append 'th' for numbers ending with 0", () => { + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(20)).toEqual("20th"); + expect(getOrdinalNumber(30)).toEqual("30th"); + expect(getOrdinalNumber(140)).toEqual("140th"); +}); +function repeatStr() { + let result = ""; + + + for (let i = 0; i < num; i++) { + result += str; + } + + + return result; +} + + +module.exports = repeatStr; + + diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 2af0a2cea7..353e312562 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,7 +1,11 @@ function repeatStr() { - // Your implementation of this function must *not* call String.prototype.repeat (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat). - // The goal is to re-implement that function, not to use it. - return "hellohellohello"; + let result = ""; + + for (let i = 0; i < n; i++) { + result += str; + } + + return result; } module.exports = repeatStr; diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c4..a8f07fdc7e 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -20,13 +20,47 @@ test("should repeat the string count times", () => { // Given a target string `str` and a `count` equal to 1, // When the repeatStr function is called with these inputs, // Then it should return the original `str` without repetition. +test("should return the original string when count is 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeatStr(str, count); + + + expect(repeatedStr).toEqual("hello"); +}); // Case: Handle count of 0: // Given a target string `str` and a `count` equal to 0, // When the repeatStr function is called with these inputs, // Then it should return an empty string. +test("should return an empty string when count is 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + + + expect(repeatedStr).toEqual(""); +}); // Case: Handle negative count: // Given a target string `str` and a negative integer `count`, // When the repeatStr function is called with these inputs, // Then it should throw an error, as negative counts are not valid. + + +function repeatStr() { + let result = ""; + + + for (let i = 0; i < num; i++) { + result += str; + } + + + return result; +} + + +module.exports = repeatStr; + +