| 
					
				 | 
			
			
				@@ -43,6 +43,7 @@ var ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	selectStudentTeachers = ` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 SELECT teachers.* FROM activities 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 INNER JOIN teachers ON activities.teacher_id=teachers.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+WHERE student_id=? 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -96,9 +97,9 @@ func GetStudentsAll(args map[string]string) (interface{}, error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	for _, student := range students { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		student.GetTeachers() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	for _, student := range students { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		student.GetActivities() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	// for _, student := range students { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	// 	student.GetActivities() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	// } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	return students, nil 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -209,7 +210,7 @@ func GetStudentForAdd(args map[string]string) (interface{}, error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 func (s *Student) GetTeachers() ([]*Teacher, error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	if err := DB().Raw(selectStudentTeachers).Scan(&s.Teachers).Error; err != nil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if err := DB().Raw(selectStudentTeachers, s.ID).Scan(&s.Teachers).Error; err != nil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return nil, err 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	return s.Teachers, nil 
			 |