Filter 'Shop-teacher' dropdown in worklog submissions by defined role and class assignment

I want the 'Shop-teacher' dropdown in student worklog submissions to filter teachers based on a defined 'shop-teacher' role and the teacher assigned to the specific shop class, as it previously did. Currently, the dropdown lists all teachers from the student's class schedule, causing confusion and incorrect selections. This functionality is important because students are not reviewing the selections and are just pressing 'start form', leading to errors. We have other roles defined for academic classes (English/Math, Science) and expect similar filtering for the 'shop-teacher' role.