diff --git a/server/src/main/java/capstone/controller/ProjectController.java b/server/src/main/java/capstone/controller/ProjectController.java index 8bf83b2..edd7ae1 100755 --- a/server/src/main/java/capstone/controller/ProjectController.java +++ b/server/src/main/java/capstone/controller/ProjectController.java @@ -135,7 +135,7 @@ public String assignmentExists() { updatedProjects.add(project); String messageBody = project.getProjectName() + "\n\n" + project.getBackground() + "\n\n" + project.getDescription() + "\n\n"; - +// TODO Add stake holder email to this email for (Student student : proj.getMembers()) { // Set the given project for each student Student saveStudent = userService.findByUserId(student.getUserId()); diff --git a/server/src/main/java/capstone/model/Project.java b/server/src/main/java/capstone/model/Project.java index 9b97f27..28f37ba 100755 --- a/server/src/main/java/capstone/model/Project.java +++ b/server/src/main/java/capstone/model/Project.java @@ -50,7 +50,7 @@ public void setMembers(List members) { @JsonIgnore @Transient String statusType; // not in db table - int semester; + String semester; int maxSize; int minSize; String description; @@ -161,11 +161,11 @@ public void setStatusType(String status) { } } - public int getSemester() { + public String getSemester() { return semester; } - public void setSemester(int semester) { + public void setSemester(String semester) { this.semester = semester; } diff --git a/server/src/main/java/capstone/service/ProjectService.java b/server/src/main/java/capstone/service/ProjectService.java index a09b591..495e5ca 100755 --- a/server/src/main/java/capstone/service/ProjectService.java +++ b/server/src/main/java/capstone/service/ProjectService.java @@ -110,9 +110,11 @@ public void initTables() { Project newProject = new Project(ProjectAssignment.getStudentSatScore(1)); newProject.setProjectName(elements[0]); - //newProject.setProjectId(projects.size()); // TODO: MAKE THIS DYNAMIC WITH AUTOINCREMENT + newProject.setProjectId(projects.size()); // TODO: MAKE THIS DYNAMIC WITH AUTOINCREMENT newProject.setMinSize(Integer.parseInt(elements[1])); newProject.setMaxSize(Integer.parseInt(elements[2])); + newProject.setSemester("F18"); + newProject.setStakeholderId(newProject.getProjectId()); projects.addElement(newProject); System.out.println("Saving project: " + newProject.getProjectName());