|
@@ -281,7 +281,7 @@ func (t *Teacher) GetStudents() ([]*Student, error) {
|
|
|
}
|
|
|
|
|
|
func (t *Teacher) GetActivities() ([]*Activity, error) {
|
|
|
- if err := DB().Preload("SupplyTeacher").Preload("Teacher").Preload("Subject").Preload("Class").Where("teacher_id=? OR supply_teacher_id=?", t.ID, t.ID).Find(&t.Activities).Error; err != nil {
|
|
|
+ if err := DB().Preload("SupplyTeacher").Preload("Teacher").Preload("Subject").Preload("Class").Preload("Student").Where("teacher_id=? OR supply_teacher_id=?", t.ID, t.ID).Find(&t.Activities).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return t.Activities, nil
|