Support multiple teachers per class #456
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
loiswells97
changed the title
loiswells97
changed the title
danhalson
reviewed
Feb 26, 2025
| @@ -105,6 +106,10 @@ def school_owner? | |||
| school && current_user.school_owner?(school) | |||
| end | |||
|
|
|||
| def class_teacher?(project) | |||
| project.lesson_id.present? && project.lesson.school_class.present? && project.lesson.school_class.teacher_ids.include?(current_user.id) | |||
There was a problem hiding this comment.
do you need project.lesson_id.present?? I think that's implicit by project.lesson existing, since the relationship wouldn't exist otherwise
danhalson
reviewed
Feb 26, 2025
| @@ -2,12 +2,15 @@ | |||
|
|
|||
| class SchoolClass < ApplicationRecord | |||
| belongs_to :school | |||
| has_many :members, class_name: :ClassMember, inverse_of: :school_class, dependent: :destroy | |||
| has_many :students, class_name: :ClassStudent, inverse_of: :school_class, dependent: :destroy | |||
| has_many :class_teachers, class_name: :ClassTeacher, inverse_of: :school_class, dependent: :destroy | |||
There was a problem hiding this comment.
why use :students and then :class_teachers instead of :teachers or vice versa? going with one or the other would be nice for consistency
danhalson
requested changes
Feb 26, 2025
| @@ -96,11 +96,22 @@ def user_has_a_role_within_the_school | |||
| errors.add(:user, msg) | |||
| end | |||
|
|
|||
| def user_is_a_member_or_the_owner_of_the_lesson | |||
| def user_is_class_teacher_or_student | |||
| # TODO: Revisit the case where the lesson is not associated to a class i.e. when we build a lesson library | |||
There was a problem hiding this comment.
think we can remove this todo now?
| :name, | ||
| :created_at, | ||
| :updated_at | ||
| ) | ||
|
|
||
| json.teacher_name(teacher&.name) | ||
| json.teachers(teachers) do |teacher| | ||
| if teacher.present? |
There was a problem hiding this comment.
there is already a _school_teacher.json.builder template you can use here and in the show template, you might just need to make the email optional
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's Changed?
ClassTeachermodel which allows classes to have multiple teachersClassmodel now accepts nested attributes forClassTeachersClassMembermodel has been renamed toClassStudentto provide consistency with the approach forSchoolStudent,SchoolMemberetc.ClassMemberoperations will now deal with both teachers and students in keeping with theSchoolMembermodulecloses #463