fixed company.py, for_dict_challenges.py

Author: Alexey Chernykh

company.py

@@ -53,13 +53,13 @@
 for department in departments:
     for employer in department['employers']:
         if employer['salary_rub'] > task_salary:
-            print(f'Заработная плата {employer["first_name"]} превышает 100К')
+            print(f'Заработная плата {employer["first_name"]} превышает {task_salary}К')
 
 task_salary = 80000  # task 5
 for department in departments:
     for employer in department['employers']:
         if employer['salary_rub'] < task_salary:
-            print(f'Заработная плата {employer["position"]} ниже 80К')
+            print(f'Заработная плата {employer["position"]} ниже {task_salary}К')
 
 for department in departments:   # task 6
     department_salary = 0
@@ -98,7 +98,7 @@
     for employer in department['employers']:
         if employer['salary_rub'] > task_salary:
             salary_cap.append(employer["position"])
-print(f'{", ".join(salary_cap)} получают больше 90К')
+print(f'{", ".join(salary_cap)} получают больше {task_salary}К')
 
 girls = ['Michelle', 'Nicole', 'Christina', 'Caitlin']  # task 11
 for department in departments:
@@ -116,6 +116,3 @@
             end_vowel_letter_in_last_name.append(employer["first_name"])
             end_vowel_letter_in_last_name_set = set(end_vowel_letter_in_last_name)
 print(f'Фамилии сотрудников {", ".join(end_vowel_letter_in_last_name_set)} оканчиваются на гласную букву')
-
-
-

for_dict_challenges.py

@@ -32,7 +32,7 @@
 ]
 
 def max_name(students):
-    name_of_students = [students[name]['first_name'] for name in range(len(students))]
+    name_of_students = [student['first_name'] for student in students]
 
     names_counter = dict()
     for name in name_of_students:
@@ -118,7 +118,6 @@ def max_name(students):
 school = [
     {'class': '2a', 'students': [{'first_name': 'Маша'}, {'first_name': 'Оля'}]},
     {'class': '3c', 'students': [{'first_name': 'Олег'}, {'first_name': 'Миша'}]},
-    {'class': '4c', 'students': [{'first_name': 'Олег'}, {'first_name': 'Миша'}, {'first_name': 'Миша'}]},
 ]
 is_male = {
     'Маша': False,
@@ -127,6 +126,11 @@ def max_name(students):
     'Миша': True,
 }
 
+max_male_class = ''
+max_female_class = ''
+max_male_gender = 0
+max_female_gender = 0
+
 for students in school:
     male_gender = 0
     female_gender = 0
@@ -135,6 +139,15 @@ def max_name(students):
             male_gender += 1
         else:
             female_gender += 1
-        boys_predominate = 'Больше всего мальчиков в классе '
-        girls_predominate = 'Больше всего девочек в классе '
-    print(f'{boys_predominate}{students["class"]}') if male_gender > female_gender else print(f'{girls_predominate}{students["class"]}')
+        if male_gender > female_gender:
+            max_male_gender = male_gender
+            max_male_class = str(students["class"])
+            if male_gender > max_male_gender:
+                max_male_gende = male_gender
+        else:
+            max_female_gender = female_gender
+            max_female_class = str(students["class"])
+            if female_gender > max_female_gender:
+                max_female_gender = female_gender
+print(f'Больше всего мальчиков в классе {max_male_class}')
+print(f'Больше всего девочек в классе {max_female_class}')