|
@@ -111,6 +111,29 @@ func GetClassesAll(args map[string]string) (interface{}, error) {
|
|
|
class.GetTeachers()
|
|
|
}
|
|
|
|
|
|
+ for _, class := range classes {
|
|
|
+ class.GetActivities()
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, class := range classes {
|
|
|
+ if class.CoordinatorID != 0 {
|
|
|
+ if !DB().First(&class.Coordinator, class.CoordinatorID).RecordNotFound() {
|
|
|
+ if err := DB().First(&class.Coordinator, class.CoordinatorID).Error; err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if class.MinuterID != 0 {
|
|
|
+ if !DB().First(&class.Minuter, class.MinuterID).RecordNotFound() {
|
|
|
+ if err := DB().First(&class.Minuter, class.MinuterID).Error; err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
return classes, nil
|
|
|
}
|
|
|
|
|
@@ -179,6 +202,13 @@ func (c *Class) GetTeachers() ([]*Teacher, error) {
|
|
|
return c.Teachers, nil
|
|
|
}
|
|
|
|
|
|
+func (c *Class) GetActivities() ([]*Activity, error) {
|
|
|
+ if err := DB().Preload("Teacher").Preload("Subject").Preload("Class").Where("class_id=?", c.ID).Find(&c.Activities).Error; err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return c.Activities, nil
|
|
|
+}
|
|
|
+
|
|
|
func GetClassForUpdate(args map[string]string) (interface{}, error) {
|
|
|
var data ClassForUpdate
|
|
|
|