Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a5a2489

Browse files
rabradrabrad
committed
Amendments after feedback from Marciano
1 parent 7295293 commit a5a2489

File tree

7 files changed

+98
-58
lines changed

7 files changed

+98
-58
lines changed

‎Week3/Homework-Week3/assets/morejs_10.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@
55
(Hint: use a for loop.)*/
66
const vehicles = [' motorbike', ' scooter', ' caravan', ' bike'];
77

8-
function advert() {
8+
function advert(vehicleNames) {
99
let advString = '';
10-
11-
for (let i = 0; i < vehicles.length; i++) {
12-
if (i === vehicles.length - 1) {
13-
advString += vehicles[i] + 's.';
14-
} else {
15-
advString += vehicles[i] + 's,';
10+
for (let i = 0; i < vehicleNames.length - 1; i++) {
11+
const name = vehicleNames[i];
12+
if (i > 0) {
13+
advString += ',';
1614
}
15+
advString += name + 's';
1716
}
18-
return "Amazing Joe's Garage, we service for" + advString;
17+
advString += ' and' + vehicleNames[vehicleNames.length - 1] + 's.';
18+
return "Amazing Joe's Garage, we service " + advString;
1919
}
20-
console.log(advert());
20+
21+
const advString = advert(vehicles);
22+
console.log(advString);
23+
2124
//
2225
}

‎Week3/Homework-Week3/assets/morejs_11.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@
77
//and will console.log accordingly:
88

99
const vehicles = [' motorbike', ' scooter', ' caravan', ' bike'];
10+
vehicles.push(' lorry'); // To add new element to the end of the array.
1011

11-
function advert() {
12+
function advert(vehicleNames) {
1213
let advString = '';
13-
14-
for (let i = 0; i < vehicles.length; i++) {
15-
if (i === vehicles.length - 1) {
16-
advString += vehicles[i] + 's.';
17-
} else {
18-
advString += vehicles[i] + 's,';
14+
for (let i = 0; i < vehicleNames.length - 1; i++) {
15+
const name = vehicleNames[i];
16+
if (i > 0) {
17+
advString += ',';
1918
}
19+
advString += name + 's';
2020
}
21-
return "Amazing Joe's Garage, we service for" + advString;
21+
advString += ' and' + vehicleNames[vehicleNames.length - 1] + 's.';
22+
return "Amazing Joe's Garage, we service " + advString;
2223
}
23-
vehicles.push(' lorry'); // To add new element to the end of the array.
24-
console.log(advert());
25-
//
24+
25+
const advString = advert(vehicles);
26+
console.log(advString);
2627
}

‎Week3/Homework-Week3/assets/morejs_12_13_14.js

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,41 @@
11
{
22
// 12: Create an empty object.
33
const hyf = new Object();
4+
console.log('This is an empty object: ', hyf);
45

56
// Create an object that contains the teachers that you have had
67
//so far for the different modules.
7-
hyf.teachers = 'Philipp, Rob, Unmesh, Bonan, Yash';
8+
const teachers = {
9+
Philipp: {
10+
name: 'philipp',
11+
},
12+
rob: {
13+
name: 'Rob',
14+
},
15+
unmesh: {
16+
name: 'Unmesh',
17+
},
18+
Bonan: {
19+
name: 'Bonan',
20+
},
21+
yash: {
22+
name: 'Yash',
23+
},
24+
};
825

926
// Add a property to the object you just created that contains
1027
//the languages that they have taught you.
11-
hyf.lang = 'html, css, js, cli';
28+
teachers.Philipp.languages = ['HTML', 'CSS'];
29+
teachers.rob.languages = ['HTML', 'CSS'];
30+
teachers.unmesh.languages = ['Git', 'CLI'];
31+
teachers.Bonan.languages = ['GIT', 'CLI'];
32+
teachers.yash.languages = ['JS'];
1233

13-
console.log(hyf); //wil log : {teachers: "Philipp, Rob, Unmesh, Bonan, Yash", lang: "html, css, js, cli"}
34+
console.log('hyf teachers: ', teachers);
35+
/* wil log:
36+
{teachers: Array(5), lang: Array(4)}
37+
lang: (4) ["html", "css", "js", "cli"]
38+
teachers: (5) ["Philipp", "Rob", "Unmesh", "Bonan", "Yash"]
39+
40+
*/
1441
}

‎Week3/Homework-Week3/assets/morejs_3.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55

66
const car = { made: 'Honada', year: 2019, color: 'Red', availableNow: true };
77

8-
function myFunc() {
9-
return car;
10-
}
11-
console.log(myFunc());
8+
function myFunction(object) {
9+
const objectKeys = Object.keys(object);
1210

13-
//
11+
for (let i = 0; i < objectKeys.length; i++) {
12+
const keyName = objectKeys[i];
13+
console.log(keyName + ': ' + object[keyName]);
14+
}
15+
}
16+
myFunction(car);
1417
}

‎Week3/Homework-Week3/assets/morejs_5.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
/*
33
Can you write the following without the if statement,
44
but with just as a single line with console.log(...);?
5-
6-
7-
if (3 === 3) {
8-
console.log('yes');
9-
} else {
10-
console.log('no');
11-
}
125
*/
136

14-
console.log("No, I couldn't find a way to replace if statement with single line of console log");
7+
if (3 === 3) {
8+
console.log('yes');
9+
} else {
10+
console.log('no');
11+
}
12+
// Now. Yes, I can. Thanks for the link.
13+
//https://www.w3schools.com/js/js_comparisons.asp
14+
15+
console.log(3 === 3 ? 'yes' : 'no');
1516
}

‎Week3/Homework-Week3/assets/morejs_6.js

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,24 @@ but takes another parameter called age, so that
44
vehicle("blue", 1, 5) prints 'a blue used car' */
55

66
function vehicle(color, code, age) {
7-
// declare empty variables
8-
var selectVehicle;
9-
let carAge;
10-
11-
// use if statement to update the empty variables:
12-
7+
// Vehivle type:
8+
let selectVehicle;
139
if (code === 1) {
14-
if (age >= 5) {
15-
selectVehicle = 'car';
16-
carAge = 'used';
17-
return 'A ' + color + ' ' + carAge + ' ' + selectVehicle;
18-
}
10+
selectVehicle = 'car';
1911
} else if (code === 2) {
20-
if (age <= 5) {
21-
selectVehicle = 'motorbike';
22-
carAge = 'new';
23-
return 'A ' + color + ' ' + carAge + ' ' + selectVehicle;
24-
}
12+
selectVehicle = 'motobike';
2513
} else {
26-
return 'Use valed values';
14+
selectVehicle = 'unknown vehicle type. Please use value 1 or 2';
2715
}
16+
// Vehivle condition:
17+
let carAge = 'new';
18+
if (age > 1) {
19+
carAge = 'used';
20+
}
21+
22+
return 'A ' + color + ' ' + carAge + ' ' + selectVehicle;
2823
}
2924
console.log(vehicle('blue', 1, 5));
30-
console.log(vehicle('white', 2, 4));
25+
console.log(vehicle('white', 2, 7));
3126
console.log(vehicle('white', 3, 6));
3227
}

‎Week3/Homework-Week3/assets/morejs_9.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1+
/*
2+
Change the function vehicle to use the list of question 7.
3+
So that vehicle("green", 3, 1) prints "a green new bike".
4+
*/
5+
16
function vehicle(color, code, age) {
27
let vehicles = ['motorbike', 'scooter', 'caravan', 'bike'];
38
let selectVehicle;
49
let carAge;
510

6-
for (let i = 0; i < vehicles.length; i++) {
7-
if (code === i) {
8-
selectVehicle = vehicles[i];
9-
}
11+
// for (let i = 0; i < vehicles.length; i++) {
12+
// if (code === i) {
13+
// selectVehicle = vehicles[i];
14+
// }
15+
// }
16+
17+
if (code >= 0 && code < vehicles.length) {
18+
selectVehicle = code;
1019
}
20+
1121
if (age >= 1) {
1222
carAge = 'used';
1323
} else if (age <= 1) {

0 commit comments

Comments
 (0)