From 06d43d62088b588f871ab61685aa12644ca012ae Mon Sep 17 00:00:00 2001 From: student1232354 Date: Fri, 3 Jul 2026 14:16:09 +0300 Subject: [PATCH 1/4] first update --- src/scripts/main.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/scripts/main.js b/src/scripts/main.js index a765fdb1d..8ca261229 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1,3 +1,21 @@ 'use strict'; -// write code here +const dataitems = document.querySelectorAll('ul li'); +const ul = document.querySelector('ul'); + + +function compareSalary(a, b) { + const salarya = Number(a.dataset.salary.replace('$', '').replaceAll(',', '')); + const salaryb = Number(b.dataset.salary.replace('$', '').replaceAll(',', '')); + + return salaryb - salarya; +} +function moveToEnd(li) { + ul.append(li); +} + + +const elementsArray = Array.from(dataitems); +const sortingitems = elementsArray.sort(compareSalary); + +sortingitems.forEach(moveToEnd); From b43f2926457dc078ad6cb76c0069e8b349abe42a Mon Sep 17 00:00:00 2001 From: student1232354 Date: Fri, 3 Jul 2026 15:04:49 +0300 Subject: [PATCH 2/4] second update --- src/scripts/main.js | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/scripts/main.js b/src/scripts/main.js index 8ca261229..d33d02182 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1,8 +1,19 @@ 'use strict'; -const dataitems = document.querySelectorAll('ul li'); -const ul = document.querySelector('ul'); +function getEmployees(list) { + const items = list.querySelectorAll('li'); + + return Array.from(items).map(function(li) { + const clearsalary = Number(li.dataset.salary.replace('$', '').replaceAll(',', '')); + return { + name: li.textContent.trim(), + position: li.dataset.position, + salary: clearsalary, + age: Number(li.dataset.age) + }; + }); +} function compareSalary(a, b) { const salarya = Number(a.dataset.salary.replace('$', '').replaceAll(',', '')); @@ -10,12 +21,18 @@ function compareSalary(a, b) { return salaryb - salarya; } -function moveToEnd(li) { - ul.append(li); + +function sortlist(list) { + const items = list.querySelectorAll('li'); + const sorteditems = Array.from(items).sort(compareSalary); + + sorteditems.forEach(function(li) { + list.append(li); + }); } +const ul = document.querySelector('ul'); -const elementsArray = Array.from(dataitems); -const sortingitems = elementsArray.sort(compareSalary); +const likeresult = getEmployees(ul); -sortingitems.forEach(moveToEnd); +sortlist(ul); From f3f9fdb4202b67e61e8c56e8f7adb4dc7dec154d Mon Sep 17 00:00:00 2001 From: student1232354 Date: Fri, 3 Jul 2026 15:18:26 +0300 Subject: [PATCH 3/4] third update --- src/scripts/main.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/scripts/main.js b/src/scripts/main.js index d33d02182..f4d2a2066 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1,28 +1,31 @@ 'use strict'; +function getSalary(li) { + return Number(li.dataset.salary.replace('$', '').replaceAll(',', '')); +} + function getEmployees(list) { const items = list.querySelectorAll('li'); return Array.from(items).map(function(li) { - const clearsalary = Number(li.dataset.salary.replace('$', '').replaceAll(',', '')); + + const name = li.dataset.name || li.textContent.trim(); return { - name: li.textContent.trim(), + name: name, position: li.dataset.position, - salary: clearsalary, + salary: getSalary(li), age: Number(li.dataset.age) }; }); } function compareSalary(a, b) { - const salarya = Number(a.dataset.salary.replace('$', '').replaceAll(',', '')); - const salaryb = Number(b.dataset.salary.replace('$', '').replaceAll(',', '')); - return salaryb - salarya; + return getSalary(b) - getSalary(a); } -function sortlist(list) { +function sortList(list) { const items = list.querySelectorAll('li'); const sorteditems = Array.from(items).sort(compareSalary); @@ -32,7 +35,6 @@ function sortlist(list) { } const ul = document.querySelector('ul'); +getEmployees(ul); -const likeresult = getEmployees(ul); - -sortlist(ul); +sortList(ul); From a448bca13a0ad03964d3bb7b8ccc2e295387c707 Mon Sep 17 00:00:00 2001 From: student1232354 Date: Fri, 3 Jul 2026 15:24:17 +0300 Subject: [PATCH 4/4] fourth update --- src/scripts/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/main.js b/src/scripts/main.js index f4d2a2066..0e8727530 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -9,10 +9,10 @@ function getEmployees(list) { return Array.from(items).map(function(li) { - const name = li.dataset.name || li.textContent.trim(); + const personname = li.dataset.name || li.textContent.trim(); return { - name: name, + name: personname, position: li.dataset.position, salary: getSalary(li), age: Number(li.dataset.age)