Skip to content

Commit 7ff8a37

Browse files
author
Alexey Chernykh
committed
fixed company.py
1 parent 991276a commit 7ff8a37

File tree

9 files changed

+13
-259
lines changed

9 files changed

+13
-259
lines changed

.idea/.gitignore

Whitespace-only changes.

.idea/basic_exercises.iml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/workspace.xml

Lines changed: 0 additions & 210 deletions
This file was deleted.

company.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@
4949
for employer in department['employers']:
5050
print(f'{employer["first_name"]} работает в {department["title"]}')
5151

52-
for department in departments: # task 4
52+
task_salary = 100000 # task 4
53+
for department in departments:
5354
for employer in department['employers']:
54-
if employer['salary_rub'] > 100000:
55+
if employer['salary_rub'] > task_salary:
5556
print(f'Заработная плата {employer["first_name"]} превышает 100К')
5657

57-
for department in departments: # task 5
58+
task_salary = 80000 # task 5
59+
for department in departments:
5860
for employer in department['employers']:
59-
if employer['salary_rub'] < 80000:
61+
if employer['salary_rub'] < task_salary:
6062
print(f'Заработная плата {employer["position"]} ниже 80К')
6163

6264
for department in departments: # task 6
@@ -83,22 +85,22 @@
8385
print(f'Отдел {department["title"]}: максимальная зарплата {max_salary}')
8486
print(f'Отдел {department["title"]}: cредняя зарплата {int(avg_salary)}')
8587

86-
avg_salary = 0 # task 9
87-
salary = []
88+
salary = [] # task 9
8889
for department in departments:
8990
for employer in department['employers']:
9091
salary.append(employer['salary_rub'])
9192
avg_salary = sum(salary) / len(salary)
9293
print(f'Средняя зарплата компании {avg_salary}')
9394

94-
salary_cap = [] # task 10
95+
task_salary = 90000 # task 10
96+
salary_cap = []
9597
for department in departments:
9698
for employer in department['employers']:
97-
if employer['salary_rub'] > 90000:
99+
if employer['salary_rub'] > task_salary:
98100
salary_cap.append(employer["position"])
99101
print(f'{", ".join(salary_cap)} получают больше 90К')
100102

101-
girls = ['Michelle', 'Nicole', 'Christina', 'Caitlin', ] # task 11
103+
girls = ['Michelle', 'Nicole', 'Christina', 'Caitlin'] # task 11
102104
for department in departments:
103105
girl_salary = []
104106
for employer in department['employers']:
@@ -107,8 +109,8 @@
107109
avg_girls_salary = sum(girl_salary) / len(girl_salary)
108110
print(f'Средняя зарплата девушек по {department["title"]} составляет: {int(avg_girls_salary)}')
109111

110-
end_vowel_letter_in_last_name = []
111-
for department in departments: # task 12
112+
end_vowel_letter_in_last_name = [] # task 12
113+
for department in departments:
112114
for employer in department['employers']:
113115
if employer['last_name'][-1] in 'aeiouy':
114116
end_vowel_letter_in_last_name.append(employer["first_name"])

0 commit comments

Comments
 (0)