Skip to content
Snippets Groups Projects
Commit eff0390d authored by Dennis Toth's avatar Dennis Toth
Browse files

bugfix

parent 7e212552
No related branches found
No related tags found
No related merge requests found
......@@ -4,11 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="new window for grades">
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="grades can now be added for every course">
<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/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" />
......@@ -179,7 +177,14 @@
<option name="project" value="LOCAL" />
<updated>1655904634462</updated>
</task>
<option name="localTasksCounter" value="14" />
<task id="LOCAL-00014" summary="grades can now be added for every course">
<created>1655910063769</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1655910063769</updated>
</task>
<option name="localTasksCounter" value="15" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -220,6 +225,7 @@
<MESSAGE value="update for student courses and grades" />
<MESSAGE value="clean up" />
<MESSAGE value="new window for grades" />
<option name="LAST_COMMIT_MESSAGE" value="new window for grades" />
<MESSAGE value="grades can now be added for every course" />
<option name="LAST_COMMIT_MESSAGE" value="grades can now be added for every course" />
</component>
</project>
\ No newline at end of file
......@@ -9,12 +9,9 @@ import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.ComboBox;
import java.io.IOException;
import java.util.Optional;
import java.util.Set;
public class StudentGradesController {
......@@ -54,23 +51,21 @@ public class StudentGradesController {
mark = markComboBox.getValue();
Set<Enrollment> enrollments = student.getEnrollments();
for (Enrollment e: enrollments) {
if(course.getId() == e.getCourse().getId()){
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;});
jpaService.runInTransaction(entityManager -> {
entityManager.merge(e);
return null;
});
initialize();
}
}
SwitchWindowHelper.switchTo("Student Courses", event);
} else {
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("Fehler");
alert.setHeaderText("Bitte alle Felder ausfüllen.");
Optional<ButtonType> result = alert.showAndWait();
}
SwitchWindowHelper.switchTo("Student Courses", event);
}
@FXML
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment