grades can now be added for every course

.idea/workspace.xml

@@ -4,12 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="clean up">
+    <list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="new window for grades">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentCoursesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentCoursesController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentGradesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentGradesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-courses.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-courses.fxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-grades.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-grades.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/model/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/model/Student.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -173,7 +172,14 @@
       <option name="project" value="LOCAL" />
       <updated>1655900828972</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="new window for grades">
+      <created>1655904634462</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1655904634462</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -213,6 +219,7 @@
     <MESSAGE value="add logic (average + median)" />
     <MESSAGE value="update for student courses and grades" />
     <MESSAGE value="clean up" />
-    <option name="LAST_COMMIT_MESSAGE" value="clean up" />
+    <MESSAGE value="new window for grades" />
+    <option name="LAST_COMMIT_MESSAGE" value="new window for grades" />
   </component>
 </project>
\ No newline at end of file

src/main/java/de/thdeg/grademanager/gui/StudentCoursesController.java

@@ -44,6 +44,7 @@ public class StudentCoursesController {
     @FXML
     protected void onCourseClick(MouseEvent event) throws IOException {
         StudentGradesController.setStudent(student);
+        StudentGradesController.setCourse(coursesListView.getSelectionModel().getSelectedItem());
         SwitchWindowHelper.switchTo("Student Grades", event);
     }
 

src/main/java/de/thdeg/grademanager/gui/StudentGradesController.java

 package de.thdeg.grademanager.gui;
 
+import de.thdeg.grademanager.JpaService;
 import de.thdeg.grademanager.model.Course;
+import de.thdeg.grademanager.model.Enrollment;
 import de.thdeg.grademanager.model.Student;
 import de.thdeg.grademanager.model.enumeration.Mark;
 import javafx.collections.FXCollections;
@@ -13,6 +15,7 @@ import javafx.scene.control.ComboBox;
 
 import java.io.IOException;
 import java.util.Optional;
+import java.util.Set;
 
 public class StudentGradesController {
 
@@ -34,6 +37,15 @@ public class StudentGradesController {
     @FXML
     protected void initialize() {
         markComboBox.setItems(markList);
+
+        Set<Enrollment> enrollments = student.getEnrollments();
+        for (Enrollment e: enrollments) {
+            if(course.getId() == e.getCourse().getId()){
+                if(e.getGrade() != null){
+                    markComboBox.setPromptText(String.valueOf(e.getGrade()));
+                }
+            }
+        }
     }
 
     @FXML
@@ -41,6 +53,17 @@ public class StudentGradesController {
         if (markComboBox.getValue() != null) {
             mark = markComboBox.getValue();
 
+            Set<Enrollment> enrollments = student.getEnrollments();
+            for (Enrollment e: enrollments) {
+                if(course.getId() == e.getCourse().getId()){
+                    e.setGrade(mark.getMark());
+
+                    JpaService jpaService = JpaService.getInstance();
+                    jpaService.runInTransaction(entityManager -> {entityManager.merge(e); return null;});
+                    initialize();
+                }
+            }
+
             SwitchWindowHelper.switchTo("Student Courses", event);
         } else {
             Alert alert = new Alert(Alert.AlertType.ERROR);

src/main/java/de/thdeg/grademanager/model/Student.java

@@ -117,7 +117,6 @@ public class Student extends UniversityMember implements Calculable
 
     public void initEnrollments(List<Course> courses){
         for (Course course: courses) {
-            System.out.println(course);
             enrollments.add(new Enrollment(this, course));
         }
     }