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

update for student courses and grades

parent 6e80301a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 23
− 7
View file @ b01dbc51
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="Course modification added"> <list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="created new window for student courses and grades">
<change afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentCoursesGradesController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-courses-grades.fxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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/CourseModificationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/CourseModificationController.java" 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/StudentCoursesGradesController.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/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/resources/de/thdeg/grademanager/gui/student-courses-grades.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-courses-grades.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -117,7 +117,21 @@ ...@@ -117,7 +117,21 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1655581537055</updated> <updated>1655581537055</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="bugfix in course modification option">
<created>1655630282409</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1655630282409</updated>
</task>
<task id="LOCAL-00006" summary="created new window for student courses and grades">
<created>1655630432247</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1655630432247</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
...@@ -148,6 +162,8 @@ ...@@ -148,6 +162,8 @@
<MESSAGE value="big update:&#10;-add toString() for Course, Student and CoursesOfStudy&#10;-fix null-pointer-exception in detailControllers + SwitchWindowHelper&#10;-add CoursesOfStudy Column in Student&#10;-add find-Methods to JpaService&#10;-connect Gui to DB" /> <MESSAGE value="big update:&#10;-add toString() for Course, Student and CoursesOfStudy&#10;-fix null-pointer-exception in detailControllers + SwitchWindowHelper&#10;-add CoursesOfStudy Column in Student&#10;-add find-Methods to JpaService&#10;-connect Gui to DB" />
<MESSAGE value="Added modification option for courses of study" /> <MESSAGE value="Added modification option for courses of study" />
<MESSAGE value="Course modification added" /> <MESSAGE value="Course modification added" />
<option name="LAST_COMMIT_MESSAGE" value="Course modification added" /> <MESSAGE value="bugfix in course modification option" />
<MESSAGE value="created new window for student courses and grades" />
<option name="LAST_COMMIT_MESSAGE" value="created new window for student courses and grades" />
</component> </component>
</project> </project>
\ No newline at end of file
src/main/java/de/thdeg/grademanager/gui/StudentCoursesGradesController.java
+ 16
− 0
View file @ b01dbc51
package de.thdeg.grademanager.gui; package de.thdeg.grademanager.gui;
import de.thdeg.grademanager.model.Course;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.ListView;
import java.io.IOException;
public class StudentCoursesGradesController { public class StudentCoursesGradesController {
@FXML
protected ListView<Course> availableCoursesListView;
@FXML
protected ListView<Course> selectedCoursesListView;
@FXML
protected void switchToStudentDetails(ActionEvent event) throws IOException {
SwitchWindowHelper.switchTo("Student Details", event);
}
} }
src/main/java/de/thdeg/grademanager/gui/StudentDetailsController.java
+ 5
− 0
View file @ b01dbc51
...@@ -149,6 +149,11 @@ public class StudentDetailsController { ...@@ -149,6 +149,11 @@ public class StudentDetailsController {
SwitchWindowHelper.switchTo("Main", event); SwitchWindowHelper.switchTo("Main", event);
} }
@FXML
protected void switchToStudentCoursesGrades(ActionEvent event) throws IOException {
SwitchWindowHelper.switchTo("Student Courses and Grades", event);
}
@FXML @FXML
protected void switchToStudentStats(ActionEvent event) throws IOException{ protected void switchToStudentStats(ActionEvent event) throws IOException{
StudentStatsController.setStudent(student); StudentStatsController.setStudent(student);
......
src/main/resources/de/thdeg/grademanager/gui/student-courses-grades.fxml
+ 54
− 11
View file @ b01dbc51
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?> <?import javafx.scene.control.Button?>
<?import java.util.*?> <?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.*?> <?import javafx.scene.control.ListView?>
<?import javafx.scene.control.*?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.*?> <?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" <BorderPane prefHeight="500.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.thdeg.grademanager.gui.StudentCoursesGradesController">
xmlns:fx="http://javafx.com/fxml" <top>
fx:controller="de.thdeg.grademanager.gui.StudentCoursesGradesController" <VBox fillWidth="false" prefHeight="42.0" prefWidth="600.0" BorderPane.alignment="CENTER">
prefHeight="400.0" prefWidth="600.0"> <children>
<ButtonBar buttonMinWidth="30.0" prefHeight="40.0" prefWidth="200.0">
</AnchorPane> <buttons>
<Button alignment="CENTER" minWidth="22.0" mnemonicParsing="false" onAction="#switchToStudentDetails" 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>
<center>
<VBox alignment="TOP_CENTER" fillWidth="false" prefHeight="171.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children>
<HBox alignment="CENTER" prefHeight="74.0" prefWidth="600.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Kurszuweisung">
<font>
<Font size="24.0" />
</font>
</Text>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="133.0" prefWidth="600.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Wählbare Kurse:" wrappingWidth="100.99883961677551" />
<Region prefHeight="99.0" prefWidth="18.0" />
<ListView fx:id="availableCoursesListView" editable="true" prefHeight="133.0" prefWidth="270.0" />
</children>
</HBox>
<Region prefHeight="44.0" prefWidth="200.0" />
<HBox alignment="CENTER" layoutX="10.0" layoutY="84.0" prefHeight="133.0" prefWidth="600.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Zugewiesene Kurse:" />
<Region prefHeight="99.0" prefWidth="18.0" />
<ListView fx:id="selectedCoursesListView" editable="true" prefHeight="133.0" prefWidth="270.0" />
</children>
</HBox>
</children>
</VBox>
</center>
</BorderPane>
src/main/resources/de/thdeg/grademanager/gui/student-details.fxml
+ 14
− 6
View file @ b01dbc51
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.Button?>
<?import javafx.scene.layout.*?> <?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.text.*?> <?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?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?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.thdeg.grademanager.gui.StudentDetailsController"> <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.thdeg.grademanager.gui.StudentDetailsController">
<top> <top>
<VBox fillWidth="false" prefHeight="46.0" prefWidth="600.0" BorderPane.alignment="CENTER"> <VBox fillWidth="false" prefHeight="46.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children> <children>
...@@ -186,7 +194,7 @@ ...@@ -186,7 +194,7 @@
<children> <children>
<ComboBox fx:id="coursesOfStudyComboBox" onAction="#assignCoursesOfStudy" prefHeight="30.0" prefWidth="189.0" promptText="Studiengang zuweisen" /> <ComboBox fx:id="coursesOfStudyComboBox" onAction="#assignCoursesOfStudy" prefHeight="30.0" prefWidth="189.0" promptText="Studiengang zuweisen" />
<Region prefHeight="52.0" prefWidth="42.0" /> <Region prefHeight="52.0" prefWidth="42.0" />
<Button layoutX="263.0" layoutY="16.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="153.0" text="Kurse + Noten zuweisen" /> <Button layoutX="263.0" layoutY="16.0" mnemonicParsing="false" onAction="#switchToStudentCoursesGrades" prefHeight="26.0" prefWidth="153.0" text="Kurse + Noten zuweisen" />
<Region layoutX="194.0" layoutY="10.0" prefHeight="52.0" prefWidth="46.0" /> <Region layoutX="194.0" layoutY="10.0" prefHeight="52.0" prefWidth="46.0" />
<Button mnemonicParsing="false" onAction="#switchToStudentStats" prefHeight="26.0" prefWidth="127.0" text="Statistiken anzeigen" /> <Button mnemonicParsing="false" onAction="#switchToStudentStats" prefHeight="26.0" prefWidth="127.0" text="Statistiken anzeigen" />
</children> </children>
......
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