Skip to content

Commit 0e2b868

Browse files
Balashov NikitaOlegLustenko
authored andcommitted
fixed
1 parent f936922 commit 0e2b868

File tree

1 file changed

+22
-33
lines changed
  • js-core/homeworks/homework-9/src

1 file changed

+22
-33
lines changed

js-core/homeworks/homework-9/src/main.js

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,22 @@ function goodDev(dev) {
3939
if(elem === requireElem) {
4040
const successNotification = `${elem} ... success`;
4141
return console.log(successNotification);
42-
} else {
43-
const failNotification = `${elem} ... fail`;
44-
return console.log(failNotification);
4542
}
4643
});
4744
console.log(`---------------`);
4845
}
4946

5047
if(this.experience && this.requirements) {
5148
const experienceArrayWithObjects = this.experience;
52-
const emptyArray = [];
53-
experienceArrayWithObjects.forEach((elem, index, arr) => {
54-
const getAObjectfromExperience = arr[index];
55-
const valueOfKey = Object.values(getAObjectfromExperience);
56-
const transformValueToString = valueOfKey.join('');
57-
emptyArray.push(transformValueToString);
49+
const writeDownExperienceToArray = experienceArrayWithObjects.map((elem, index, arr) => {
50+
const getAObjectfromExperience = elem;
51+
const accessToProperty = Object.values(getAObjectfromExperience);
52+
const transformValueToString = accessToProperty.join('');
53+
return transformValueToString;
5854
});
5955

6056
const requirements = this.requirements;
61-
const concatArrays = emptyArray.concat(requirements);
57+
const concatArrays = writeDownExperienceToArray.concat(requirements);
6258
const checkOnCommonSkills = concatArrays.sort(sortArray);
6359

6460
checkOnCommonSkills.forEach((elem, index, arr) => {
@@ -68,9 +64,6 @@ function goodDev(dev) {
6864
if(elem === nextElem) {
6965
const successNotification = `${elem} ... success`;
7066
return console.log(successNotification);
71-
} else if (elem !== nextElem && elem !== lastElem) {
72-
const failNotification = `${elem} ... fail`;
73-
console.log(failNotification);
7467
}
7568
});
7669
console.log(`---------------`);
@@ -113,23 +106,19 @@ let myObject = {
113106
]
114107
};
115108

116-
function compareAge(a, b) {
117-
if(a.age > b.age) return 1;
118-
if(a.age < b.age) return -1;
119-
}
120-
function compareName(a, b) {
121-
if(a.name > b.name) return 1;
122-
if(a.name < b.name) return -1;
123-
}
124-
125109
myObject.myFilter = function(param) {
110+
111+
function compare(a, b) {
112+
if(a[param] > b[param]) return 1;
113+
if(a[param] < b[param]) return -1;
114+
}
126115

127116
if(param === `age`) {
128-
const sortDatabase = this.database.sort(compareAge);
117+
const sortDatabase = this.database.sort(compare);
129118
return sortDatabase;
130119
}
131120
if(param === `name`) {
132-
const sortDatabase2 = this.database.sort(compareName);
121+
const sortDatabase2 = this.database.sort(compare);
133122
return sortDatabase2;
134123
}
135124

@@ -183,8 +172,8 @@ const moveZeroToEnd = (arr) => {
183172
let oldArrayWithoutZero = [];
184173
let newArray = [];
185174

186-
for(let i = 0; i < arr.length; i++) {
187-
const elemOfArr = arr[i];
175+
arr.forEach(elem => {
176+
const elemOfArr = elem;
188177

189178
if(elemOfArr !== 0) {
190179
oldArrayWithoutZero.push(elemOfArr);
@@ -193,7 +182,8 @@ const moveZeroToEnd = (arr) => {
193182
if(elemOfArr === 0) {
194183
newArray.push(elemOfArr);
195184
}
196-
}
185+
});
186+
197187
return console.log(oldArrayWithoutZero.concat(newArray));
198188
}
199189

@@ -218,17 +208,16 @@ const nameShuffler = (str) => {
218208

219209
const capMe = (arr) => {
220210

221-
for(let i = 0; i < arr.length; i++) {
222-
let elemOfArray = arr[i];
211+
return arr.map(elem => {
212+
let elemOfArray = elem;
223213
let valueOfElemToLowerCase = elemOfArray.toLowerCase();
224214
let divideOnArray = valueOfElemToLowerCase.split('');
225215
let firstLetterToUpperCase = divideOnArray[0].toUpperCase();
226216
divideOnArray.shift();
227217
divideOnArray.unshift(firstLetterToUpperCase);
228218
let joinUp = divideOnArray.join('');
229-
arr[i] = joinUp;
230-
}
231-
return arr;
219+
return joinUp;
220+
});
232221
}
233222

234223

@@ -257,7 +246,7 @@ const capMe = (arr) => {
257246
//// fn.length == arguments.length
258247
//
259248
//function addMethod(object, name, fn) {
260-
//
249+
//
261250
//}
262251
//
263252
//addMethod(junior, 'ok', function() {

0 commit comments

Comments
 (0)