getAssignedStudentTeams() {
+ return this.assignedStudentTeams;
+ }
+
+ public void addAssignedStudentTeam(StudentTeam studentTeam) {
+ this.assignedStudentTeams.add(studentTeam);
+ }
+
+ public void removeAssignedStudentTeam(StudentTeam studentTeam) {
+ this.assignedStudentTeams.remove(studentTeam);
}
}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/people/teams/Team.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/people/teams/Team.java
index 255883f..0e81635 100644
--- a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/people/teams/Team.java
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/people/teams/Team.java
@@ -17,7 +17,7 @@ import java.util.List;
@Inheritance(
strategy = InheritanceType.JOINED
)
-public abstract class Team extends BasicEntity {
+public abstract class Team extends BasicEntity {
/**
* The list of members in this group.
@@ -30,7 +30,7 @@ public abstract class Team
extends BasicEntity {
joinColumns = @JoinColumn(name = "team_id"),
inverseJoinColumns = @JoinColumn(name = "person_id")
)
- protected List
members;
+ protected List members;
/**
* The course that this team belongs to. A team cannot exist on its own, it must belong to a course.
@@ -47,23 +47,23 @@ public abstract class Team extends BasicEntity {
this.members = new ArrayList<>();
}
- public void addMember(P person) {
+ public void addMember(Person person) {
if (!this.containsMember(person)) {
this.members.add(person);
}
}
- public void addMembers(List
people) {
- for (P person : people) {
+ public void addMembers(List people) {
+ for (Person person : people) {
this.addMember(person);
}
}
- public boolean containsMember(P person) {
+ public boolean containsMember(Person person) {
return this.members.contains(person);
}
- public void removeMember(P person) {
+ public void removeMember(Person person) {
this.members.remove(person);
}
@@ -79,7 +79,7 @@ public abstract class Team extends BasicEntity {
* Gets a list of all members of this team.
* @return A list of all the members in this team.
*/
- public List
getMembers() {
+ public List getMembers() {
return this.members;
}
@@ -90,8 +90,8 @@ public abstract class Team extends BasicEntity {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- for (P p : this.getMembers()) {
- sb.append(p.toString()).append(", ");
+ for (Person p : this.getMembers()) {
+ sb.append(p.getFullName()).append(", ");
}
return sb.toString();
}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/StudentRepository.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/StudentRepository.java
new file mode 100644
index 0000000..3f86bb7
--- /dev/null
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/StudentRepository.java
@@ -0,0 +1,17 @@
+package nl.andrewlalis.teaching_assistant_assistant.model.repositories;
+
+import nl.andrewlalis.teaching_assistant_assistant.model.people.Student;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.Optional;
+
+public interface StudentRepository extends CrudRepository {
+
+ /**
+ * Tries to find a student by its unique student number.
+ * @param studentNumber The student number to search for.
+ * @return An optional Student object.
+ */
+ public Optional findByStudentNumber(int studentNumber);
+
+}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/StudentTeamRepository.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/StudentTeamRepository.java
new file mode 100644
index 0000000..1800848
--- /dev/null
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/StudentTeamRepository.java
@@ -0,0 +1,10 @@
+package nl.andrewlalis.teaching_assistant_assistant.model.repositories;
+
+import nl.andrewlalis.teaching_assistant_assistant.model.people.teams.StudentTeam;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.Optional;
+
+public interface StudentTeamRepository extends CrudRepository {
+ Optional findByCourseCodeAndId(String courseCode, long id);
+}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/TeachingAssistantRepository.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/TeachingAssistantRepository.java
new file mode 100644
index 0000000..63154c9
--- /dev/null
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/TeachingAssistantRepository.java
@@ -0,0 +1,7 @@
+package nl.andrewlalis.teaching_assistant_assistant.model.repositories;
+
+import nl.andrewlalis.teaching_assistant_assistant.model.people.TeachingAssistant;
+import org.springframework.data.repository.CrudRepository;
+
+public interface TeachingAssistantRepository extends CrudRepository {
+}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/TeachingAssistantTeamRepository.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/TeachingAssistantTeamRepository.java
new file mode 100644
index 0000000..a06552b
--- /dev/null
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/model/repositories/TeachingAssistantTeamRepository.java
@@ -0,0 +1,7 @@
+package nl.andrewlalis.teaching_assistant_assistant.model.repositories;
+
+import nl.andrewlalis.teaching_assistant_assistant.model.people.teams.TeachingAssistantTeam;
+import org.springframework.data.repository.CrudRepository;
+
+public interface TeachingAssistantTeamRepository extends CrudRepository {
+}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/github/GithubManager.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/github/GithubManager.java
new file mode 100644
index 0000000..98ab14a
--- /dev/null
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/github/GithubManager.java
@@ -0,0 +1,202 @@
+package nl.andrewlalis.teaching_assistant_assistant.util.github;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import nl.andrewlalis.teaching_assistant_assistant.model.people.Student;
+import nl.andrewlalis.teaching_assistant_assistant.model.people.teams.StudentTeam;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.kohsuke.github.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.Calendar;
+
+/**
+ * Encapsulates much of the github functionality that is needed.
+ */
+public class GithubManager {
+
+ private GitHub github;
+ private String apiKey;
+
+ /**
+ * Constructs this manager with an API key.
+ * @param apiKey The api key to use.
+ * @throws IOException if the key is invalid.
+ */
+ public GithubManager(String apiKey) throws IOException {
+ this.github = GitHub.connectUsingOAuth(apiKey);
+ this.apiKey = apiKey;
+ }
+
+ /**
+ * Constructs this manager with a username/password login combination.
+ * @param username The username to use.
+ * @param password The password for the above username.
+ * @throws IOException if the username or password are invalid.
+ */
+ public GithubManager(String username, String password) throws IOException {
+ this.github = GitHub.connectUsingPassword(username, password);
+ }
+
+ /**
+ * Generates a new Github Repository for the given student team.
+ * @param team The team to create a repository for.
+ * @return The name of the created repository.
+ */
+ public String generateStudentTeamRepository(StudentTeam team) {
+ GHOrganization organization;
+
+ try {
+ organization = this.github.getOrganization(team.getCourse().getGithubOrganizationName());
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not get Github organization with name: " + team.getCourse().getGithubOrganizationName());
+ return null;
+ }
+
+ Calendar today = Calendar.getInstance();
+ int year = today.get(Calendar.YEAR);
+ String repositoryName = year + "_Team_" + team.getId();
+
+ // Get the TA team which manages this repository.
+ GHTeam teachingAssistantGithubTeam;
+
+ try {
+ teachingAssistantGithubTeam = organization.getTeamByName(team.getAssignedTeachingAssistantTeam().getGithubTeamName());
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not get team by name: " + team.getAssignedTeachingAssistantTeam().getGithubTeamName());
+ return null;
+ }
+
+ // Create the repo
+ GHCreateRepositoryBuilder repositoryBuilder = organization.createRepository(repositoryName);
+ repositoryBuilder.wiki(false);
+ repositoryBuilder.issues(true);
+ repositoryBuilder.description("University of Groningen OOP Student Repository");
+ repositoryBuilder.private_(true);
+ repositoryBuilder.autoInit(false);
+ GHRepository repository;
+ try {
+ repository = repositoryBuilder.create();
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not create repository: " + repositoryName);
+ return null;
+ }
+
+ try {
+ this.addRepositoryToTeam(teachingAssistantGithubTeam, repository);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not add repository " + repositoryName + " to team " + teachingAssistantGithubTeam.getName());
+ return null;
+ }
+
+ try {
+ this.addStarterFile(repository, "program_resources/getting_started.md", "getting_started.md");
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not add the starter file to the repository: " + repositoryName);
+ return null;
+ }
+
+ try {
+ this.createDevelopmentBranch(repository);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not create development branch for repository: " + repositoryName);
+ return null;
+ }
+
+ try {
+ this.protectMasterBranch(repository, teachingAssistantGithubTeam);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not add protections to the master branch of " + repositoryName);
+ return null;
+ }
+
+ try {
+ this.addStudentsAsCollaborators(repository, team);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.err.println("Could not add students as collaborators to " + repositoryName);
+ return null;
+ }
+
+
+ return repositoryName;
+ }
+
+ private void addStarterFile(GHRepository repository, String filePath, String fileName) throws IOException {
+ GHContentBuilder contentBuilder = repository.createContent();
+ contentBuilder.branch("master");
+ contentBuilder.message("Initial Commit");
+
+ URL resource = getClass().getClassLoader().getResource(filePath);
+ if (resource == null) {
+ throw new IOException("Could not get resource identified by " + filePath);
+ }
+ File f = new File(resource.getFile());
+
+ contentBuilder.content(Files.readAllBytes(f.toPath()));
+ contentBuilder.path(fileName);
+ contentBuilder.commit();
+ }
+
+ private void protectMasterBranch(GHRepository repository, GHTeam adminTeam) throws IOException {
+ GHBranchProtectionBuilder protectionBuilder = repository.getBranch("master").enableProtection();
+ protectionBuilder.includeAdmins(false);
+ protectionBuilder.restrictPushAccess();
+ protectionBuilder.teamPushAccess(adminTeam);
+ protectionBuilder.addRequiredChecks("ci/circleci");
+ protectionBuilder.enable();
+ }
+
+ private void addStudentsAsCollaborators(GHRepository repository, StudentTeam studentTeam) throws IOException {
+ for (Student student : studentTeam.getStudents()) {
+ this.addCollaborator(repository.getFullName(), student.getGithubUsername(), "push");
+ }
+
+ }
+
+ private void createDevelopmentBranch(GHRepository repository) throws IOException {
+ String sha1 = repository.getBranch(repository.getDefaultBranch()).getSHA1();
+ repository.createRef("refs/heads/development", sha1);
+ }
+
+ public void addCollaborator(String repositoryName, String githubUsername, String permission) throws IOException {
+ try {
+ String url = "https://api.github.com/repos/" + repositoryName + "/collaborators/" + githubUsername + "?access_token=" + this.apiKey;
+ HttpPut put = new HttpPut(url);
+ CloseableHttpClient client = HttpClientBuilder.create().build();
+ ObjectMapper mapper = new ObjectMapper();
+ ObjectNode root = mapper.createObjectNode();
+ root.put("permission", permission);
+ String json = mapper.writeValueAsString(root);
+ put.setEntity(new StringEntity(json));
+ HttpResponse response = client.execute(put);
+
+ if (response.getStatusLine().getStatusCode() != 201) {
+ throw new IOException("Error adding collaborator via url " + url + " : " + response.getStatusLine().getStatusCode() + " " + response.getStatusLine().getReasonPhrase());
+ }
+ } catch (JsonProcessingException | UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void addRepositoryToTeam(GHTeam team, GHRepository repository) throws IOException {
+ team.add(repository, GHOrganization.Permission.ADMIN);
+ }
+
+}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/CourseGenerator.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/CourseGenerator.java
index eecf759..0273c0d 100644
--- a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/CourseGenerator.java
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/CourseGenerator.java
@@ -56,11 +56,11 @@ public class CourseGenerator extends TestDataGenerator {
List studentTeams = this.generateStudentTeams();
List teachingAssistantTeams = this.generateTeachingAssistantTeams();
for (StudentTeam team : studentTeams) {
- course.addStudentGroup(team);
+ course.addStudentTeam(team);
team.setCourse(course);
}
for (TeachingAssistantTeam team : teachingAssistantTeams) {
- course.addTeachingAssistantGroup(team);
+ course.addTeachingAssistantTeam(team);
team.setCourse(course);
}
return course;
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/StudentGenerator.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/StudentGenerator.java
index 23240c4..01945b5 100644
--- a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/StudentGenerator.java
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/StudentGenerator.java
@@ -12,6 +12,6 @@ public class StudentGenerator extends PersonGenerator {
public Student generate() {
String firstName = this.getRandomFirstName();
String lastName = this.getRandomLastName();
- return new Student(firstName, lastName, this.getRandomEmailAddress(firstName, lastName));
+ return new Student(firstName, lastName, this.getRandomEmailAddress(firstName, lastName), null, this.getRandomInteger(0, 100000000));
}
}
diff --git a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/TeachingAssistantGenerator.java b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/TeachingAssistantGenerator.java
index e4c9a89..8b2c8d4 100644
--- a/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/TeachingAssistantGenerator.java
+++ b/src/main/java/nl/andrewlalis/teaching_assistant_assistant/util/sample_data/TeachingAssistantGenerator.java
@@ -12,6 +12,6 @@ public class TeachingAssistantGenerator extends PersonGenerator importFromCSV(InputStream fileInputStream, Course course) throws IOException {
+ Iterable records = CSVFormat.DEFAULT
+ .withSkipHeaderRecord()
+ .withHeader("timestamp", "email", "name", "number", "github_username", "has_partner", "partner_name", "partner_number", "partner_email", "partner_github_username")
+ .parse(new InputStreamReader(fileInputStream));
+
+ List studentEntries = extractStudentsFromRecords(records);
+
+ List studentTeams = generateTeamsFromStudentEntries(studentEntries, 0);
+
+ return studentTeams;
+ }
+
+ /**
+ * Extracts all student data from a list of records, and automatically discards outdated responses (those where the
+ * same student submitted more than once).
+ * @param records The list of records in the CSV file.
+ * @return A list of all student entries. A student entry is an intermediate object used to organize the parsed data
+ * from each record in the CSV file.
+ */
+ private static List extractStudentsFromRecords(Iterable records) {
+ List studentEntries = new ArrayList<>();
+
+ for (CSVRecord record : records) {
+ // Parse the actual student.
+ Student s = parseStudentRecordData(record.get("name"), record.get("email"), record.get("github_username"), record.get("number"));
+
+ // Parse the student's preferred partner, if they exist.
+ Student preferredPartner = null;
+ if (record.get("has_partner").equalsIgnoreCase("yes")) {
+ preferredPartner = parseStudentRecordData(record.get("partner_name"), record.get("partner_email"), record.get("partner_github_username"), record.get("partner_number"));
+ }
+
+ // Parse the timestamp.
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd h:mm:ss a O ");
+ ZonedDateTime dateTime = ZonedDateTime.parse(record.get("timestamp") + ' ', formatter);
+ // A space is added because of a java bug: https://stackoverflow.com/questions/37287103/why-does-gmt8-fail-to-parse-with-pattern-o-despite-being-copied-straight-ou
+
+ studentEntries.add(new StudentRecordEntry(dateTime, s, preferredPartner));
+ }
+
+ studentEntries = removeDuplicateEntries(studentEntries);
+
+ return studentEntries;
+ }
+
+ /**
+ * Generates a list of teams from a list of unique student entries. The algorithm is described as follows:
+ *
+ * 1. Select the next student from the list of entries.
+ * 2. If the student (A) has specified a partner (B), search for that partner (B) in the list of entries.
+ * 3. If the partner (B) also specified the student (A) as their preferred partner, a team is created from the two.
+ * a. Pop both student entries from the list of entries.
+ * 4. Else, place student (A) in a queue of single students.
+ * a. Pop student (A) from the list of entries.
+ * 5. If the list of entries is not empty, go to 1.
+ * 6. The list of entries is now empty, and zero or more entries exist in a queue of single students.
+ * 7. Pop two (or as many as possible) students randomly from the queue, and form a team from them.
+ * 8. Repeat until the queue of single students is empty.
+ * 9. There is now a list of student teams and no student should remain unprocessed.
+ *
+ * @param entries A list of record entries.
+ * @param seed A seed to use for randomization of single student teams.
+ * @return A list of student teams.
+ */
+ private static List generateTeamsFromStudentEntries(List entries, long seed) {
+ List teams = new ArrayList<>();
+ List singleStudentsEntryQueue = new ArrayList<>();
+ Random random = new Random(seed);
+
+ // Realize step 5. Loop until there are no more processed entries.
+ while (!entries.isEmpty()) {
+ // Step 1. Select the next student from the list of entries.
+ StudentRecordEntry entry = entries.remove(0);
+
+ // Step 2. If the student has a partner, search for that partner.
+ if (entry.hasPartner()) {
+ boolean partnerFound = false; // Use this to keep track of if a partner is actually found.
+ for (int i = 0; i < entries.size(); i++) {
+ StudentRecordEntry secondEntry = entries.get(i);
+ // Step 3. If the partner specifies their partner as the student (both want each other), then create a team.
+ if (
+ entry.getPartnerStudent().equals(secondEntry.getStudent())
+ && secondEntry.hasPartner()
+ && secondEntry.getPartnerStudent().equals(entry.getStudent())
+ ) {
+ partnerFound = true;
+
+ entries.remove(i); // Step 3a. The first student has been popped, so pop this one.
+
+ StudentTeam team = new StudentTeam();
+ team.addMember(entry.getStudent());
+ team.addMember(secondEntry.getStudent());
+ teams.add(team);
+
+ break;
+ }
+ }
+
+ // Step 4. If no partner was found, then add this entry to the queue of single students.
+ if (!partnerFound) {
+ singleStudentsEntryQueue.add(entry);
+ }
+ } else {
+ // Also Step 4. The student chose to have no partner, so add this entry to the queue of single students.
+ singleStudentsEntryQueue.add(entry);
+ }
+ }
+
+ // We are now at step 6.
+ while (!singleStudentsEntryQueue.isEmpty()) {
+ StudentTeam team = new StudentTeam();
+ StudentRecordEntry firstRandomEntry = singleStudentsEntryQueue.remove(random.nextInt(singleStudentsEntryQueue.size()));
+ team.addMember(firstRandomEntry.getStudent());
+
+ // Check if there's another student in the queue.
+ if (!singleStudentsEntryQueue.isEmpty()) {
+ StudentRecordEntry secondRandomEntry = singleStudentsEntryQueue.remove(random.nextInt(singleStudentsEntryQueue.size()));
+ team.addMember(secondRandomEntry.getStudent());
+ }
+
+ teams.add(team);
+ }
+
+ return teams;
+ }
+
+ /**
+ * Scans a list of student entries and removes entries which are outdated by newer entries by the same student, such
+ * that the resulting list contains only one unique entry per student.
+ * @param studentEntries The list of student entries, possibly containing duplicates.
+ * @return A list of student entries in which all outdated duplicates have been removed.
+ */
+ private static List removeDuplicateEntries(List studentEntries) {
+ List uniqueStudentEntries = new ArrayList<>();
+
+ for (StudentRecordEntry entry : studentEntries) {
+ // Check for if the current entry's student already exists.
+ boolean duplicateFound = false;
+ for (StudentRecordEntry existingEntry : uniqueStudentEntries) {
+ if (entry.getStudent().equals(existingEntry.getStudent())) {
+ duplicateFound = true;
+ // Check if the existing entry is older than the new one; it should be overwritten.
+ if (existingEntry.getDateTime().isBefore(entry.getDateTime())) {
+ uniqueStudentEntries.remove(existingEntry);
+ uniqueStudentEntries.add(entry);
+ break;
+ }
+ }
+ }
+
+ if (!duplicateFound) {
+ uniqueStudentEntries.add(entry);
+ }
+ }
+
+ return uniqueStudentEntries;
+ }
+
+ /**
+ * Creates a student object from given entries in a record obtained from a CSV file.
+ * @param name The name value.
+ * @param email The email value.
+ * @param githubUsername The github_username value.
+ * @param studentNumber The number value.
+ * @return A student object constructed from the given data.
+ */
+ private static Student parseStudentRecordData(String name, String email, String githubUsername, String studentNumber) {
+ // Extract a sensible first and last name.
+ String[] nameSegments = name.split(" ");
+ String firstName = "No First Name Given";
+ String lastName = "No Last Name Given";
+
+ if (nameSegments.length > 0) {
+ firstName = nameSegments[0];
+ }
+
+ if (nameSegments.length > 1) {
+ lastName = String.join(" ", Arrays.copyOfRange(nameSegments, 1, nameSegments.length));
+ }
+
+ // Extract a sensible github username.
+ String githubURL = "https://github.com/";
+
+ if (githubUsername.startsWith(githubURL)) {
+ githubUsername = githubUsername.substring(githubURL.length());
+ }
+
+ // Create the student.
+ return new Student(firstName, lastName, email, githubUsername, Integer.parseInt(studentNumber));
+ }
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e12669e..2541540 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,10 +1,14 @@
-spring.jpa.hibernate.ddl-auto=create
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
-
-#spring.jpa.properties.hibernate.show_sql=true
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.url=jdbc:mysql://localhost:3306/teaching_assistant_assistant?serverTimezone=UTC
+#
+spring.jpa.properties.hibernate.show_sql=false
#spring.jpa.properties.hibernate.use_sql_comments=true
#spring.jpa.properties.hibernate.format_sql=true
#spring.jpa.properties.hibernate.type=trace
spring.security.user.name=tester
spring.security.user.password=tester
+
diff --git a/src/main/resources/program_resources/getting_started.md b/src/main/resources/program_resources/getting_started.md
new file mode 100644
index 0000000..13dd306
--- /dev/null
+++ b/src/main/resources/program_resources/getting_started.md
@@ -0,0 +1,62 @@
+# Getting Started
+Welcome to the University of Groningen's Object Oriented Programming course! We're glad to have you. Read the instructions provided here carefully so that you can have a smooth start to the course.
+
+## Setting Up
+To begin, you'll need to download this repository you're looking at right now. To do that, run the following command (where `repository_url` is the URL of this repository):
+
+```
+git clone
+```
+
+Now you should have a local directory with the same name as this repository. Checkout your `development` branch, since you do not have permission as a student to make changes to the master branch.
+
+From here, we need to copy the files from the assignments repository into ours. To do this, we first add a new 'remote' to our local git repository, and then pull from that repository's `master` branch.
+
+> Note that if you have not received an invitation to the 2019_assignments repository yet, you'll have to wait until you can complete this part. Thank you for your patience.
+
+```
+git checkout development
+
+git remote add assignments https://github.com/rug-oop/2019_assignments
+
+git pull assignments master --allow-unrelated-histories
+```
+
+Now you should see all the files just as they appear in the assignments repository.
+
+## Developing Your Code and Submitting
+While previous knowledge of git may be useful, it should not really be needed for you to do well in this course, as long as you know how to submit each assignment.
+
+When you have finished working on your code, you should first add any new files which you have created (`-A` means "all files". Be careful, since you should not upload compiled class files).
+
+```
+git add -A
+```
+
+Now, commit all changes that have been made (`-a` means "all changed files", and `-m` allows you to supply a commit message. If you do not add `-m`, git will try to open a text editor for you to write a message in).
+
+```
+git commit -a -m "This is a short message about what I did."
+```
+
+To make these committed changes public, you need to upload them to the remote repository. This is done by 'pushing'.
+
+```
+git push
+```
+
+If you refresh the page for your repository on github.com, you should now see changes in whatever branch you pushed to (most likely `development`).
+
+### Submission
+Once you've committed and push a few times, and you feel that your code is ready to be submitted, create a new pull request from your `development` branch onto the `master` branch. When you do this, a continuous integration service will compile your code and run `mvn integration-test` to see that all tests (if any) pass. If your code does not compile or pass all tests, don't bother making a submission; we won't grade it. Fix it and submit a working version.
+
+If you have made a pull request, but then would like to make some last-minute changes, you can do this by simply adding more commits to the `development` branch. Any pushed commits will simply be added to an existing pull request.
+
+## Questions, Comments, Concerns
+Should you have any questions about Github, the above workflow, or other technical questions, please first see if Google can help, and then if you still cannot figure out what to do, make an issue in your repository that adheres to the following guidelines:
+
+* What is the problem?
+* What have you already tried to do to fix it?
+* How can my teaching assistant replicate the problem?
+
+By giving us this information, you make it much easier for us to give meaningful feedback as quickly as possible.
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index da877e4..e1d6b8e 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -34,4 +34,9 @@ body {
.sidebar_block a:hover {
color: lightgreen;
+}
+
+table, th, td {
+ border: 1px solid black;
+ border-collapse: collapse;
}
\ No newline at end of file
diff --git a/src/main/resources/templates/courses.html b/src/main/resources/templates/courses.html
index d6f8562..42b41e7 100644
--- a/src/main/resources/templates/courses.html
+++ b/src/main/resources/templates/courses.html
@@ -11,6 +11,7 @@
| Name |
Code |
Created at |
+ Students |
|
@@ -18,6 +19,7 @@
|
|
|
+ |
diff --git a/src/main/resources/templates/courses/create.html b/src/main/resources/templates/courses/create.html
index 657a140..4751be5 100644
--- a/src/main/resources/templates/courses/create.html
+++ b/src/main/resources/templates/courses/create.html
@@ -11,9 +11,17 @@
diff --git a/src/main/resources/templates/courses/entity.html b/src/main/resources/templates/courses/entity.html
index 7355aa8..842362a 100644
--- a/src/main/resources/templates/courses/entity.html
+++ b/src/main/resources/templates/courses/entity.html
@@ -10,37 +10,23 @@
(Code: )
- Teaching Assistant Groups ():
-
-
- Student Groups ():
-
+
diff --git a/src/main/resources/templates/courses/entity/import_students.html b/src/main/resources/templates/courses/entity/import_students.html
new file mode 100644
index 0000000..f825b6b
--- /dev/null
+++ b/src/main/resources/templates/courses/entity/import_students.html
@@ -0,0 +1,26 @@
+
+
+
+ Import Students via CSV
+
+
+
+
+
+ Please select a CSV file to import.
+
+
+
+
+
+
Student Teams for
+
+
+
+
+ | Team |
+ Students |
+ Repository Name |
+ Assigned TA Team |
+
+
+ |
+
+ Student Team
+
+ |
+
+
+ |
+
+ None
+
+ |
+
+ None
+
+ |
+
+
+
+
Student Team
+
+
+ -
+ Github Repository:
+
+
+
+
+ -
+ Assigned Teaching Assistant Team:
+
+
+ -
+ Members:
+
+
+
+
+
+
Generate Repositories for all Student Teams in
+
+
+ Be careful, this may take a little while...
+
+
+
+
+
Invite All Students in to Repository
+
+
+ Be careful, this may take a little while...
+
+
+
+
+
Teaching Assistant Teams for
+
+
+
No teaching assistant teams.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/courses/entity/teaching_assistant_teams/create.html b/src/main/resources/templates/courses/entity/teaching_assistant_teams/create.html
new file mode 100644
index 0000000..29af127
--- /dev/null
+++ b/src/main/resources/templates/courses/entity/teaching_assistant_teams/create.html
@@ -0,0 +1,27 @@
+
+
+
+ Create Teaching Assistant Team
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/courses/entity/teaching_assistant_teams/entity.html b/src/main/resources/templates/courses/entity/teaching_assistant_teams/entity.html
new file mode 100644
index 0000000..4f5153c
--- /dev/null
+++ b/src/main/resources/templates/courses/entity/teaching_assistant_teams/entity.html
@@ -0,0 +1,43 @@
+
+
+
+ Teaching Assistant Team
+
+
+
+
+
Teaching Assistant Team for
+
+
+ -
+ Github Team Name:
+ -
+ Teaching Assistants:
+
+
+ -
+ Assigned Student Teams:
+
+
+
+
+
Teaching Assistants for
+
+
+
+
+ Create your course here
+
+
+
+
All Students
+
+
+
+ | Student |
+ Student Number |
+ Email |
+ Github Username |
+ Teams |
+
+
+ |
+
+ |
+ |
+ |
+ |
+
+
+ |
+
+
+
+
Student:
+
+
+ -
+ Student Number:
+ -
+ Email:
+ -
+ Github Username:
+ -
+ Courses:
+
+
+
+
+
All Teaching Assistants
+
+
+
+ |
+
+ |
+ |
+ |
+ |
+
+ Delete
+ |
+
+
+
+
Teaching Assistant:
+
+
+ -
+ Email:
+ -
+ Github Username:
+ -
+ Courses:
+
+
+
+