Week3 amended

.github/pull_request_template.md

@@ -1,10 +1,10 @@
 # Your Details
 
-Your Name:
-Your City:
-Your Slack Name:
+Your Name:Abdennour Hachemi 
+Your City:Birmingham
+Your Slack Name:nouri89
 
 # Homework Details
 
-Module:
-Week:
+Module:javaScript 
+Week:3

week-1/1-exercises/B-hello-world/exercise.js

@@ -1 +1,3 @@
-console.log("Hello world");
+console.log('Hello world. i have just started learning javaScript.' + 4 + ` testing the new methode over ${24} hours`);
+
+console.log(1);

week-1/1-exercises/C-variables/exercise.js

@@ -1,3 +1,4 @@
-// Start by creating a variable `greeting`
-
-console.log(greeting);
+let greeting = 'Hello World';
+for (i = 0; i < 3; i++) {
+	console.log(greeting);
+}

week-1/1-exercises/D-strings/exercise.js

@@ -1,3 +1,4 @@
-// Start by creating a variable `message`
+let message = 'Learning javaScript is Fun ';
+let myMessage = typeof message;
 
-console.log(message);
+console.log(`${message} \n${myMessage}`);

week-1/1-exercises/E-strings-concatenation/exercise.js

@@ -1,3 +1,5 @@
-// Start by creating a variable `message`
+        let greeting = "Hello, my name is ";
+        let myName = "Abdennour";
+        let message = greeting + myName;
 
-console.log(message);
+        console.log(message);

week-1/1-exercises/F-strings-methods/exercise.js

@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
-
+var myName = "Abdennour";
+var myNameLowerCase=myName.toLowerCase();
+var myNameLength = myName.length;
+var message =
+	"My Name is "+ myName+" and iss " + myNameLength + " Characters Long.";
 console.log(message);
+console.log(myNameLowerCase);

week-1/1-exercises/F-strings-methods/exercise2.js

@@ -1,3 +1,6 @@
-const name = " Daniel  ";
+const name = " Daniel  ".trim();
+let nameLength = name.length;
 
+var message =
+	"My Name is " + name + "and is " + nameLength + " Characters Long.";
 console.log(message);

week-1/1-exercises/G-numbers/exercise.js

@@ -1 +1,9 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 15;
+var numberOfMentors = 8;
+console.log(
+	`Number of students: ${numberOfStudents}\nNumber of mentors: ${numberOfMentors}\nTotal number of students and mentors: ${
+		numberOfStudents + numberOfMentors
+	}`
+);
+

week-1/1-exercises/I-floats/exercise.js

@@ -1,2 +1,20 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+/*    Using the variables provided in the exercise calculate the percentage of mentors and students in the group
+
+## Expected result
+
+```
+Percentage students: 65%
+Percentage mentors: 35%*/
+var numberOfStudents = 15;
+var numberOfStudents = 15;
+var studentsPercentage = Math.round(
+	(numberOfStudents / (numberOfStudents + numberOfMentors)) * 100
+);
+var numberOfMentors = 8;
+var mentorsPercentage = Math.round(
+	(numberOfMentors / (numberOfStudents + numberOfMentors)) * 100
+);
+console.log(`Percentage students: ${studentsPercentage}%`);
+console.log(`Percentage mentors: ${mentorsPercentage}%`);

week-1/1-exercises/J-functions/exercise.js

@@ -1,7 +1,10 @@
 function halve(number) {
-  // complete the function here
+
+	return number / 2;
 }
 
 var result = halve(12);
 
 console.log(result);
+console.log(halve(111));
+console.log(halve(20.5));

week-1/1-exercises/J-functions/exercise2.js

@@ -1,5 +1,5 @@
 function triple(number) {
-  // complete function here
+	return number * 3;
 }
 
 var result = triple(12);

week-1/1-exercises/K-functions-parameters/exercise.js

@@ -1,5 +1,7 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(a,b) {
+  var multiple= a*b;
+  return multiple;
   // Calculate the result of the function and return it
 }
 

week-1/1-exercises/K-functions-parameters/exercise2.js

@@ -1,4 +1,8 @@
 // Declare your function first
+function divide(a,b){
+    var division=a/b;
+    return division;
+}
 
 var result = divide(3, 4);
 

week-1/1-exercises/K-functions-parameters/exercise3.js

@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(name){
+    return `Hello, my name is ${name}`
+}
 
 var greeting = createGreeting("Daniel");
 

week-1/1-exercises/K-functions-parameters/exercise4.js

@@ -1,5 +1,9 @@
 // Declare your function first
+function addition(num1, num2) {
+	let result = num1 + num2;
+	return result;
+}
 
 // Call the function and assign to a variable `sum`
-
+let sum = addition(13, 124);
 console.log(sum);

week-1/1-exercises/K-functions-parameters/exercise5.js

@@ -1,4 +1,16 @@
 // Declare your function here
+/* * Write a function that takes a name (a string) and an age (a number) and returns a greeting (a string)
+
+## Expected result
+
+```
+Hello, my name is Daniel and I'm 30 years old
+```
+ */
+function createLongGreeting(string, num) {
+	let greet = `Hello, my name is ${string} and I'm ${num} years old `;
+	return greet;
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

week-1/1-exercises/L-functions-nested/exercise.js

@@ -3,3 +3,32 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+var students = 15;
+var mentors = 8;
+function percentage(calculatePercentage) {
+	var percent = Math.round((calculatePercentage / (students + mentors)) * 100);
+	return percent;
+}
+
+function message() {
+	console.log(
+		`Percentage Mentors: ${percentage(
+			students
+		)}%\nPercentage mentors: ${percentage(mentors)}%`
+	);
+}
+message();
+/* In `exercise2.js` you have been provided with the names of some mentors. Write a program that logs a shouty greeting to each one.
+- Your program should include a function that spells their name in uppercase, and a function that creates a shouty greeting.
+- Log each greeting to the console.   */
+function upperCase(name) {
+	mentorName = name.toUpperCase();
+	return mentorName;
+}
+mentors = [mentor1, mentor2, mentor3, mentor3, mentor4, mentor5];
+function greeting() {
+	for (i = 0; i < 5; i++) {
+		console.log(`HEllO ${upperCase(mentors[i])}`);
+	}
+}
+greeting();

week-1/3-extra/1-currency-conversion.js

@@ -5,7 +5,10 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(AmountToConvert) {
+	var usDollarEquivlent = AmountToConvert * 1.4;
+	return usDollarEquivlent; //.toFixed(2);
+}
 
 /*
   CURRENCY FORMATTING
@@ -16,7 +19,16 @@ function convertToUSD() {}
   Find a way to add 1% to all currency conversions (think about the DRY principle)
 */
 
-function convertToBRL() {}
+function convertToBRL(AmountToConvert) {
+	var realBrazilianEquivlent = AmountToConvert * 5.7;
+	realBrazilianEquivlent = addOnePercentFee(realBrazilianEquivlent);
+	return realBrazilianEquivlent; //.toFixed(2);
+}
+function addOnePercentFee(transactionAmount) {
+	var fee = transactionAmount * 0.01;
+	transactionPlusFee = transactionAmount + fee;
+	return transactionPlusFee;
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.
@@ -25,14 +37,14 @@ To run these tests type `node 1-currency-conversion` into your terminal
 */
 
 function test(test_name, expr) {
-  let status;
-  if (expr) {
-    status = "PASSED";
-  } else {
-    status = "FAILED";
-  }
-
-  console.log(`${test_name}: ${status}`);
+	let status;
+	if (expr) {
+		status = "PASSED";
+	} else {
+		status = "FAILED";
+	}
+
+	console.log(`${test_name}: ${status}`);
 }
 
 test("convertToUSD function works", convertToUSD(32) === 44.8);

week-1/3-extra/2-piping.js

@@ -16,26 +16,30 @@
   the final result to the variable goodCode
 */
 
-function add() {
-
+function add(x, y) {
+	let sum = (x * 10 + y * 10) / 10;
+	return sum;
 }
-
-function multiply() {
-
+console.log(add(2.4, 5.3));
+function multiply(x, y) {
+	let multiple = x * y;
+	return multiple;
 }
 
-function format() {
-
+function format(number) {
+	return `£${number}`;
 }
 
-const startingValue = 2
+const startingValue = 2;
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode = 
+let badCode = format(multiply(add(startingValue, 10), 2));
 
 /* BETTER PRACTICE */
 
-let goodCode = 
+let goodCode = add(startingValue, 10);
+goodCode = multiply(goodCode, 2);
+goodCode = format(goodCode);
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.
@@ -44,19 +48,19 @@ To run these tests type `node 2-piping.js` into your terminal
 */
 
 function test(test_name, expr) {
-  let status;
-  if (expr) {
-      status = "PASSED"
-  } else {
-      status = "FAILED"
-  }
-
-  console.log(`${test_name}: ${status}`)
+	let status;
+	if (expr) {
+		status = "PASSED";
+	} else {
+		status = "FAILED";
+	}
+
+	console.log(`${test_name}: ${status}`);
 }
 
-test('add function - case 1 works', add(1,3) === 4)
-test('add function - case 2 works', add(2.4,5.3) === 7.7)
-test('multiply function works', multiply(2,3) === 6)
-test('format function works', format(16) === "£16")
-test('badCode variable correctly assigned', badCode === "£24")
-test('goodCode variable correctly assigned', goodCode === "£24")
+test("add function - case 1 works", add(1, 3) === 4);
+test("add function - case 2 works", add(2.4, 5.3) === 7.7);
+test("multiply function works", multiply(2, 3) === 6);
+test("format function works", format(16) === "£16");
+test("badCode variable correctly assigned", badCode === "£24");
+test("goodCode variable correctly assigned", goodCode === "£24");

week-2/0-freecodecamp/0-freecodecamp.md

@@ -1,4 +1,4 @@
-## FreeCodeCamp
+## FreeCodeCamp done
 
 If you haven't already, you should complete all of these lessons on FreeCodeCamp - https://www.freecodecamp.org/learn
 

week-2/1-exercises/A-expressions/README.md

@@ -1,3 +1,4 @@
+/***********************DONE***************************************************************/
 In JavaScript there are **expressions** and **statements**. We will use these words frequently to describe code.
 
 ### Expression

week-2/1-exercises/B-boolean-literals/exercise.js

@@ -6,15 +6,18 @@
 */
 
 var codeYourFutureIsGreat = true;
+var mozafarIsCool = false;
+var calculationCorrect = true;
+var moreThan10Students = false;
 
 /* 
   DO NOT EDIT BELOW THIS LINE
   --------------------------- */
 
-console.log("Is Code Your Future great?", codeYourFutureIsGreat);
-console.log("Is Mozafar cool?", mozafarIsCool);
-console.log("Does 1 + 1 = 2?", calculationCorrect);
-console.log("Are there more than 10 students?", moreThan10Students);
+console.log('Is Code Your Future great?', codeYourFutureIsGreat);
+console.log('Is Mozafar cool?', mozafarIsCool);
+console.log('Does 1 + 1 = 2?', calculationCorrect);
+console.log('Are there more than 10 students?', moreThan10Students);
 
 /* 
   EXPECTED RESULT

week-2/1-exercises/C-comparison-operators/exercise.js

@@ -7,14 +7,14 @@
 
 var studentCount = 16;
 var mentorCount = 9;
-var moreStudentsThanMentors; // finish this statement
+var moreStudentsThanMentors= studentCount>mentorCount; // finish this statement
 
 var roomMaxCapacity = 25;
-var enoughSpaceInRoom; // finish this statement
+var enoughSpaceInRoom=roomMaxCapacity>=(studentCount+mentorCount); // finish this statement
 
 var personA = "Daniel";
 var personB = "Irina";
-var sameName; // finish this statement
+var sameName=personA===personB; // finish this statement
 
 /* 
   DO NOT EDIT BELOW THIS LINE

week-2/1-exercises/D-predicates/exercise.js

@@ -7,12 +7,13 @@
 
 // Finish the predicate function to test if the passed number is negative (less than zero)
 function isNegative(number) {
+  return number<0;
 
 }
 
 // Finish the predicate function to test if the passed number is between 0 and 10
 function isBetweenZeroAnd10(number) {
-
+ return (number >= 0 && number <=10) ;
 }
 
 /*