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

new window for grades

parent a4c107ca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 16
− 10
View file @ fe10b979
......@@ -4,15 +4,12 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentGradesController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-grades.fxml" afterDir="false" />
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="clean up">
<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/StudentCoursesGradesController.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/StudentDetailsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentDetailsController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/SwitchWindowHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/SwitchWindowHelper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-courses-grades.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-details.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-details.fxml" 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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -169,7 +166,14 @@
<option name="project" value="LOCAL" />
<updated>1655889406510</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="clean up">
<created>1655900828972</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1655900828972</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -207,6 +211,8 @@
<MESSAGE value="bug fix no duplicate (multiple) courses in CourseModificationController + CoursesOfStudyDetailsController anymore" />
<MESSAGE value="add enrollment methods" />
<MESSAGE value="add logic (average + median)" />
<option name="LAST_COMMIT_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" />
</component>
</project>
\ No newline at end of file
src/main/java/de/thdeg/grademanager/gui/StudentCoursesController.java
+ 7
− 0
View file @ fe10b979
......@@ -7,6 +7,7 @@ import javafx.collections.FXCollections;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.ListView;
import javafx.scene.input.MouseEvent;
import java.io.IOException;
import java.util.List;
......@@ -40,6 +41,12 @@ public class StudentCoursesController {
jpaService.runInTransaction(entityManager -> {entityManager.merge(s); return null;});
}
@FXML
protected void onCourseClick(MouseEvent event) throws IOException {
StudentGradesController.setStudent(student);
SwitchWindowHelper.switchTo("Student Grades", event);
}
@FXML
protected void switchToStudentDetails(ActionEvent event) throws IOException {
StudentDetailsController.setStudent(student);
......
src/main/java/de/thdeg/grademanager/gui/StudentGradesController.java
+ 53
− 0
View file @ fe10b979
package de.thdeg.grademanager.gui;
import de.thdeg.grademanager.model.Course;
import de.thdeg.grademanager.model.Student;
import de.thdeg.grademanager.model.enumeration.Mark;
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;
public class StudentGradesController {
protected Mark mark;
@FXML
protected ComboBox<Mark> markComboBox;
ObservableList<Mark> markList = FXCollections.observableArrayList(Mark.values());
private static Student student;
public static void setStudent(Student student) {
StudentGradesController.student = student;
}
private static Course course;
public static void setCourse(Course course) {
StudentGradesController.course = course;
}
@FXML
protected void initialize() {
markComboBox.setItems(markList);
}
@FXML
protected void onSaveButtonClick(ActionEvent event) throws IOException {
if (markComboBox.getValue() != null) {
mark = markComboBox.getValue();
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();
}
}
@FXML
protected void switchToStudentCourses(ActionEvent event) throws IOException {
SwitchWindowHelper.switchTo("Student Courses", event);
}
}
src/main/resources/de/thdeg/grademanager/gui/student-courses.fxml
+ 1
− 1
View file @ fe10b979
......@@ -40,7 +40,7 @@
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Kurse:" wrappingWidth="40.19885563850403" />
<Region prefHeight="99.0" prefWidth="18.0" />
<ListView fx:id="coursesListView" editable="true" prefHeight="133.0" prefWidth="270.0" />
<ListView fx:id="coursesListView" editable="true" onMouseClicked="#onCourseClick" prefHeight="133.0" prefWidth="270.0" />
</children>
</HBox>
</children>
......
src/main/resources/de/thdeg/grademanager/gui/student-grades.fxml
+ 63
− 11
View file @ fe10b979
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="de.thdeg.grademanager.gui.StudentGradesController"
prefHeight="400.0" prefWidth="600.0">
</AnchorPane>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.thdeg.grademanager.gui.StudentGradesController">
<top>
<VBox fillWidth="false" prefHeight="46.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children>
<ButtonBar buttonMinWidth="30.0" prefHeight="40.0" prefWidth="200.0">
<buttons>
<Button alignment="CENTER" minWidth="22.0" mnemonicParsing="false" onAction="#switchToStudentCourses" prefHeight="26.0" text="←" />
<Button alignment="CENTER" disable="true" layoutX="31.0" layoutY="17.0" minWidth="22.0" mnemonicParsing="false" prefHeight="26.0" text="→" />
<Region prefHeight="200.0" prefWidth="200.0" />
</buttons>
</ButtonBar>
</children>
</VBox>
</top>
<left>
<Label fx:id="welcomeText" BorderPane.alignment="CENTER" />
</left>
<center>
<VBox prefHeight="400.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children>
<HBox alignment="CENTER" prefHeight="51.0" prefWidth="600.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Noteneingabe">
<font>
<Font size="24.0" />
</font>
</Text>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="66.0" prefWidth="600.0">
<children>
<Label prefHeight="20.0" prefWidth="36.0" text="Note">
<HBox.margin>
<Insets left="25.0" />
</HBox.margin>
<font>
<Font size="14.0" />
</font>
</Label>
<Region prefHeight="38.0" prefWidth="69.0" />
<ComboBox fx:id="markComboBox" prefHeight="26.0" prefWidth="278.0" />
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="54.0" prefWidth="600.0">
<children>
<Button defaultButton="true" mnemonicParsing="false" onAction="#onSaveButtonClick" text="Speichern" />
</children>
</HBox>
</children>
</VBox>
</center>
</BorderPane>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment