Skip to content

Commit 867a711

Browse files
author
Alexey Chernykh
committed
fixed compane.py
1 parent b3ba249 commit 867a711

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

company.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,44 +69,50 @@
6969
department_salary = []
7070
for employer in department['employers']:
7171
department_salary.append(employer['salary_rub'])
72-
print(f'Отдел {department["title"]}, минимальная зарплата {sorted(department_salary)[0]}')
72+
print(f'Отдел {department["title"]} - минимальная зарплата {sorted(department_salary)[0]}')
7373

7474
for department in departments: # task 8
7575
department_salary = []
7676
avg_salary = 0
7777
for employer in department['employers']:
7878
department_salary.append(employer['salary_rub'])
7979
avg_salary = sum(department_salary) / len(department_salary)
80-
print(f'Отдел {department["title"]}: минимальная зарплата {sorted(department_salary)[0]}, cредняя зарплата '
81-
f'{int(avg_salary)}, максимальная зарплата {sorted(department_salary)[-1]}')
80+
min_salary = sorted(department_salary)[0]
81+
max_salary = sorted(department_salary)[-1]
82+
print(f'Отдел {department["title"]}: минимальная зарплата {min_salary}')
83+
print(f'Отдел {department["title"]}: максимальная зарплата {max_salary}')
84+
print(f'Отдел {department["title"]}: cредняя зарплата {int(avg_salary)}')
8285

8386
avg_salary = 0 # task 9
8487
department_salary = []
8588
for department in departments:
8689
for employer in department['employers']:
8790
department_salary.append(employer['salary_rub'])
8891
avg_salary = sum(department_salary) / len(department_salary)
89-
print(f'Средняя зарплата {avg_salary}')
92+
print(f'Средняя зарплата компании {avg_salary}')
9093

91-
for department in departments: # task 10
94+
salary_over_90 = [] # task 10
95+
for department in departments:
9296
for employer in department['employers']:
9397
if employer['salary_rub'] > 90000:
94-
print(f'{employer["position"]} получает больше 90К')
98+
salary_over_90.append(employer["position"])
99+
print(f'{", ".join(salary_over_90)} получают больше 90К')
95100

96101
for department in departments: # task 11
97-
avg_girls_salary = 0
102+
girls = ['Michelle', 'Nicole', 'Christina', 'Caitlin', ]
98103
girl_salary = []
99104
for employer in department['employers']:
100-
if employer['first_name'] == 'Michelle' or employer['first_name'] == 'Nicole' or employer['first_name'] == \
101-
'Christina' or employer['first_name'] == 'Caitlin':
105+
if employer['first_name'] in girls:
102106
girl_salary.append(employer['salary_rub'])
103107
avg_girls_salary = sum(girl_salary) / len(girl_salary)
104108
print(f'Средняя зарплата девушек по {department["title"]} составляет: {int(avg_girls_salary)}')
105109

110+
end_vowel_letter_in_last_name = []
106111
for department in departments: # task 12
107112
for employer in department['employers']:
108113
if employer['last_name'][-1] in 'aeiouy':
109-
print(f'Фамилия сотрудника {employer["first_name"]} заканчивается на гласную букву')
114+
end_vowel_letter_in_last_name.append(employer["first_name"])
115+
print(f'Фамилии сотрудников {", ".join(end_vowel_letter_in_last_name)} оканчиваются на гласную букву')
110116

111117

112118

0 commit comments

Comments
 (0)