From 3333fec82e286cbcbd8adb8c492d6e1ed266cb49 Mon Sep 17 00:00:00 2001 From: Andrew Lalis Date: Fri, 17 May 2019 20:39:28 +0200 Subject: [PATCH] Updated basically the rest of the pages. --- .../entity/StudentEntityEditController.java | 3 +- .../courses/entity/import_students.html | 16 ++-- .../courses/entity/student_teams.html | 52 ++++++------- .../courses/entity/student_teams/create.html | 19 ++--- .../courses/entity/student_teams/entity.html | 71 +++++++++--------- .../student_teams/entity/add_student.html | 18 ++--- .../assign_teaching_assistant_team.html | 18 ++--- .../student_teams/generate_repositories.html | 17 +---- .../templates/courses/entity/students.html | 23 +++--- .../courses/entity/students/invite_all.html | 2 +- .../entity/teaching_assistant_teams.html | 58 +++++++++------ .../assign_to_student_teams.html | 11 +-- .../teaching_assistant_teams/create.html | 34 ++++----- .../teaching_assistant_teams/entity.html | 10 +-- .../courses/entity/teaching_assistants.html | 24 +++--- .../templates/students/entity/edit.html | 73 ++++++++----------- 16 files changed, 196 insertions(+), 253 deletions(-) diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/controllers/students/entity/StudentEntityEditController.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/controllers/students/entity/StudentEntityEditController.java index a8d587c..3e6becf 100644 --- a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/controllers/students/entity/StudentEntityEditController.java +++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/controllers/students/entity/StudentEntityEditController.java @@ -1,5 +1,6 @@ package nl.andrewlalis.teaching_assistant_assistant.controllers.students.entity; +import nl.andrewlalis.teaching_assistant_assistant.controllers.UserPageController; import nl.andrewlalis.teaching_assistant_assistant.model.people.Student; import nl.andrewlalis.teaching_assistant_assistant.model.repositories.StudentRepository; import nl.andrewlalis.teaching_assistant_assistant.services.StudentService; @@ -16,7 +17,7 @@ import java.util.Optional; * Controller for editing a student entity. */ @Controller("/students/{id}/edit") -public class StudentEntityEditController { +public class StudentEntityEditController extends UserPageController { private StudentRepository studentRepository; private StudentService studentService; diff --git a/src/main/resources/templates/courses/entity/import_students.html b/src/main/resources/templates/courses/entity/import_students.html index 65f29ef..95b3559 100644 --- a/src/main/resources/templates/courses/entity/import_students.html +++ b/src/main/resources/templates/courses/entity/import_students.html @@ -1,24 +1,22 @@ - + Import Students via CSV -
-

Import Students from CSV File

- +

Use this form to import student data from a CSV which has been generated by a Google form. As of right now, the column headers are hard-coded, but in the future it will be possible to dynamically import data from any CSV file by custom header format definitions.

-
-
+ +
-
+
@@ -26,9 +24,5 @@
-
- -
- \ No newline at end of file diff --git a/src/main/resources/templates/courses/entity/student_teams.html b/src/main/resources/templates/courses/entity/student_teams.html index 04c6daf..59a3464 100644 --- a/src/main/resources/templates/courses/entity/student_teams.html +++ b/src/main/resources/templates/courses/entity/student_teams.html @@ -1,18 +1,33 @@ - - - - Student Teams - + -
-

Student Teams for

+ +

No student teams.

- +
@@ -53,26 +68,5 @@
Team Students
- - \ No newline at end of file diff --git a/src/main/resources/templates/courses/entity/student_teams/create.html b/src/main/resources/templates/courses/entity/student_teams/create.html index 6aa2f77..ba74de1 100644 --- a/src/main/resources/templates/courses/entity/student_teams/create.html +++ b/src/main/resources/templates/courses/entity/student_teams/create.html @@ -1,28 +1,19 @@ - - - Create Student Team - + -
-

Create a New Student Team

- +

Creates a new student team for the course, without any assigned TA team or student members.

- + -
- +
+
- - \ No newline at end of file diff --git a/src/main/resources/templates/courses/entity/student_teams/entity.html b/src/main/resources/templates/courses/entity/student_teams/entity.html index fa04e6f..0a32187 100644 --- a/src/main/resources/templates/courses/entity/student_teams/entity.html +++ b/src/main/resources/templates/courses/entity/student_teams/entity.html @@ -1,14 +1,39 @@ - - - - Student Team - + + -
-

Student Team

+ +
  • Github Repository: @@ -43,39 +68,13 @@