diff --git a/core/models/user_account.py b/core/models/user_account.py index 281d1747a35984f2be8cb7afd0961e3b347dd53b..8afda05f5c4b978777a67cd8c20348b6eadbe538 100644 --- a/core/models/user_account.py +++ b/core/models/user_account.py @@ -89,6 +89,8 @@ class UserAccount(AbstractUser): return self.role == 'Reviewer' def set_groups(self, groups): + print("\n\n\n\n\n\n\n") + print(groups) if groups == [] or groups is None: self.exercise_groups.set(group_default()) else: diff --git a/frontend/src/components/student_list/StudentList.vue b/frontend/src/components/student_list/StudentList.vue index 160b933d16a7c6b71290c82f5025501f55f1865d..71f678dbe0e06c53f9659bf899eb3478c1b8e1cf 100644 --- a/frontend/src/components/student_list/StudentList.vue +++ b/frontend/src/components/student_list/StudentList.vue @@ -260,10 +260,9 @@ export default { 'getStudents' ]), async userAccountGroups(student) { - const groups = await (await fetchUser(student.pk)).exerciseGroups - return groups + return await (await fetchUser(student.userPk)).exerciseGroups }, - getStudentListItems () { + async getStudentListItems () { if (!this.loading) { let filteredStudents = this.students if (this.selectedGroup !== null) { @@ -272,8 +271,9 @@ export default { return userGroups.some(group => group.pk === this.selectedGroup.pk) }) } - + console.log(filteredStudents) this.studentList = Object.values(filteredStudents).map(student => { + console.log(student) return { pk: student.pk, user: student.user, @@ -281,7 +281,7 @@ export default { exam: student.exam, name: student.name, isActive: student.isActive, - exerciseGroup: [], + exerciseGroups: ["3175670b-c405-4756-9c5d-7bd50143f0f8"], matrikelNo: student.matrikelNo, ...this.reduceArrToDict(student.submissions, 'type'), total: this.sumSubmissionScores(student.submissions) @@ -293,6 +293,8 @@ export default { this.user = await fetchUser(student.userPk) }, setExerciseGroups (groups, student) { + console.log(groups) + groups = groups.shift() this.getUser(student).then(() => { setGroups(this.user.pk, groups) }) diff --git a/frontend/src/components/tutor_list/TutorList.vue b/frontend/src/components/tutor_list/TutorList.vue index 229d0427469050c3f84a3cdb5e912f20d0acca63..d176e1748a3783a785c480763532085f9482215a 100644 --- a/frontend/src/components/tutor_list/TutorList.vue +++ b/frontend/src/components/tutor_list/TutorList.vue @@ -193,6 +193,7 @@ export default class TutorList extends Vue { } setExerciseGroups (groups: Group[], tutor: Tutor){ + console.log(groups) setGroups(tutor.pk, groups).then(() => { TutorOverview.getTutors() }).catch(() => {