File tree Expand file tree Collapse file tree 2 files changed +16
-16
lines changed
Expand file tree Collapse file tree 2 files changed +16
-16
lines changed Original file line number Diff line number Diff line change 5353for department in departments :
5454 for employer in department ['employers' ]:
5555 if employer ['salary_rub' ] > task_salary :
56- print (f'Заработная плата { employer ["first_name" ]} превышает { task_salary } К ' )
56+ print (f'Заработная плата { employer ["first_name" ]} превышает { task_salary } ' )
5757
5858task_salary = 80000 # task 5
5959for department in departments :
6060 for employer in department ['employers' ]:
6161 if employer ['salary_rub' ] < task_salary :
62- print (f'Заработная плата { employer ["position" ]} ниже { task_salary } К ' )
62+ print (f'Заработная плата { employer ["position" ]} ниже { task_salary } ' )
6363
6464for department in departments : # task 6
6565 department_salary = 0
9898 for employer in department ['employers' ]:
9999 if employer ['salary_rub' ] > task_salary :
100100 salary_cap .append (employer ["position" ])
101- print (f'{ ", " .join (salary_cap )} получают больше { task_salary } К ' )
101+ print (f'{ ", " .join (salary_cap )} получают больше { task_salary } ' )
102102
103103girls = ['Michelle' , 'Nicole' , 'Christina' , 'Caitlin' ] # task 11
104104for department in departments :
Original file line number Diff line number Diff line change @@ -126,28 +126,28 @@ def max_name(students):
126126 'Миша' : True ,
127127}
128128
129- max_male_class = ''
130- max_female_class = ''
129+ max_male_class = None
130+ max_female_class = None
131131max_male_gender = 0
132132max_female_gender = 0
133133
134- for students in school :
134+ for class_num in school :
135135 male_gender = 0
136136 female_gender = 0
137- for name in students ['students' ]:
137+ for name in class_num ['students' ]:
138138 if is_male .get (name ['first_name' ]):
139139 male_gender += 1
140140 else :
141141 female_gender += 1
142- if male_gender > female_gender :
143- max_male_gender = male_gender
144- max_male_class = str (students ["class" ])
145- if male_gender > max_male_gender :
146- max_male_gende = male_gender
147- else :
142+ if male_gender > female_gender :
143+ max_male_gender = male_gender
144+ max_male_class = class_num ["class" ]
145+ if male_gender > max_male_gender :
146+ max_male_gende = male_gender
147+ else :
148+ max_female_gender = female_gender
149+ max_female_class = class_num ["class" ]
150+ if female_gender > max_female_gender :
148151 max_female_gender = female_gender
149- max_female_class = str (students ["class" ])
150- if female_gender > max_female_gender :
151- max_female_gender = female_gender
152152print (f'Больше всего мальчиков в классе { max_male_class } ' )
153153print (f'Больше всего девочек в классе { max_female_class } ' )
You can’t perform that action at this time.
0 commit comments