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

clean up

parent 9fc0792d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 38 deletions
.idea/workspace.xml
+ 9
− 8
View file @ a4c107ca
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment=""> <list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/model/EnrollmentProperty.java" afterDir="false" /> <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" />
<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/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/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/StudentStatsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/StudentStatsController.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/model/Enrollment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/model/Enrollment.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/module-info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/module-info.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-stats.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-stats.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" />
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
} }
}</component> }</component>
<component name="RunManager"> <component name="RunManager">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="de.thdeg.grademanager.gui.Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="de.thdeg.grademanager.gui.Main" /> <option name="MAIN_CLASS_NAME" value="de.thdeg.grademanager.gui.Main" />
<module name="notenmanager" /> <module name="notenmanager" />
<extension name="coverage"> <extension name="coverage">
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.Main" /> <item itemvalue="Application.de.thdeg.grademanager.gui.Main" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
......
src/main/java/de/thdeg/grademanager/gui/StudentCoursesGradesController.java → src/main/java/de/thdeg/grademanager/gui/StudentCoursesController.java
+ 8
− 8
View file @ a4c107ca
...@@ -3,6 +3,7 @@ package de.thdeg.grademanager.gui; ...@@ -3,6 +3,7 @@ package de.thdeg.grademanager.gui;
import de.thdeg.grademanager.JpaService; import de.thdeg.grademanager.JpaService;
import de.thdeg.grademanager.model.Course; import de.thdeg.grademanager.model.Course;
import de.thdeg.grademanager.model.Student; import de.thdeg.grademanager.model.Student;
import javafx.collections.FXCollections;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.ListView; import javafx.scene.control.ListView;
...@@ -10,24 +11,23 @@ import javafx.scene.control.ListView; ...@@ -10,24 +11,23 @@ import javafx.scene.control.ListView;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
public class StudentCoursesGradesController { public class StudentCoursesController {
private static Student student; private static Student student;
public static void setStudent(Student student) { public static void setStudent(Student student) {
StudentCoursesGradesController.student = student; StudentCoursesController.student = student;
} }
@FXML @FXML
protected ListView<Course> availableCoursesListView; protected ListView<Course> coursesListView;
@FXML
protected ListView<Course> selectedCoursesListView;
@FXML @FXML
protected void initialize() { protected void initialize() {
initEnrollmentsForCoursesOfStudy(); if (student.getCoursesOfStudy() != null) {
coursesListView.setItems(FXCollections.observableList(student.getCoursesOfStudy().getCourses()));
}
initEnrollmentsForCoursesOfStudy();
} }
private void initEnrollmentsForCoursesOfStudy(){ private void initEnrollmentsForCoursesOfStudy(){
......
src/main/java/de/thdeg/grademanager/gui/StudentDetailsController.java
+ 3
− 6
View file @ a4c107ca
package de.thdeg.grademanager.gui; package de.thdeg.grademanager.gui;
import de.thdeg.grademanager.JpaService; import de.thdeg.grademanager.JpaService;
import de.thdeg.grademanager.model.Course;
import de.thdeg.grademanager.model.CoursesOfStudy; import de.thdeg.grademanager.model.CoursesOfStudy;
import de.thdeg.grademanager.model.Student; import de.thdeg.grademanager.model.Student;
import de.thdeg.grademanager.model.enumeration.Gender; import de.thdeg.grademanager.model.enumeration.Gender;
...@@ -11,10 +10,8 @@ import javafx.collections.ObservableList; ...@@ -11,10 +10,8 @@ import javafx.collections.ObservableList;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.input.MouseEvent;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import static de.thdeg.grademanager.gui.MainController.coursesOfStudyList; import static de.thdeg.grademanager.gui.MainController.coursesOfStudyList;
...@@ -154,9 +151,9 @@ public class StudentDetailsController { ...@@ -154,9 +151,9 @@ public class StudentDetailsController {
} }
@FXML @FXML
protected void switchToStudentCoursesGrades(ActionEvent event) throws IOException { protected void switchToStudentCourses(ActionEvent event) throws IOException {
StudentCoursesGradesController.setStudent(student); StudentCoursesController.setStudent(student);
SwitchWindowHelper.switchTo("Student Courses and Grades", event); SwitchWindowHelper.switchTo("Student Courses", event);
} }
@FXML @FXML
......
src/main/java/de/thdeg/grademanager/gui/StudentGradesController.java 0 → 100644
+ 4
− 0
View file @ a4c107ca
package de.thdeg.grademanager.gui;
public class StudentGradesController {
}
src/main/java/de/thdeg/grademanager/gui/SwitchWindowHelper.java
+ 4
− 2
View file @ a4c107ca
...@@ -40,8 +40,10 @@ public class SwitchWindowHelper { ...@@ -40,8 +40,10 @@ public class SwitchWindowHelper {
return "course-modification.fxml"; return "course-modification.fxml";
case "Student Stats": case "Student Stats":
return "student-stats.fxml"; return "student-stats.fxml";
case "Student Courses and Grades": case "Student Courses":
return "student-courses-grades.fxml"; return "student-courses.fxml";
case "Student Grades":
return "student-grades.fxml";
} }
return ""; return "";
} }
......
src/main/resources/de/thdeg/grademanager/gui/student-courses-grades.fxml → src/main/resources/de/thdeg/grademanager/gui/student-courses.fxml
+ 5
− 13
View file @ a4c107ca
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<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"> <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.StudentCoursesController">
<top> <top>
<VBox fillWidth="false" prefHeight="42.0" prefWidth="600.0" BorderPane.alignment="CENTER"> <VBox fillWidth="false" prefHeight="42.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children> <children>
...@@ -29,26 +29,18 @@ ...@@ -29,26 +29,18 @@
<children> <children>
<HBox alignment="CENTER" prefHeight="74.0" prefWidth="600.0"> <HBox alignment="CENTER" prefHeight="74.0" prefWidth="600.0">
<children> <children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Kurszuweisung"> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Notenzuweisung">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
</Text> </Text>
</children> </children>
</HBox> </HBox>
<HBox alignment="CENTER" prefHeight="133.0" prefWidth="600.0"> <HBox alignment="CENTER" prefHeight="340.0" prefWidth="600.0">
<children> <children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Wählbare Kurse:" wrappingWidth="100.99883961677551" /> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Kurse:" wrappingWidth="40.19885563850403" />
<Region prefHeight="99.0" prefWidth="18.0" /> <Region prefHeight="99.0" prefWidth="18.0" />
<ListView fx:id="availableCoursesListView" editable="true" prefHeight="133.0" prefWidth="270.0" /> <ListView fx:id="coursesListView" 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> </children>
</HBox> </HBox>
</children> </children>
......
src/main/resources/de/thdeg/grademanager/gui/student-details.fxml
+ 1
− 1
View file @ a4c107ca
...@@ -194,7 +194,7 @@ ...@@ -194,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" onAction="#switchToStudentCoursesGrades" prefHeight="26.0" prefWidth="153.0" text="Kurse + Noten zuweisen" /> <Button layoutX="263.0" layoutY="16.0" mnemonicParsing="false" onAction="#switchToStudentCourses" prefHeight="26.0" prefWidth="153.0" text="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>
......
src/main/resources/de/thdeg/grademanager/gui/student-grades.fxml 0 → 100644
+ 14
− 0
View file @ a4c107ca
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<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>
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