diff --git a/advlabdb/assistantModelViews.py b/advlabdb/assistantModelViews.py index 87266c6..bf26975 100644 --- a/advlabdb/assistantModelViews.py +++ b/advlabdb/assistantModelViews.py @@ -30,12 +30,12 @@ class AssistantAppointmentView(SecureAssistantModelView): "date", "special", "group_experiment.semester_experiment.experiment", - "group_experiment.group", + "group_experiment.group.number", "group_experiment.group.part_students", ] column_labels = { "group_experiment.semester_experiment.experiment": "Experiment", - "group_experiment.group": "Group", + "group_experiment.group.number": "Group number", "group_experiment.group.part_students": "Students", } @@ -79,9 +79,8 @@ class AssistantExperimentMarkView(SecureAssistantModelView): "protocol_mark", "final_experiment_mark", "group_experiment.semester_experiment.experiment", - "part_student.student.first_name", - "part_student.student.last_name", - "part_student.group", + "part_student.student", + "part_student.group.number", "part_student.student.uni_email", "part_student.student.contact_email", "part_student.part", @@ -90,9 +89,8 @@ class AssistantExperimentMarkView(SecureAssistantModelView): ] column_labels = { "group_experiment.semester_experiment.experiment": "Experiment", - "part_student.student.first_name": "First Name", - "part_student.student.last_name": "Last Name", - "part_student.group": "Group", + "part_student.student": "Student", + "part_student.group.number": "Group number", "part_student.student.uni_email": "Uni Email", "part_student.student.contact_email": "Contact Email", "part_student.part": "Part",