From 84e3bca5bea626e2fd060badea2b71d027616f50 Mon Sep 17 00:00:00 2001 From: Kaligrey Date: Wed, 25 Jun 2025 15:04:50 +0100 Subject: [PATCH 01/22] First 3 exercises of sprint 1 are completed. --- Sprint-1/1-key-exercises/1-count.js | 3 +++ Sprint-1/1-key-exercises/2-initials.js | 4 +++- Sprint-1/1-key-exercises/3-paths.js | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Sprint-1/1-key-exercises/1-count.js b/Sprint-1/1-key-exercises/1-count.js index 117bcb2b6..dfb08d71c 100644 --- a/Sprint-1/1-key-exercises/1-count.js +++ b/Sprint-1/1-key-exercises/1-count.js @@ -4,3 +4,6 @@ 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 + +// SOLUTION: +// Line 3 is updating the value of the count by adding 1 to its 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 47561f617..92aa6a726 100644 --- a/Sprint-1/1-key-exercises/2-initials.js +++ b/Sprint-1/1-key-exercises/2-initials.js @@ -5,7 +5,9 @@ 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 ab90ebb28..3cec456e0 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 = filePath.slice(lastSlashIndex + 1); // https://www.google.com/search?q=slice+mdn \ No newline at end of file From 3c9fb3ab103ee6894291bec767631e20dc97b043 Mon Sep 17 00:00:00 2001 From: Kaligrey Date: Wed, 25 Jun 2025 15:14:06 +0100 Subject: [PATCH 02/22] Key exercise part is done with this commit --- Sprint-1/1-key-exercises/4-random.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Sprint-1/1-key-exercises/4-random.js b/Sprint-1/1-key-exercises/4-random.js index 292f83aab..ad3126a5b 100644 --- a/Sprint-1/1-key-exercises/4-random.js +++ b/Sprint-1/1-key-exercises/4-random.js @@ -1,5 +1,6 @@ const minimum = 1; const maximum = 100; +const num = 2; const num = Math.floor(Math.random() * (maximum - minimum + 1)) + minimum; @@ -7,3 +8,13 @@ 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 + + + +// SOLUTION: + +// num represents a random number between the minimum and maximum values. + +// program is designed for num to return random numbers between 1-100. + +//expressions of math.floor and math.random are there for //generating a random number between the minimum and maximum values and then rounding it down to the nearest whole number... \ No newline at end of file From c882576d71389a62b35b81c4f6a49a2f945aa97c Mon Sep 17 00:00:00 2001 From: Kaligrey Date: Wed, 25 Jun 2025 15:17:05 +0100 Subject: [PATCH 03/22] Mandatory errors 0 and 1.js is solved. --- Sprint-1/2-mandatory-errors/0.js | 4 +++- Sprint-1/2-mandatory-errors/1.js | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Sprint-1/2-mandatory-errors/0.js b/Sprint-1/2-mandatory-errors/0.js index cf6c5039f..098f0b365 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 +We don't want the computer to run these 2 lines - how can we solve this problem? + +// We can use a comment to prevent the computer from running these lines. \ 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 7a43cbea7..aed29ff4e 100644 --- a/Sprint-1/2-mandatory-errors/1.js +++ b/Sprint-1/2-mandatory-errors/1.js @@ -1,4 +1,8 @@ // trying to create an age variable and then reassign the value by 1 -const age = 33; +let age = 33; age = age + 1; + +console.log(age); + + From 8ccf3b2784953df70786d1cc3b0aa3be6d949891 Mon Sep 17 00:00:00 2001 From: Kaligrey Date: Wed, 25 Jun 2025 15:28:57 +0100 Subject: [PATCH 04/22] Mandatory-errors part is finished. --- Sprint-1/2-mandatory-errors/2.js | 5 +++-- Sprint-1/2-mandatory-errors/3.js | 14 +++++++++++++- Sprint-1/2-mandatory-errors/4.js | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Sprint-1/2-mandatory-errors/2.js b/Sprint-1/2-mandatory-errors/2.js index e09b89831..08e662ab6 100644 --- a/Sprint-1/2-mandatory-errors/2.js +++ b/Sprint-1/2-mandatory-errors/2.js @@ -1,5 +1,6 @@ // 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}`); + +//Code was correct, I just shifted the const part to the top of the code block. \ 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 ec101884d..507f13bb1 100644 --- a/Sprint-1/2-mandatory-errors/3.js +++ b/Sprint-1/2-mandatory-errors/3.js @@ -1,5 +1,8 @@ const cardNumber = 4533787178994213; -const last4Digits = cardNumber.slice(-4); +const last4Digits = cardNumber.toString().slice(-4); + + +console.log(last4Digits); // The last4Digits variable should store the last 4 digits of cardNumber // However, the code isn't working @@ -7,3 +10,12 @@ const last4Digits = cardNumber.slice(-4); // Then run the code and see what error it gives. // Consider: Why does it give this error? Is this what I predicted? If not, what's different? // Then try updating the expression last4Digits is assigned to, in order to get the correct value + + +// Prediction; code wont work because slice is for strings, not numbers. + +// after running the code, I got an error saying "cardNumber.slice is not a function". + +// It's what I predicted. + +// to fix the code I need to convert number to string first, then slice it. diff --git a/Sprint-1/2-mandatory-errors/4.js b/Sprint-1/2-mandatory-errors/4.js index 21dad8c5d..e82e55f20 100644 --- a/Sprint-1/2-mandatory-errors/4.js +++ b/Sprint-1/2-mandatory-errors/4.js @@ -1,2 +1,12 @@ -const 12HourClockTime = "20:53"; -const 24hourClockTime = "08:53"; \ No newline at end of file +//const 12HourClockTime = "20:53"; +//const 24hourClockTime = "08:53"; + + +// problem is in javascript we cant start a variable name with a number. + +// correct way is: + +const.twelveHourClockTime = "20:53"; +const twentyFourHourClockTime = "08:53"; + +console.log(`The time in 12-hour format is ${twelveHourClockTime} and in 24-hour format is ${twentyFourHourClockTime}`); From d0c0bd7d4d9a71fed4690e3c1dd131ea7fd0d0ec Mon Sep 17 00:00:00 2001 From: Emin Date: Fri, 27 Jun 2025 21:24:38 +0100 Subject: [PATCH 05/22] until time format is finished. --- .../1-percentage-change.js | 16 ++++++++++- .../3-mandatory-interpret/2-time-format.js | 27 +++++++++++++++++++ 2 files changed, 42 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 e24ecb8e1..ef7165052 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; @@ -20,3 +20,17 @@ console.log(`The percentage change is ${percentageChange}`); // d) Identify all the lines that are variable declarations // e) Describe what the expression Number(carPrice.replaceAll(",","")) is doing - what is the purpose of this expression? + + +// a) There are 3 function calls in this file: +// `carPrice.replaceAll(",", "")` on line 5 +// `priceAfterOneYear.replaceAll(",", "")` on line 6 +// `Number(...)` on lines 5 and 6 +// b) The error occurs on line 5 there's a missing comma. +//c) The variable reassignment statements are: +// `carPrice = Number(carPrice.replaceAll(",", ""));` on line 5 +// `priceAfterOneYear = Number(priceAfterOneYear.replaceAll(",", ""));` on line 6 +// d) The variable declarations are: +// `let carPrice = "10,000";` on line 1 +// `let priceAfterOneYear = "8,543";` on line 2 +// e) The expression `Number(carPrice.replaceAll(",", ""))` is converting carprice, which contains a comma, into a number. \ 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 47d239558..72db347ca 100644 --- a/Sprint-1/3-mandatory-interpret/2-time-format.js +++ b/Sprint-1/3-mandatory-interpret/2-time-format.js @@ -23,3 +23,30 @@ console.log(result); // e) What do you think the variable result represents? Can you think of a better name for this variable? // f) Try experimenting with different values of movieLength. Will this code work for all values of movieLength? Explain your answer + + +// a) There are 6 variable declarations in this program: +// which are: + +// movieLength + +// remainingSeconds + +// totalMinutes + +// remainingMinutes + +// totalHours + +// result + +// b) There are 2 function calls in this program. + +// c) Expression movieLength %60 represents remainder of division by 60. + +// d) expression assigned to totalminutes means minutes in the movie by removing the remaining seconds and dividing by 60. + +// e) Result variable represents the total time. A better name would be totalTime. + +// f) Yes code will work for all the values of movielength. It'll always return the total time with no problems. But It's not working if movielength less than 60 seconds, more than 24 hours or negative values. + From 721fe57eaf7fe31276744d3e4172174b1ff4d33b Mon Sep 17 00:00:00 2001 From: Emin Date: Fri, 27 Jun 2025 21:28:22 +0100 Subject: [PATCH 06/22] finishing touch --- Sprint-1/3-mandatory-interpret/3-to-pounds.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Sprint-1/3-mandatory-interpret/3-to-pounds.js b/Sprint-1/3-mandatory-interpret/3-to-pounds.js index 60c9ace69..428a57f40 100644 --- a/Sprint-1/3-mandatory-interpret/3-to-pounds.js +++ b/Sprint-1/3-mandatory-interpret/3-to-pounds.js @@ -25,3 +25,13 @@ console.log(`£${pounds}.${pence}`); // To begin, we can start with // 1. const penceString = "399p": initialises a string variable with the value "399p" + +// 2. const penceStringWithoutTrailingP = penceString.substring(0, penceString.length - 1): This line removes the trailing 'p' from the string. + +// 3. const paddedPenceNumberString = penceStringWithoutTrailingP.padStart(3, "0"): This line puts the string into a 3 character string padding with zeros. + +// 4. const pounds = paddedPenceNumberString.substring(0, paddedPenceNumberString.length - 2): This line takes out the pounds part of the string. + +// 5. const pence = paddedPenceNumberString.substring(paddedPenceNumberString.length - 2).padEnd(2, "0"): This line takes out pence part and pads it to 2 characters. + +// 6. console.log(`£${pounds}.${pence}`): This line prints the final results. \ No newline at end of file From 3eff2ca2568edf3704ea0294e4bcb4ad3a540eec Mon Sep 17 00:00:00 2001 From: Emin Date: Sun, 27 Jul 2025 14:57:41 +0100 Subject: [PATCH 07/22] get-angle-type is sorted. --- Sprint-3/1-key-implement/1-get-angle-type.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Sprint-3/1-key-implement/1-get-angle-type.js b/Sprint-3/1-key-implement/1-get-angle-type.js index 08d1f0cba..c6540d448 100644 --- a/Sprint-3/1-key-implement/1-get-angle-type.js +++ b/Sprint-3/1-key-implement/1-get-angle-type.js @@ -8,7 +8,11 @@ // Then, write the next test! :) Go through this process until all the cases are implemented function getAngleType(angle) { - if (angle === 90) return "Right angle"; + if (angle === 90) return "Right angle"; + if (angle < 90) return "Acute angle"; + if (angle > 90 && angle < 180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle > 180 && angle < 360) return "Reflex angle"; // read to the end, complete line 36, then pass your test here } @@ -44,13 +48,16 @@ assertEquals(acute, "Acute angle"); // Then the function should return "Obtuse angle" const obtuse = getAngleType(120); // ====> write your test here, and then add a line to pass the test in the function above - +assertEquals(obtuse, "Obtuse angle"); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" // ====> write your test here, and then add a line to pass the test in the function above - +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); // Case 5: Identify Reflex Angles: // When the angle is greater than 180 degrees and less than 360 degrees, // Then the function should return "Reflex angle" -// ====> write your test here, and then add a line to pass the test in the function above \ No newline at end of file +// ====> write your test here, and then add a line to pass the test in the function above +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); \ No newline at end of file From 0de42f137ddcb3fc1a4723bb3d57a722cfe3d0f2 Mon Sep 17 00:00:00 2001 From: Emin Date: Sun, 27 Jul 2025 15:02:30 +0100 Subject: [PATCH 08/22] proper fraction sorted. --- Sprint-3/1-key-implement/2-is-proper-fraction.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Sprint-3/1-key-implement/2-is-proper-fraction.js b/Sprint-3/1-key-implement/2-is-proper-fraction.js index 91583e941..680209ae6 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -8,14 +8,18 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; + if (Math.abs(numerator) < Math.abs(denominator)) { + return true; + } else { + return false; + } } // here's our helper again function assertEquals(actualOutput, targetOutput) { console.assert( actualOutput === targetOutput, - `Expected ${actualOutput} to equal ${targetOutput}` + Expected ${actualOutput} to equal ${targetOutput} ); } @@ -40,14 +44,14 @@ assertEquals(improperFraction, false); // target output: true // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true. const negativeFraction = isProperFraction(-4, 7); -// ====> complete with your assertion +assertEquals(negativeFraction, true); // Equal Numerator and Denominator check: // Input: numerator = 3, denominator = 3 // target output: false // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false. const equalFraction = isProperFraction(3, 3); -// ====> complete with your assertion +assertEquals(equalFraction, false); // Stretch: -// What other scenarios could you test for? +// What other scenarios could you test for? \ No newline at end of file From 5d8d05c4d58d4db2f52a9c6b9e874491d29cb250 Mon Sep 17 00:00:00 2001 From: Emin Date: Sun, 27 Jul 2025 15:04:05 +0100 Subject: [PATCH 09/22] get card value sorted. --- Sprint-3/1-key-implement/3-get-card-value.js | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Sprint-3/1-key-implement/3-get-card-value.js b/Sprint-3/1-key-implement/3-get-card-value.js index aa1cc9f90..7e968571d 100644 --- a/Sprint-3/1-key-implement/3-get-card-value.js +++ b/Sprint-3/1-key-implement/3-get-card-value.js @@ -8,7 +8,11 @@ // write one test at a time, and make it pass, build your solution up methodically // just make one change at a time -- don't rush -- programmers are deep and careful thinkers function getCardValue(card) { + const rank = card.slice(0, -1); if (rank === "A") return 11; + if (rank === "J" || rank === "Q" || rank === "K" || rank === "10") return 10; + if (!isNaN(rank)) return Number(rank); + throw new Error("Invalid card rank."); } // You need to write assertions for your function to check it works in different cases @@ -33,12 +37,23 @@ assertEquals(aceofSpades, 11); // When the function is called with such a card, // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5). const fiveofHearts = getCardValue("5♥"); -// ====> write your test here, and then add a line to pass the test in the function above +assertEquals(fiveofHearts, 5); // Handle Face Cards (J, Q, K): // Given a card with a rank of "10," "J," "Q," or "K", // When the function is called with such a card, // Then it should return the value 10, as these cards are worth 10 points each in blackjack. +const jackofClubs = getCardValue("J♣"); +assertEquals(jackofClubs, 10); + +const queenofDiamonds = getCardValue("Q♦"); +assertEquals(queenofDiamonds, 10); + +const kingofHearts = getCardValue("K♥"); +assertEquals(kingofHearts, 10); + +const tenofSpades = getCardValue("10♠"); +assertEquals(tenofSpades, 10); // Handle Ace (A): // Given a card with a rank of "A", @@ -49,3 +64,9 @@ const fiveofHearts = getCardValue("5♥"); // Given a card with an invalid rank (neither a number nor a recognized face card), // When the function is called with such a card, // Then it should throw an error indicating "Invalid card rank." +try { + getCardValue("Z♠"); + console.error("Error was expected but not thrown"); +} catch (e) { + assertEquals(e.message, "Invalid card rank."); +} From 7fe2790d8f594f4fdc3cc790f6afbd1078d67c5f Mon Sep 17 00:00:00 2001 From: Emin Date: Sun, 27 Jul 2025 15:09:24 +0100 Subject: [PATCH 10/22] sprint3 coursework done. --- .../2-mandatory-rewrite/1-get-angle-type.js | 6 +++++- .../1-get-angle-type.test.js | 16 ++++++++++------ .../2-is-proper-fraction.js | 7 ++++++- .../2-is-proper-fraction.test.js | 9 +++++++++ .../2-mandatory-rewrite/3-get-card-value.js | 10 +++++++--- .../3-get-card-value.test.js | 19 ++++++++++++++++++- .../3-mandatory-practice/implement/count.js | 8 ++++++-- .../implement/count.test.js | 9 ++++++++- .../implement/get-ordinal-number.js | 11 +++++++++-- .../implement/get-ordinal-number.test.js | 2 +- .../3-mandatory-practice/implement/repeat.js | 9 ++++++--- 11 files changed, 85 insertions(+), 21 deletions(-) diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js index d61254bd7..8bbc61d3f 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js @@ -1,6 +1,10 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; - // replace with your completed function from key-implement + if (angle < 90) return "Acute angle"; + if (angle > 90 && angle < 180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle > 180 && angle < 360) return "Reflex angle"; +} } diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js index b62827b7c..736ab124f 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js @@ -4,21 +4,25 @@ test("should identify right angle (90°)", () => { expect(getAngleType(90)).toEqual("Right angle"); }); -// REPLACE the comments with the tests -// make your test descriptions as clear and readable as possible - // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify acute angles (less than 90°)", () => { + expect(getAngleType(45)).toEqual("Acute angle"); +}); // Case 3: Identify Obtuse Angles: // When the angle is greater than 90 degrees and less than 180 degrees, // Then the function should return "Obtuse angle" +test("should identify obtuse angles (greater than 90° and less than 180°)", () => { + expect(getAngleType(120)).toEqual("Obtuse angle"); +}); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" +test("should identify straight angle (180°)", () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); -// Case 5: Identify Reflex Angles: -// When the angle is greater than 180 degrees and less than 360 degrees, -// Then the function should return "Reflex angle" +/ diff --git a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js index 9836fe398..a5f22c578 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js @@ -1,6 +1,11 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) return true; // add your completed function from key-implement here + if (Math.abs(numerator) < Math.abs(denominator)) { + return true; + } else { + return false; + } } -module.exports = isProperFraction; \ No newline at end of file +module.exports = isProperFraction; diff --git a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js index ff1cc8173..3f15f4c43 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js @@ -5,7 +5,16 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a negative proper fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false when numerator and denominator are equal", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js index 0d95d3736..5c6efcceb 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js @@ -1,5 +1,9 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + const rank = card.slice(0, -1); + if (rank === "A") return 11; + if (rank === "J" || rank === "Q" || rank === "K" || rank === "10") return 10; + if (!isNaN(rank)) return Number(rank); + throw new Error("Invalid card rank."); } -module.exports = getCardValue; \ No newline at end of file + +module.exports = getCardValue; diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js index 03a8e2f34..d2797155d 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js @@ -3,9 +3,26 @@ const getCardValue = require("./3-get-card-value"); test("should return 11 for Ace of Spades", () => { const aceofSpades = getCardValue("A♠"); expect(aceofSpades).toEqual(11); - }); +}); // Case 2: Handle Number Cards (2-10): +test("should return correct number for number cards", () => { + expect(getCardValue("5♥")).toEqual(5); + expect(getCardValue("10♦")).toEqual(10); +}); + // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for face cards J, Q, K", () => { + expect(getCardValue("J♣")).toEqual(10); + expect(getCardValue("Q♦")).toEqual(10); + expect(getCardValue("K♥")).toEqual(10); +}); + // Case 4: Handle Ace (A): +// (Already tested above with Ace of Spades) + // Case 5: Handle Invalid Cards: +test("should throw error for invalid cards", () => { + expect(() => getCardValue("Z♠")).toThrow("Invalid card rank."); + expect(() => getCardValue("1♠")).toThrow("Invalid card rank."); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/count.js b/Sprint-3/3-mandatory-practice/implement/count.js index fce249650..16c330a03 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,9 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let char of stringOfCharacters) { + if (char === findCharacter) count++; + } + return count; } -module.exports = countChar; \ No newline at end of file +module.exports = countChar; diff --git a/Sprint-3/3-mandatory-practice/implement/count.test.js b/Sprint-3/3-mandatory-practice/implement/count.test.js index 42baf4b4b..80b4b5871 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -1,5 +1,5 @@ -// implement a function countChar that counts the number of times a character occurs in a string const countChar = require("./count"); + // Given a string str and a single character char to search for, // When the countChar function is called with these inputs, // Then it should: @@ -22,3 +22,10 @@ test("should count multiple occurrences of a character", () => { // And a character char that does not exist within the case-sensitive str, // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of the char were found in the case-sensitive str. + +test("should return 0 if character does not occur", () => { + const str = "Hello World"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js index 24f528b0d..3790a8085 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js @@ -1,5 +1,12 @@ function getOrdinalNumber(num) { - return "1st"; + const suffixes = ["th", "st", "nd", "rd"]; + const v = num % 100; + if (v >= 11 && v <= 13) { + return num + "th"; + } else { + const suffix = suffixes[(num % 10)] || "th"; + return num + suffix; + } } -module.exports = getOrdinalNumber; \ No newline at end of file +module.exports = getOrdinalNumber; diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js index 6d55dfbb4..380adce6d 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js @@ -10,4 +10,4 @@ const getOrdinalNumber = require("./get-ordinal-number"); test("should return '1st' for 1", () => { expect(getOrdinalNumber(1)).toEqual("1st"); - }); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..9385a11fa 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.js @@ -1,5 +1,8 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, count) { + if (count < 0) { + throw new Error("Invalid count"); + } + return str.repeat(count); } -module.exports = repeat; \ No newline at end of file +module.exports = repeat; From 16e88b9eabe89fec809f6694b1e42e603b250a1b Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:48:33 +0100 Subject: [PATCH 11/22] Delete Sprint-1/1-key-exercises/1-count.js --- Sprint-1/1-key-exercises/1-count.js | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Sprint-1/1-key-exercises/1-count.js diff --git a/Sprint-1/1-key-exercises/1-count.js b/Sprint-1/1-key-exercises/1-count.js deleted file mode 100644 index dfb08d71c..000000000 --- a/Sprint-1/1-key-exercises/1-count.js +++ /dev/null @@ -1,9 +0,0 @@ -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 - -// SOLUTION: -// Line 3 is updating the value of the count by adding 1 to its value. \ No newline at end of file From 17f9a99723696c9392c02033778a3e2c467c1e79 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:48:51 +0100 Subject: [PATCH 12/22] Delete Sprint-1/1-key-exercises/2-initials.js --- Sprint-1/1-key-exercises/2-initials.js | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 Sprint-1/1-key-exercises/2-initials.js diff --git a/Sprint-1/1-key-exercises/2-initials.js b/Sprint-1/1-key-exercises/2-initials.js deleted file mode 100644 index 92aa6a726..000000000 --- a/Sprint-1/1-key-exercises/2-initials.js +++ /dev/null @@ -1,13 +0,0 @@ -let firstName = "Creola"; -let middleName = "Katherine"; -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 = firstName[0] + middleName[0] + lastName[0]; - -console.log(initials); - -// https://www.google.com/search?q=get+first+character+of+string+mdn - From 4266d7706dbbf228d7e742dbbc27b68ea0ad69a7 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:49:07 +0100 Subject: [PATCH 13/22] Delete Sprint-1/1-key-exercises/3-paths.js --- Sprint-1/1-key-exercises/3-paths.js | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Sprint-1/1-key-exercises/3-paths.js diff --git a/Sprint-1/1-key-exercises/3-paths.js b/Sprint-1/1-key-exercises/3-paths.js deleted file mode 100644 index 3cec456e0..000000000 --- a/Sprint-1/1-key-exercises/3-paths.js +++ /dev/null @@ -1,23 +0,0 @@ -// The diagram below shows the different names for parts of a file path on a Unix operating system - -// ┌─────────────────────┬────────────┐ -// │ dir │ base │ -// ├──────┬ ├──────┬─────┤ -// │ root │ │ name │ ext │ -// " / home/user/dir / file .txt " -// └──────┴──────────────┴──────┴─────┘ - -// (All spaces in the "" line should be ignored. They are purely for formatting.) - -const filePath = "/Users/mitch/cyf/Module-JS1/week-1/interpret/file.txt"; -const lastSlashIndex = filePath.lastIndexOf("/"); -const base = filePath.slice(lastSlashIndex + 1); -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 = filePath.slice(0, lastSlashIndex); -const ext = filePath.slice(lastSlashIndex + 1); - -// https://www.google.com/search?q=slice+mdn \ No newline at end of file From 05564dfe9c6be6179f3e5123c44c7919da2f315f Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:49:18 +0100 Subject: [PATCH 14/22] Delete Sprint-1/1-key-exercises/4-random.js --- Sprint-1/1-key-exercises/4-random.js | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 Sprint-1/1-key-exercises/4-random.js diff --git a/Sprint-1/1-key-exercises/4-random.js b/Sprint-1/1-key-exercises/4-random.js deleted file mode 100644 index ad3126a5b..000000000 --- a/Sprint-1/1-key-exercises/4-random.js +++ /dev/null @@ -1,20 +0,0 @@ -const minimum = 1; -const maximum = 100; -const num = 2; - -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 - - - -// SOLUTION: - -// num represents a random number between the minimum and maximum values. - -// program is designed for num to return random numbers between 1-100. - -//expressions of math.floor and math.random are there for //generating a random number between the minimum and maximum values and then rounding it down to the nearest whole number... \ No newline at end of file From a932cb110992ce22a851cf9f2c3a71d0a485c8ac Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:49:33 +0100 Subject: [PATCH 15/22] Delete Sprint-1/2-mandatory-errors/0.js --- Sprint-1/2-mandatory-errors/0.js | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Sprint-1/2-mandatory-errors/0.js diff --git a/Sprint-1/2-mandatory-errors/0.js b/Sprint-1/2-mandatory-errors/0.js deleted file mode 100644 index 098f0b365..000000000 --- a/Sprint-1/2-mandatory-errors/0.js +++ /dev/null @@ -1,4 +0,0 @@ -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? - -// We can use a comment to prevent the computer from running these lines. \ No newline at end of file From 2c47ed96597d5327bf8cd78253e359df1e6983f0 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:49:47 +0100 Subject: [PATCH 16/22] Delete Sprint-1/2-mandatory-errors/1.js --- Sprint-1/2-mandatory-errors/1.js | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Sprint-1/2-mandatory-errors/1.js diff --git a/Sprint-1/2-mandatory-errors/1.js b/Sprint-1/2-mandatory-errors/1.js deleted file mode 100644 index aed29ff4e..000000000 --- a/Sprint-1/2-mandatory-errors/1.js +++ /dev/null @@ -1,8 +0,0 @@ -// trying to create an age variable and then reassign the value by 1 - -let age = 33; -age = age + 1; - -console.log(age); - - From 1b7c8c7d5e19cb281770bda67feff98ee7f84d02 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:50:08 +0100 Subject: [PATCH 17/22] Delete Sprint-1/2-mandatory-errors/2.js --- Sprint-1/2-mandatory-errors/2.js | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 Sprint-1/2-mandatory-errors/2.js diff --git a/Sprint-1/2-mandatory-errors/2.js b/Sprint-1/2-mandatory-errors/2.js deleted file mode 100644 index 08e662ab6..000000000 --- a/Sprint-1/2-mandatory-errors/2.js +++ /dev/null @@ -1,6 +0,0 @@ -// Currently trying to print the string "I was born in Bolton" but it isn't working... -// what's the error ? -const cityOfBirth = "Bolton"; -console.log(`I was born in ${cityOfBirth}`); - -//Code was correct, I just shifted the const part to the top of the code block. \ No newline at end of file From c95381ed57db70a4a4cf7c2f067fd34966154006 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:50:19 +0100 Subject: [PATCH 18/22] Delete Sprint-1/2-mandatory-errors/3.js --- Sprint-1/2-mandatory-errors/3.js | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Sprint-1/2-mandatory-errors/3.js diff --git a/Sprint-1/2-mandatory-errors/3.js b/Sprint-1/2-mandatory-errors/3.js deleted file mode 100644 index 507f13bb1..000000000 --- a/Sprint-1/2-mandatory-errors/3.js +++ /dev/null @@ -1,21 +0,0 @@ -const cardNumber = 4533787178994213; -const last4Digits = cardNumber.toString().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 -// Then run the code and see what error it gives. -// Consider: Why does it give this error? Is this what I predicted? If not, what's different? -// Then try updating the expression last4Digits is assigned to, in order to get the correct value - - -// Prediction; code wont work because slice is for strings, not numbers. - -// after running the code, I got an error saying "cardNumber.slice is not a function". - -// It's what I predicted. - -// to fix the code I need to convert number to string first, then slice it. From 1fd0b028418524c7f4355bbc9ece6f198f466741 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:50:35 +0100 Subject: [PATCH 19/22] Delete Sprint-1/2-mandatory-errors/4.js --- Sprint-1/2-mandatory-errors/4.js | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Sprint-1/2-mandatory-errors/4.js diff --git a/Sprint-1/2-mandatory-errors/4.js b/Sprint-1/2-mandatory-errors/4.js deleted file mode 100644 index e82e55f20..000000000 --- a/Sprint-1/2-mandatory-errors/4.js +++ /dev/null @@ -1,12 +0,0 @@ -//const 12HourClockTime = "20:53"; -//const 24hourClockTime = "08:53"; - - -// problem is in javascript we cant start a variable name with a number. - -// correct way is: - -const.twelveHourClockTime = "20:53"; -const twentyFourHourClockTime = "08:53"; - -console.log(`The time in 12-hour format is ${twelveHourClockTime} and in 24-hour format is ${twentyFourHourClockTime}`); From 71b7003de77f7cac9d5dc258de5d5431b3cbe7dd Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:50:51 +0100 Subject: [PATCH 20/22] Delete Sprint-1/3-mandatory-interpret/1-percentage-change.js --- .../1-percentage-change.js | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 Sprint-1/3-mandatory-interpret/1-percentage-change.js diff --git a/Sprint-1/3-mandatory-interpret/1-percentage-change.js b/Sprint-1/3-mandatory-interpret/1-percentage-change.js deleted file mode 100644 index ef7165052..000000000 --- a/Sprint-1/3-mandatory-interpret/1-percentage-change.js +++ /dev/null @@ -1,36 +0,0 @@ -let carPrice = "10,000"; -let priceAfterOneYear = "8,543"; - -carPrice = Number(carPrice.replaceAll(",", "")); -priceAfterOneYear = Number(priceAfterOneYear.replaceAll(",", "")); - -const priceDifference = carPrice - priceAfterOneYear; -const percentageChange = (priceDifference / carPrice) * 100; - -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 - -// 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? - -// c) Identify all the lines that are variable reassignment statements - -// d) Identify all the lines that are variable declarations - -// e) Describe what the expression Number(carPrice.replaceAll(",","")) is doing - what is the purpose of this expression? - - -// a) There are 3 function calls in this file: -// `carPrice.replaceAll(",", "")` on line 5 -// `priceAfterOneYear.replaceAll(",", "")` on line 6 -// `Number(...)` on lines 5 and 6 -// b) The error occurs on line 5 there's a missing comma. -//c) The variable reassignment statements are: -// `carPrice = Number(carPrice.replaceAll(",", ""));` on line 5 -// `priceAfterOneYear = Number(priceAfterOneYear.replaceAll(",", ""));` on line 6 -// d) The variable declarations are: -// `let carPrice = "10,000";` on line 1 -// `let priceAfterOneYear = "8,543";` on line 2 -// e) The expression `Number(carPrice.replaceAll(",", ""))` is converting carprice, which contains a comma, into a number. \ No newline at end of file From 0c7b1057e7d7199b3b71ac4b07de56ef38298cd0 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:51:05 +0100 Subject: [PATCH 21/22] Delete Sprint-1/3-mandatory-interpret/2-time-format.js --- .../3-mandatory-interpret/2-time-format.js | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 Sprint-1/3-mandatory-interpret/2-time-format.js diff --git a/Sprint-1/3-mandatory-interpret/2-time-format.js b/Sprint-1/3-mandatory-interpret/2-time-format.js deleted file mode 100644 index 72db347ca..000000000 --- a/Sprint-1/3-mandatory-interpret/2-time-format.js +++ /dev/null @@ -1,52 +0,0 @@ -const movieLength = 8784; // length of movie in seconds - -const remainingSeconds = movieLength % 60; -const totalMinutes = (movieLength - remainingSeconds) / 60; - -const remainingMinutes = totalMinutes % 60; -const totalHours = (totalMinutes - remainingMinutes) / 60; - -const result = `${totalHours}:${remainingMinutes}:${remainingSeconds}`; -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? - -// b) How many function calls are there? - -// c) Using documentation, explain what the expression movieLength % 60 represents -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Arithmetic_Operators - -// d) Interpret line 4, what does the expression assigned to totalMinutes mean? - -// e) What do you think the variable result represents? Can you think of a better name for this variable? - -// f) Try experimenting with different values of movieLength. Will this code work for all values of movieLength? Explain your answer - - -// a) There are 6 variable declarations in this program: -// which are: - -// movieLength - -// remainingSeconds - -// totalMinutes - -// remainingMinutes - -// totalHours - -// result - -// b) There are 2 function calls in this program. - -// c) Expression movieLength %60 represents remainder of division by 60. - -// d) expression assigned to totalminutes means minutes in the movie by removing the remaining seconds and dividing by 60. - -// e) Result variable represents the total time. A better name would be totalTime. - -// f) Yes code will work for all the values of movielength. It'll always return the total time with no problems. But It's not working if movielength less than 60 seconds, more than 24 hours or negative values. - From 97d27ed941c600208493e2d0729110f2ed259bf4 Mon Sep 17 00:00:00 2001 From: Emin Akturk <116726768+eminakturk@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:51:27 +0100 Subject: [PATCH 22/22] Delete Sprint-1/3-mandatory-interpret/3-to-pounds.js --- Sprint-1/3-mandatory-interpret/3-to-pounds.js | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 Sprint-1/3-mandatory-interpret/3-to-pounds.js diff --git a/Sprint-1/3-mandatory-interpret/3-to-pounds.js b/Sprint-1/3-mandatory-interpret/3-to-pounds.js deleted file mode 100644 index 428a57f40..000000000 --- a/Sprint-1/3-mandatory-interpret/3-to-pounds.js +++ /dev/null @@ -1,37 +0,0 @@ -const penceString = "399p"; - -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"); - -console.log(`£${pounds}.${pence}`); - -// This program takes a string representing a price in pence -// The program then builds up a string representing the price in pounds - -// You need to do a step-by-step breakdown of each line in this program -// Try and describe the purpose / rationale behind each step - -// To begin, we can start with -// 1. const penceString = "399p": initialises a string variable with the value "399p" - -// 2. const penceStringWithoutTrailingP = penceString.substring(0, penceString.length - 1): This line removes the trailing 'p' from the string. - -// 3. const paddedPenceNumberString = penceStringWithoutTrailingP.padStart(3, "0"): This line puts the string into a 3 character string padding with zeros. - -// 4. const pounds = paddedPenceNumberString.substring(0, paddedPenceNumberString.length - 2): This line takes out the pounds part of the string. - -// 5. const pence = paddedPenceNumberString.substring(paddedPenceNumberString.length - 2).padEnd(2, "0"): This line takes out pence part and pads it to 2 characters. - -// 6. console.log(`£${pounds}.${pence}`): This line prints the final results. \ No newline at end of file